diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.s b/asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.s deleted file mode 100644 index db20adb625..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.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_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.s deleted file mode 100644 index fe24ca5d3f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.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_03/C314E0/func_802401A4_C31684.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s deleted file mode 100644 index ba37153708..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A4_C31684 -/* C31684 802401A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C31688 802401A8 AFB20018 */ sw $s2, 0x18($sp) -/* C3168C 802401AC 0080902D */ daddu $s2, $a0, $zero -/* C31690 802401B0 AFBF001C */ sw $ra, 0x1c($sp) -/* C31694 802401B4 AFB10014 */ sw $s1, 0x14($sp) -/* C31698 802401B8 AFB00010 */ sw $s0, 0x10($sp) -/* C3169C 802401BC 8E50000C */ lw $s0, 0xc($s2) -/* C316A0 802401C0 8E050000 */ lw $a1, ($s0) -/* C316A4 802401C4 0C0B1EAF */ jal get_variable -/* C316A8 802401C8 26100004 */ addiu $s0, $s0, 4 -/* C316AC 802401CC 0C04417A */ jal get_entity_by_index -/* C316B0 802401D0 0040202D */ daddu $a0, $v0, $zero -/* C316B4 802401D4 8E050000 */ lw $a1, ($s0) -/* C316B8 802401D8 26100004 */ addiu $s0, $s0, 4 -/* C316BC 802401DC 0040882D */ daddu $s1, $v0, $zero -/* C316C0 802401E0 C6200048 */ lwc1 $f0, 0x48($s1) -/* C316C4 802401E4 4600008D */ trunc.w.s $f2, $f0 -/* C316C8 802401E8 44061000 */ mfc1 $a2, $f2 -/* C316CC 802401EC 0C0B2026 */ jal set_variable -/* C316D0 802401F0 0240202D */ daddu $a0, $s2, $zero -/* C316D4 802401F4 8E050000 */ lw $a1, ($s0) -/* C316D8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* C316DC 802401FC C620004C */ lwc1 $f0, 0x4c($s1) -/* C316E0 80240200 4600008D */ trunc.w.s $f2, $f0 -/* C316E4 80240204 44061000 */ mfc1 $a2, $f2 -/* C316E8 80240208 0C0B2026 */ jal set_variable -/* C316EC 8024020C 0240202D */ daddu $a0, $s2, $zero -/* C316F0 80240210 C6200050 */ lwc1 $f0, 0x50($s1) -/* C316F4 80240214 8E050000 */ lw $a1, ($s0) -/* C316F8 80240218 4600008D */ trunc.w.s $f2, $f0 -/* C316FC 8024021C 44061000 */ mfc1 $a2, $f2 -/* C31700 80240220 0C0B2026 */ jal set_variable -/* C31704 80240224 0240202D */ daddu $a0, $s2, $zero -/* C31708 80240228 8FBF001C */ lw $ra, 0x1c($sp) -/* C3170C 8024022C 8FB20018 */ lw $s2, 0x18($sp) -/* C31710 80240230 8FB10014 */ lw $s1, 0x14($sp) -/* C31714 80240234 8FB00010 */ lw $s0, 0x10($sp) -/* C31718 80240238 24020002 */ addiu $v0, $zero, 2 -/* C3171C 8024023C 03E00008 */ jr $ra -/* C31720 80240240 27BD0020 */ addiu $sp, $sp, 0x20 -/* C31724 80240244 00000000 */ nop -/* C31728 80240248 00000000 */ nop -/* C3172C 8024024C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.s deleted file mode 100644 index 7fd975a179..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.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_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s deleted file mode 100644 index c5a54ed2a0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C4_B06BC4 -/* B06BC4 802401C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B06BC8 802401C8 AFB20018 */ sw $s2, 0x18($sp) -/* B06BCC 802401CC 0080902D */ daddu $s2, $a0, $zero -/* B06BD0 802401D0 AFBF001C */ sw $ra, 0x1c($sp) -/* B06BD4 802401D4 AFB10014 */ sw $s1, 0x14($sp) -/* B06BD8 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* B06BDC 802401DC 8E50000C */ lw $s0, 0xc($s2) -/* B06BE0 802401E0 8E050000 */ lw $a1, ($s0) -/* B06BE4 802401E4 0C0B1EAF */ jal get_variable -/* B06BE8 802401E8 26100004 */ addiu $s0, $s0, 4 -/* B06BEC 802401EC 0C04417A */ jal get_entity_by_index -/* B06BF0 802401F0 0040202D */ daddu $a0, $v0, $zero -/* B06BF4 802401F4 8E050000 */ lw $a1, ($s0) -/* B06BF8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* B06BFC 802401FC 0040882D */ daddu $s1, $v0, $zero -/* B06C00 80240200 C6200048 */ lwc1 $f0, 0x48($s1) -/* B06C04 80240204 4600008D */ trunc.w.s $f2, $f0 -/* B06C08 80240208 44061000 */ mfc1 $a2, $f2 -/* B06C0C 8024020C 0C0B2026 */ jal set_variable -/* B06C10 80240210 0240202D */ daddu $a0, $s2, $zero -/* B06C14 80240214 8E050000 */ lw $a1, ($s0) -/* B06C18 80240218 26100004 */ addiu $s0, $s0, 4 -/* B06C1C 8024021C C620004C */ lwc1 $f0, 0x4c($s1) -/* B06C20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B06C24 80240224 44061000 */ mfc1 $a2, $f2 -/* B06C28 80240228 0C0B2026 */ jal set_variable -/* B06C2C 8024022C 0240202D */ daddu $a0, $s2, $zero -/* B06C30 80240230 C6200050 */ lwc1 $f0, 0x50($s1) -/* B06C34 80240234 8E050000 */ lw $a1, ($s0) -/* B06C38 80240238 4600008D */ trunc.w.s $f2, $f0 -/* B06C3C 8024023C 44061000 */ mfc1 $a2, $f2 -/* B06C40 80240240 0C0B2026 */ jal set_variable -/* B06C44 80240244 0240202D */ daddu $a0, $s2, $zero -/* B06C48 80240248 8FBF001C */ lw $ra, 0x1c($sp) -/* B06C4C 8024024C 8FB20018 */ lw $s2, 0x18($sp) -/* B06C50 80240250 8FB10014 */ lw $s1, 0x14($sp) -/* B06C54 80240254 8FB00010 */ lw $s0, 0x10($sp) -/* B06C58 80240258 24020002 */ addiu $v0, $zero, 2 -/* B06C5C 8024025C 03E00008 */ jr $ra -/* B06C60 80240260 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s deleted file mode 100644 index 4318c44cde..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243474_8B34E4 -/* 8B34E4 80243474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B34E8 80243478 AFB20018 */ sw $s2, 0x18($sp) -/* 8B34EC 8024347C 0080902D */ daddu $s2, $a0, $zero -/* 8B34F0 80243480 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B34F4 80243484 AFB10014 */ sw $s1, 0x14($sp) -/* 8B34F8 80243488 AFB00010 */ sw $s0, 0x10($sp) -/* 8B34FC 8024348C 8E50000C */ lw $s0, 0xc($s2) -/* 8B3500 80243490 8E050000 */ lw $a1, ($s0) -/* 8B3504 80243494 0C0B1EAF */ jal get_variable -/* 8B3508 80243498 26100004 */ addiu $s0, $s0, 4 -/* 8B350C 8024349C 0C04417A */ jal get_entity_by_index -/* 8B3510 802434A0 0040202D */ daddu $a0, $v0, $zero -/* 8B3514 802434A4 8E050000 */ lw $a1, ($s0) -/* 8B3518 802434A8 26100004 */ addiu $s0, $s0, 4 -/* 8B351C 802434AC 0040882D */ daddu $s1, $v0, $zero -/* 8B3520 802434B0 C6200048 */ lwc1 $f0, 0x48($s1) -/* 8B3524 802434B4 4600008D */ trunc.w.s $f2, $f0 -/* 8B3528 802434B8 44061000 */ mfc1 $a2, $f2 -/* 8B352C 802434BC 0C0B2026 */ jal set_variable -/* 8B3530 802434C0 0240202D */ daddu $a0, $s2, $zero -/* 8B3534 802434C4 8E050000 */ lw $a1, ($s0) -/* 8B3538 802434C8 26100004 */ addiu $s0, $s0, 4 -/* 8B353C 802434CC C620004C */ lwc1 $f0, 0x4c($s1) -/* 8B3540 802434D0 4600008D */ trunc.w.s $f2, $f0 -/* 8B3544 802434D4 44061000 */ mfc1 $a2, $f2 -/* 8B3548 802434D8 0C0B2026 */ jal set_variable -/* 8B354C 802434DC 0240202D */ daddu $a0, $s2, $zero -/* 8B3550 802434E0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 8B3554 802434E4 8E050000 */ lw $a1, ($s0) -/* 8B3558 802434E8 4600008D */ trunc.w.s $f2, $f0 -/* 8B355C 802434EC 44061000 */ mfc1 $a2, $f2 -/* 8B3560 802434F0 0C0B2026 */ jal set_variable -/* 8B3564 802434F4 0240202D */ daddu $a0, $s2, $zero -/* 8B3568 802434F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B356C 802434FC 8FB20018 */ lw $s2, 0x18($sp) -/* 8B3570 80243500 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3574 80243504 8FB00010 */ lw $s0, 0x10($sp) -/* 8B3578 80243508 24020002 */ addiu $v0, $zero, 2 -/* 8B357C 8024350C 03E00008 */ jr $ra -/* 8B3580 80243510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s deleted file mode 100644 index 310e79186b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024065C_AA95FC -/* AA95FC 8024065C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AA9600 80240660 AFB20018 */ sw $s2, 0x18($sp) -/* AA9604 80240664 0080902D */ daddu $s2, $a0, $zero -/* AA9608 80240668 AFBF001C */ sw $ra, 0x1c($sp) -/* AA960C 8024066C AFB10014 */ sw $s1, 0x14($sp) -/* AA9610 80240670 AFB00010 */ sw $s0, 0x10($sp) -/* AA9614 80240674 8E50000C */ lw $s0, 0xc($s2) -/* AA9618 80240678 8E050000 */ lw $a1, ($s0) -/* AA961C 8024067C 0C0B1EAF */ jal get_variable -/* AA9620 80240680 26100004 */ addiu $s0, $s0, 4 -/* AA9624 80240684 0C04417A */ jal get_entity_by_index -/* AA9628 80240688 0040202D */ daddu $a0, $v0, $zero -/* AA962C 8024068C 8E050000 */ lw $a1, ($s0) -/* AA9630 80240690 26100004 */ addiu $s0, $s0, 4 -/* AA9634 80240694 0040882D */ daddu $s1, $v0, $zero -/* AA9638 80240698 C6200048 */ lwc1 $f0, 0x48($s1) -/* AA963C 8024069C 4600008D */ trunc.w.s $f2, $f0 -/* AA9640 802406A0 44061000 */ mfc1 $a2, $f2 -/* AA9644 802406A4 0C0B2026 */ jal set_variable -/* AA9648 802406A8 0240202D */ daddu $a0, $s2, $zero -/* AA964C 802406AC 8E050000 */ lw $a1, ($s0) -/* AA9650 802406B0 26100004 */ addiu $s0, $s0, 4 -/* AA9654 802406B4 C620004C */ lwc1 $f0, 0x4c($s1) -/* AA9658 802406B8 4600008D */ trunc.w.s $f2, $f0 -/* AA965C 802406BC 44061000 */ mfc1 $a2, $f2 -/* AA9660 802406C0 0C0B2026 */ jal set_variable -/* AA9664 802406C4 0240202D */ daddu $a0, $s2, $zero -/* AA9668 802406C8 C6200050 */ lwc1 $f0, 0x50($s1) -/* AA966C 802406CC 8E050000 */ lw $a1, ($s0) -/* AA9670 802406D0 4600008D */ trunc.w.s $f2, $f0 -/* AA9674 802406D4 44061000 */ mfc1 $a2, $f2 -/* AA9678 802406D8 0C0B2026 */ jal set_variable -/* AA967C 802406DC 0240202D */ daddu $a0, $s2, $zero -/* AA9680 802406E0 8FBF001C */ lw $ra, 0x1c($sp) -/* AA9684 802406E4 8FB20018 */ lw $s2, 0x18($sp) -/* AA9688 802406E8 8FB10014 */ lw $s1, 0x14($sp) -/* AA968C 802406EC 8FB00010 */ lw $s0, 0x10($sp) -/* AA9690 802406F0 24020002 */ addiu $v0, $zero, 2 -/* AA9694 802406F4 03E00008 */ jr $ra -/* AA9698 802406F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* AA969C 802406FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s deleted file mode 100644 index fc77a083cb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240670_A57B20 -/* A57B20 80240670 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A57B24 80240674 AFB20018 */ sw $s2, 0x18($sp) -/* A57B28 80240678 0080902D */ daddu $s2, $a0, $zero -/* A57B2C 8024067C AFBF001C */ sw $ra, 0x1c($sp) -/* A57B30 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* A57B34 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* A57B38 80240688 8E50000C */ lw $s0, 0xc($s2) -/* A57B3C 8024068C 8E050000 */ lw $a1, ($s0) -/* A57B40 80240690 0C0B1EAF */ jal get_variable -/* A57B44 80240694 26100004 */ addiu $s0, $s0, 4 -/* A57B48 80240698 0C04417A */ jal get_entity_by_index -/* A57B4C 8024069C 0040202D */ daddu $a0, $v0, $zero -/* A57B50 802406A0 8E050000 */ lw $a1, ($s0) -/* A57B54 802406A4 26100004 */ addiu $s0, $s0, 4 -/* A57B58 802406A8 0040882D */ daddu $s1, $v0, $zero -/* A57B5C 802406AC C6200048 */ lwc1 $f0, 0x48($s1) -/* A57B60 802406B0 4600008D */ trunc.w.s $f2, $f0 -/* A57B64 802406B4 44061000 */ mfc1 $a2, $f2 -/* A57B68 802406B8 0C0B2026 */ jal set_variable -/* A57B6C 802406BC 0240202D */ daddu $a0, $s2, $zero -/* A57B70 802406C0 8E050000 */ lw $a1, ($s0) -/* A57B74 802406C4 26100004 */ addiu $s0, $s0, 4 -/* A57B78 802406C8 C620004C */ lwc1 $f0, 0x4c($s1) -/* A57B7C 802406CC 4600008D */ trunc.w.s $f2, $f0 -/* A57B80 802406D0 44061000 */ mfc1 $a2, $f2 -/* A57B84 802406D4 0C0B2026 */ jal set_variable -/* A57B88 802406D8 0240202D */ daddu $a0, $s2, $zero -/* A57B8C 802406DC C6200050 */ lwc1 $f0, 0x50($s1) -/* A57B90 802406E0 8E050000 */ lw $a1, ($s0) -/* A57B94 802406E4 4600008D */ trunc.w.s $f2, $f0 -/* A57B98 802406E8 44061000 */ mfc1 $a2, $f2 -/* A57B9C 802406EC 0C0B2026 */ jal set_variable -/* A57BA0 802406F0 0240202D */ daddu $a0, $s2, $zero -/* A57BA4 802406F4 8FBF001C */ lw $ra, 0x1c($sp) -/* A57BA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) -/* A57BAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) -/* A57BB0 80240700 8FB00010 */ lw $s0, 0x10($sp) -/* A57BB4 80240704 24020002 */ addiu $v0, $zero, 2 -/* A57BB8 80240708 03E00008 */ jr $ra -/* A57BBC 8024070C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.s b/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.s deleted file mode 100644 index f1a75442ec..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.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_91/A88280/func_80241864_A882B4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s deleted file mode 100644 index e5106048c3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241864_A882B4 -/* 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_95/A8CA80/func_80240034_A8CAB4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240034_A8CAB4.s deleted file mode 100644 index cbc38e7d0b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240034_A8CAB4.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_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.s deleted file mode 100644 index 4802aef01e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.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_obk/obk_03/BC4280/func_802400C4_BC4344.s b/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_802400C4_BC4344.s deleted file mode 100644 index 9d579bc1dd..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_802400C4_BC4344.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_pra/pra_02/D50010/func_802413D8_D513C8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s deleted file mode 100644 index 092a037d37..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D8_D513C8 -/* D513C8 802413D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D513CC 802413DC AFB20018 */ sw $s2, 0x18($sp) -/* D513D0 802413E0 0080902D */ daddu $s2, $a0, $zero -/* D513D4 802413E4 AFBF001C */ sw $ra, 0x1c($sp) -/* D513D8 802413E8 AFB10014 */ sw $s1, 0x14($sp) -/* D513DC 802413EC AFB00010 */ sw $s0, 0x10($sp) -/* D513E0 802413F0 8E50000C */ lw $s0, 0xc($s2) -/* D513E4 802413F4 8E050000 */ lw $a1, ($s0) -/* D513E8 802413F8 0C0B1EAF */ jal get_variable -/* D513EC 802413FC 26100004 */ addiu $s0, $s0, 4 -/* D513F0 80241400 0C04417A */ jal get_entity_by_index -/* D513F4 80241404 0040202D */ daddu $a0, $v0, $zero -/* D513F8 80241408 8E050000 */ lw $a1, ($s0) -/* D513FC 8024140C 26100004 */ addiu $s0, $s0, 4 -/* D51400 80241410 0040882D */ daddu $s1, $v0, $zero -/* D51404 80241414 C6200048 */ lwc1 $f0, 0x48($s1) -/* D51408 80241418 4600008D */ trunc.w.s $f2, $f0 -/* D5140C 8024141C 44061000 */ mfc1 $a2, $f2 -/* D51410 80241420 0C0B2026 */ jal set_variable -/* D51414 80241424 0240202D */ daddu $a0, $s2, $zero -/* D51418 80241428 8E050000 */ lw $a1, ($s0) -/* D5141C 8024142C 26100004 */ addiu $s0, $s0, 4 -/* D51420 80241430 C620004C */ lwc1 $f0, 0x4c($s1) -/* D51424 80241434 4600008D */ trunc.w.s $f2, $f0 -/* D51428 80241438 44061000 */ mfc1 $a2, $f2 -/* D5142C 8024143C 0C0B2026 */ jal set_variable -/* D51430 80241440 0240202D */ daddu $a0, $s2, $zero -/* D51434 80241444 C6200050 */ lwc1 $f0, 0x50($s1) -/* D51438 80241448 8E050000 */ lw $a1, ($s0) -/* D5143C 8024144C 4600008D */ trunc.w.s $f2, $f0 -/* D51440 80241450 44061000 */ mfc1 $a2, $f2 -/* D51444 80241454 0C0B2026 */ jal set_variable -/* D51448 80241458 0240202D */ daddu $a0, $s2, $zero -/* D5144C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* D51450 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* D51454 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* D51458 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* D5145C 8024146C 24020002 */ addiu $v0, $zero, 2 -/* D51460 80241470 03E00008 */ jr $ra -/* D51464 80241474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s deleted file mode 100644 index 1320fbe78c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F54_D8C304 -/* D8C304 80240F54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8C308 80240F58 AFB20018 */ sw $s2, 0x18($sp) -/* D8C30C 80240F5C 0080902D */ daddu $s2, $a0, $zero -/* D8C310 80240F60 AFBF001C */ sw $ra, 0x1c($sp) -/* D8C314 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D8C318 80240F68 AFB00010 */ sw $s0, 0x10($sp) -/* D8C31C 80240F6C 8E50000C */ lw $s0, 0xc($s2) -/* D8C320 80240F70 8E050000 */ lw $a1, ($s0) -/* D8C324 80240F74 0C0B1EAF */ jal get_variable -/* D8C328 80240F78 26100004 */ addiu $s0, $s0, 4 -/* D8C32C 80240F7C 0C04417A */ jal get_entity_by_index -/* D8C330 80240F80 0040202D */ daddu $a0, $v0, $zero -/* D8C334 80240F84 8E050000 */ lw $a1, ($s0) -/* D8C338 80240F88 26100004 */ addiu $s0, $s0, 4 -/* D8C33C 80240F8C 0040882D */ daddu $s1, $v0, $zero -/* D8C340 80240F90 C6200048 */ lwc1 $f0, 0x48($s1) -/* D8C344 80240F94 4600008D */ trunc.w.s $f2, $f0 -/* D8C348 80240F98 44061000 */ mfc1 $a2, $f2 -/* D8C34C 80240F9C 0C0B2026 */ jal set_variable -/* D8C350 80240FA0 0240202D */ daddu $a0, $s2, $zero -/* D8C354 80240FA4 8E050000 */ lw $a1, ($s0) -/* D8C358 80240FA8 26100004 */ addiu $s0, $s0, 4 -/* D8C35C 80240FAC C620004C */ lwc1 $f0, 0x4c($s1) -/* D8C360 80240FB0 4600008D */ trunc.w.s $f2, $f0 -/* D8C364 80240FB4 44061000 */ mfc1 $a2, $f2 -/* D8C368 80240FB8 0C0B2026 */ jal set_variable -/* D8C36C 80240FBC 0240202D */ daddu $a0, $s2, $zero -/* D8C370 80240FC0 C6200050 */ lwc1 $f0, 0x50($s1) -/* D8C374 80240FC4 8E050000 */ lw $a1, ($s0) -/* D8C378 80240FC8 4600008D */ trunc.w.s $f2, $f0 -/* D8C37C 80240FCC 44061000 */ mfc1 $a2, $f2 -/* D8C380 80240FD0 0C0B2026 */ jal set_variable -/* D8C384 80240FD4 0240202D */ daddu $a0, $s2, $zero -/* D8C388 80240FD8 8FBF001C */ lw $ra, 0x1c($sp) -/* D8C38C 80240FDC 8FB20018 */ lw $s2, 0x18($sp) -/* D8C390 80240FE0 8FB10014 */ lw $s1, 0x14($sp) -/* D8C394 80240FE4 8FB00010 */ lw $s0, 0x10($sp) -/* D8C398 80240FE8 24020002 */ addiu $v0, $zero, 2 -/* D8C39C 80240FEC 03E00008 */ jr $ra -/* D8C3A0 80240FF0 27BD0020 */ addiu $sp, $sp, 0x20 -/* D8C3A4 80240FF4 00000000 */ nop -/* D8C3A8 80240FF8 00000000 */ nop -/* D8C3AC 80240FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.s deleted file mode 100644 index 684c6a88d1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.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_11/D3A850/func_802402B4_D3A884.s b/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_802402B4_D3A884.s deleted file mode 100644 index a531998135..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_802402B4_D3A884.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_trd/trd_01/99CCA0/func_80240344_99CCD4.s b/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240344_99CCD4.s deleted file mode 100644 index d2e94751fb..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240344_99CCD4.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_02/9A0FE0/func_80240034_9A1014.s b/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240034_9A1014.s deleted file mode 100644 index 04ce4f76f0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240034_9A1014.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_04/9A8700/func_80240408_9A87F8.s b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s deleted file mode 100644 index de8ba5582a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240408_9A87F8 -/* 9A87F8 80240408 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A87FC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 9A8800 80240410 0080902D */ daddu $s2, $a0, $zero -/* 9A8804 80240414 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A8808 80240418 AFB10014 */ sw $s1, 0x14($sp) -/* 9A880C 8024041C AFB00010 */ sw $s0, 0x10($sp) -/* 9A8810 80240420 8E50000C */ lw $s0, 0xc($s2) -/* 9A8814 80240424 8E050000 */ lw $a1, ($s0) -/* 9A8818 80240428 0C0B1EAF */ jal get_variable -/* 9A881C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* 9A8820 80240430 0C04417A */ jal get_entity_by_index -/* 9A8824 80240434 0040202D */ daddu $a0, $v0, $zero -/* 9A8828 80240438 8E050000 */ lw $a1, ($s0) -/* 9A882C 8024043C 26100004 */ addiu $s0, $s0, 4 -/* 9A8830 80240440 0040882D */ daddu $s1, $v0, $zero -/* 9A8834 80240444 C6200048 */ lwc1 $f0, 0x48($s1) -/* 9A8838 80240448 4600008D */ trunc.w.s $f2, $f0 -/* 9A883C 8024044C 44061000 */ mfc1 $a2, $f2 -/* 9A8840 80240450 0C0B2026 */ jal set_variable -/* 9A8844 80240454 0240202D */ daddu $a0, $s2, $zero -/* 9A8848 80240458 8E050000 */ lw $a1, ($s0) -/* 9A884C 8024045C 26100004 */ addiu $s0, $s0, 4 -/* 9A8850 80240460 C620004C */ lwc1 $f0, 0x4c($s1) -/* 9A8854 80240464 4600008D */ trunc.w.s $f2, $f0 -/* 9A8858 80240468 44061000 */ mfc1 $a2, $f2 -/* 9A885C 8024046C 0C0B2026 */ jal set_variable -/* 9A8860 80240470 0240202D */ daddu $a0, $s2, $zero -/* 9A8864 80240474 C6200050 */ lwc1 $f0, 0x50($s1) -/* 9A8868 80240478 8E050000 */ lw $a1, ($s0) -/* 9A886C 8024047C 4600008D */ trunc.w.s $f2, $f0 -/* 9A8870 80240480 44061000 */ mfc1 $a2, $f2 -/* 9A8874 80240484 0C0B2026 */ jal set_variable -/* 9A8878 80240488 0240202D */ daddu $a0, $s2, $zero -/* 9A887C 8024048C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A8880 80240490 8FB20018 */ lw $s2, 0x18($sp) -/* 9A8884 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8888 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* 9A888C 8024049C 24020002 */ addiu $v0, $zero, 2 -/* 9A8890 802404A0 03E00008 */ jr $ra -/* 9A8894 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9A8898 802404A8 00000000 */ nop -/* 9A889C 802404AC 00000000 */ nop diff --git a/src/world/area_arn/arn_07/BED660.c b/src/world/area_arn/arn_07/BED660.c index b09e4f1652..39042de7f0 100644 --- a/src/world/area_arn/arn_07/BED660.c +++ b/src/world/area_arn/arn_07/BED660.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED660", func_802408A4_BED694); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_dgb/dgb_01/BFD8C0.c b/src/world/area_dgb/dgb_01/BFD8C0.c index 65a75350a8..fe44aab479 100644 --- a/src/world/area_dgb/dgb_01/BFD8C0.c +++ b/src/world/area_dgb/dgb_01/BFD8C0.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD8C0", func_80240074_BFD8F4); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c index 4d66f8a957..5d958efbfb 100644 --- a/src/world/area_dgb/dgb_03/C314E0.c +++ b/src/world/area_dgb/dgb_03/C314E0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802400BC_C3159C); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802401A4_C31684); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c index 404cfce93a..3911b3c13f 100644 --- a/src/world/area_jan/jan_04/B451F0.c +++ b/src/world/area_jan/jan_04/B451F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240A80_B451F0); -INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240B48_B452B8); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240BE8_B45358); diff --git a/src/world/area_kkj/kkj_25/B06A80.c b/src/world/area_kkj/kkj_25/B06A80.c index cb7ac1b92e..f02fac9632 100644 --- a/src/world/area_kkj/kkj_25/B06A80.c +++ b/src/world/area_kkj/kkj_25/B06A80.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400AC_B06AAC); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400FC_B06AFC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802401C4_B06BC4); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_80240264_B06C64); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 3cd47e8f3b..d58867fb6b 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -28,6 +28,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243370_8B33E0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802433AC_8B341C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243474_8B34E4); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243514_8B3584); diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index e9fb0458a7..fbd30b26f4 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240564_AA9504); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_8024065C_AA95FC); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 01d5733664..f8d7e3f3c6 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240670_A57B20); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240710_A57BC0); diff --git a/src/world/area_kpa/kpa_52/A67100.c b/src/world/area_kpa/kpa_52/A67100.c index 118fb36bda..c868b376d3 100644 --- a/src/world/area_kpa/kpa_52/A67100.c +++ b/src/world/area_kpa/kpa_52/A67100.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A67100", func_80240034_A67134); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_91/A88280.c b/src/world/area_kpa/kpa_91/A88280.c index c06cbf4295..1574eae982 100644 --- a/src/world/area_kpa/kpa_91/A88280.c +++ b/src/world/area_kpa/kpa_91/A88280.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241864_A882B4); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CA80.c b/src/world/area_kpa/kpa_95/A8CA80.c index d9aa972907..25b5922c28 100644 --- a/src/world/area_kpa/kpa_95/A8CA80.c +++ b/src/world/area_kpa/kpa_95/A8CA80.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CA80", func_80240034_A8CAB4); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c index a9d0ef1c43..c021165caf 100644 --- a/src/world/area_kzn/kzn_23/C9C610.c +++ b/src/world/area_kzn/kzn_23/C9C610.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610); -INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_802403D8_C9C6D8); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778); diff --git a/src/world/area_obk/obk_03/BC4280.c b/src/world/area_obk/obk_03/BC4280.c index 659d59ceea..a169152126 100644 --- a/src/world/area_obk/obk_03/BC4280.c +++ b/src/world/area_obk/obk_03/BC4280.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC4280", func_80240000_BC4280); -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC4280", func_802400C4_BC4344); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 6255aac7e2..5a717a9c36 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241310_D51300); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802413D8_D513C8); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241478_D51468); @@ -48,4 +48,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498); #include "world/common/SetEntityFlags100000.inc.c" +// #include "world/common/GetEntityPosition.inc.c" +// This is GetEntityPosition, but it alreaxy exists in this file. +// This makes me think there's either a file split or something else we don't understand INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802415BC_D515AC); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 271c110fa5..72db02105c 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -28,4 +28,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EEC_D8C29C); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F54_D8C304); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 45aace1287..9af80c6844 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240000_D2BD30); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240510_D2C240); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); diff --git a/src/world/area_sam/sam_11/D3A850.c b/src/world/area_sam/sam_11/D3A850.c index 835d389e0c..3671c889af 100644 --- a/src/world/area_sam/sam_11/D3A850.c +++ b/src/world/area_sam/sam_11/D3A850.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A850", func_802402B4_D3A884); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_01/99CCA0.c b/src/world/area_trd/trd_01/99CCA0.c index 5e90da7057..8cd1fdfd39 100644 --- a/src/world/area_trd/trd_01/99CCA0.c +++ b/src/world/area_trd/trd_01/99CCA0.c @@ -2,4 +2,5 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CCA0", func_80240344_99CCD4); +#include "world/common/GetEntityPosition.inc.c" + diff --git a/src/world/area_trd/trd_02/9A0FE0.c b/src/world/area_trd/trd_02/9A0FE0.c index b155411bd8..bad574aaac 100644 --- a/src/world/area_trd/trd_02/9A0FE0.c +++ b/src/world/area_trd/trd_02/9A0FE0.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A0FE0", func_80240034_9A1014); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_04/9A8700.c b/src/world/area_trd/trd_04/9A8700.c index f05dc666a7..a96eeca481 100644 --- a/src/world/area_trd/trd_04/9A8700.c +++ b/src/world/area_trd/trd_04/9A8700.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240344_9A8734); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240408_9A87F8); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/common/GetEntityPosition.inc.c b/src/world/common/GetEntityPosition.inc.c new file mode 100644 index 0000000000..00a44f0fba --- /dev/null +++ b/src/world/common/GetEntityPosition.inc.c @@ -0,0 +1,11 @@ +#include "common.h" + +static ApiStatus GetEntityPosition(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Entity* entity = get_entity_by_index(get_variable(script, *args++)); + + set_variable(script, *args++, entity->position.x); + set_variable(script, *args++, entity->position.y); + set_variable(script, *args++, entity->position.z); + return ApiStatus_DONE2; +}