diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448_CC5C58.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448_CC5C58.s deleted file mode 100644 index 7e520194e7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448_CC5C58.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242448_CC5C58 -/* CC5C58 80242448 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CC5C5C 8024244C AFB3003C */ sw $s3, 0x3c($sp) -/* CC5C60 80242450 0080982D */ daddu $s3, $a0, $zero -/* CC5C64 80242454 AFBF0040 */ sw $ra, 0x40($sp) -/* CC5C68 80242458 AFB20038 */ sw $s2, 0x38($sp) -/* CC5C6C 8024245C AFB10034 */ sw $s1, 0x34($sp) -/* CC5C70 80242460 AFB00030 */ sw $s0, 0x30($sp) -/* CC5C74 80242464 8E710148 */ lw $s1, 0x148($s3) -/* CC5C78 80242468 0C00EABB */ jal get_npc_unsafe -/* CC5C7C 8024246C 86240008 */ lh $a0, 8($s1) -/* CC5C80 80242470 0040802D */ daddu $s0, $v0, $zero -/* CC5C84 80242474 8E22007C */ lw $v0, 0x7c($s1) -/* CC5C88 80242478 8603008E */ lh $v1, 0x8e($s0) -/* CC5C8C 8024247C 2442FFFF */ addiu $v0, $v0, -1 -/* CC5C90 80242480 14620012 */ bne $v1, $v0, .L802424CC -/* CC5C94 80242484 00000000 */ nop -/* CC5C98 80242488 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC5C9C 8024248C 4600020D */ trunc.w.s $f8, $f0 -/* CC5CA0 80242490 44024000 */ mfc1 $v0, $f8 -/* CC5CA4 80242494 00000000 */ nop -/* CC5CA8 80242498 A6220010 */ sh $v0, 0x10($s1) -/* CC5CAC 8024249C C600003C */ lwc1 $f0, 0x3c($s0) -/* CC5CB0 802424A0 4600020D */ trunc.w.s $f8, $f0 -/* CC5CB4 802424A4 44024000 */ mfc1 $v0, $f8 -/* CC5CB8 802424A8 00000000 */ nop -/* CC5CBC 802424AC A6220012 */ sh $v0, 0x12($s1) -/* CC5CC0 802424B0 C6000040 */ lwc1 $f0, 0x40($s0) -/* CC5CC4 802424B4 24020001 */ addiu $v0, $zero, 1 -/* CC5CC8 802424B8 A2220007 */ sb $v0, 7($s1) -/* CC5CCC 802424BC 4600020D */ trunc.w.s $f8, $f0 -/* CC5CD0 802424C0 44024000 */ mfc1 $v0, $f8 -/* CC5CD4 802424C4 00000000 */ nop -/* CC5CD8 802424C8 A6220014 */ sh $v0, 0x14($s1) -.L802424CC: -/* CC5CDC 802424CC C6000038 */ lwc1 $f0, 0x38($s0) -/* CC5CE0 802424D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC5CE4 802424D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC5CE8 802424D8 C6060018 */ lwc1 $f6, 0x18($s0) -/* CC5CEC 802424DC E7A00020 */ swc1 $f0, 0x20($sp) -/* CC5CF0 802424E0 E7A20024 */ swc1 $f2, 0x24($sp) -/* CC5CF4 802424E4 E7A40028 */ swc1 $f4, 0x28($sp) -/* CC5CF8 802424E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* CC5CFC 802424EC C600000C */ lwc1 $f0, 0xc($s0) -/* CC5D00 802424F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* CC5D04 802424F4 860200A8 */ lh $v0, 0xa8($s0) -/* CC5D08 802424F8 27A50020 */ addiu $a1, $sp, 0x20 -/* CC5D0C 802424FC 44820000 */ mtc1 $v0, $f0 -/* CC5D10 80242500 00000000 */ nop -/* CC5D14 80242504 46800020 */ cvt.s.w $f0, $f0 -/* CC5D18 80242508 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC5D1C 8024250C 860200A6 */ lh $v0, 0xa6($s0) -/* CC5D20 80242510 27A60024 */ addiu $a2, $sp, 0x24 -/* CC5D24 80242514 44820000 */ mtc1 $v0, $f0 -/* CC5D28 80242518 00000000 */ nop -/* CC5D2C 8024251C 46800020 */ cvt.s.w $f0, $f0 -/* CC5D30 80242520 E7A0001C */ swc1 $f0, 0x1c($sp) -/* CC5D34 80242524 8E040080 */ lw $a0, 0x80($s0) -/* CC5D38 80242528 0C037711 */ jal func_800DDC44 -/* CC5D3C 8024252C 27A70028 */ addiu $a3, $sp, 0x28 -/* CC5D40 80242530 0040902D */ daddu $s2, $v0, $zero -/* CC5D44 80242534 16400005 */ bnez $s2, .L8024254C -/* CC5D48 80242538 00000000 */ nop -/* CC5D4C 8024253C 8E050018 */ lw $a1, 0x18($s0) -/* CC5D50 80242540 8E06000C */ lw $a2, 0xc($s0) -/* CC5D54 80242544 0C00EA95 */ jal npc_move_heading -/* CC5D58 80242548 0200202D */ daddu $a0, $s0, $zero -.L8024254C: -/* CC5D5C 8024254C 8602008E */ lh $v0, 0x8e($s0) -/* CC5D60 80242550 9603008E */ lhu $v1, 0x8e($s0) -/* CC5D64 80242554 18400007 */ blez $v0, .L80242574 -/* CC5D68 80242558 2462FFFF */ addiu $v0, $v1, -1 -/* CC5D6C 8024255C A602008E */ sh $v0, 0x8e($s0) -/* CC5D70 80242560 00021400 */ sll $v0, $v0, 0x10 -/* CC5D74 80242564 18400003 */ blez $v0, .L80242574 -/* CC5D78 80242568 00000000 */ nop -/* CC5D7C 8024256C 12400008 */ beqz $s2, .L80242590 -/* CC5D80 80242570 00000000 */ nop -.L80242574: -/* CC5D84 80242574 8E2200CC */ lw $v0, 0xcc($s1) -/* CC5D88 80242578 A2200007 */ sb $zero, 7($s1) -/* CC5D8C 8024257C 8C420028 */ lw $v0, 0x28($v0) -/* CC5D90 80242580 A600008E */ sh $zero, 0x8e($s0) -/* CC5D94 80242584 AE020028 */ sw $v0, 0x28($s0) -/* CC5D98 80242588 2402000F */ addiu $v0, $zero, 0xf -/* CC5D9C 8024258C AE620070 */ sw $v0, 0x70($s3) -.L80242590: -/* CC5DA0 80242590 8FBF0040 */ lw $ra, 0x40($sp) -/* CC5DA4 80242594 8FB3003C */ lw $s3, 0x3c($sp) -/* CC5DA8 80242598 8FB20038 */ lw $s2, 0x38($sp) -/* CC5DAC 8024259C 8FB10034 */ lw $s1, 0x34($sp) -/* CC5DB0 802425A0 8FB00030 */ lw $s0, 0x30($sp) -/* CC5DB4 802425A4 03E00008 */ jr $ra -/* CC5DB8 802425A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s index 88550e23a5..9743746fbc 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -244,7 +244,7 @@ glabel func_8024262C_CC5E3C .L802429A4: /* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero /* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero -/* CC61BC 802429AC 0C090912 */ jal func_80242448_CC5C58 +/* CC61BC 802429AC 0C090912 */ jal flo_13_UnkNpcAIFunc12 /* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero /* CC61C4 802429B4 08090A76 */ j .L802429D8 /* CC61C8 802429B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s index eae2cb9473..57f76f1ad1 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s @@ -281,7 +281,7 @@ glabel func_80242A6C_CC627C .L80242E6C: /* CC667C 80242E6C 02A0202D */ daddu $a0, $s5, $zero /* CC6680 80242E70 0260282D */ daddu $a1, $s3, $zero -/* CC6684 80242E74 0C090912 */ jal func_80242448_CC5C58 +/* CC6684 80242E74 0C090912 */ jal flo_13_UnkNpcAIFunc12 /* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero /* CC668C 80242E7C 08090CCE */ j .L80243338 /* CC6690 80242E80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4_CD95D4.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4_CD95D4.s deleted file mode 100644 index 8aff2c8307..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4_CD95D4.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F4_CD95D4 -/* CD95D4 802422F4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CD95D8 802422F8 AFB3003C */ sw $s3, 0x3c($sp) -/* CD95DC 802422FC 0080982D */ daddu $s3, $a0, $zero -/* CD95E0 80242300 AFBF0040 */ sw $ra, 0x40($sp) -/* CD95E4 80242304 AFB20038 */ sw $s2, 0x38($sp) -/* CD95E8 80242308 AFB10034 */ sw $s1, 0x34($sp) -/* CD95EC 8024230C AFB00030 */ sw $s0, 0x30($sp) -/* CD95F0 80242310 8E710148 */ lw $s1, 0x148($s3) -/* CD95F4 80242314 0C00EABB */ jal get_npc_unsafe -/* CD95F8 80242318 86240008 */ lh $a0, 8($s1) -/* CD95FC 8024231C 0040802D */ daddu $s0, $v0, $zero -/* CD9600 80242320 8E22007C */ lw $v0, 0x7c($s1) -/* CD9604 80242324 8603008E */ lh $v1, 0x8e($s0) -/* CD9608 80242328 2442FFFF */ addiu $v0, $v0, -1 -/* CD960C 8024232C 14620012 */ bne $v1, $v0, .L80242378 -/* CD9610 80242330 00000000 */ nop -/* CD9614 80242334 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD9618 80242338 4600020D */ trunc.w.s $f8, $f0 -/* CD961C 8024233C 44024000 */ mfc1 $v0, $f8 -/* CD9620 80242340 00000000 */ nop -/* CD9624 80242344 A6220010 */ sh $v0, 0x10($s1) -/* CD9628 80242348 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD962C 8024234C 4600020D */ trunc.w.s $f8, $f0 -/* CD9630 80242350 44024000 */ mfc1 $v0, $f8 -/* CD9634 80242354 00000000 */ nop -/* CD9638 80242358 A6220012 */ sh $v0, 0x12($s1) -/* CD963C 8024235C C6000040 */ lwc1 $f0, 0x40($s0) -/* CD9640 80242360 24020001 */ addiu $v0, $zero, 1 -/* CD9644 80242364 A2220007 */ sb $v0, 7($s1) -/* CD9648 80242368 4600020D */ trunc.w.s $f8, $f0 -/* CD964C 8024236C 44024000 */ mfc1 $v0, $f8 -/* CD9650 80242370 00000000 */ nop -/* CD9654 80242374 A6220014 */ sh $v0, 0x14($s1) -.L80242378: -/* CD9658 80242378 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD965C 8024237C C602003C */ lwc1 $f2, 0x3c($s0) -/* CD9660 80242380 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD9664 80242384 C6060018 */ lwc1 $f6, 0x18($s0) -/* CD9668 80242388 E7A00020 */ swc1 $f0, 0x20($sp) -/* CD966C 8024238C E7A20024 */ swc1 $f2, 0x24($sp) -/* CD9670 80242390 E7A40028 */ swc1 $f4, 0x28($sp) -/* CD9674 80242394 E7A60010 */ swc1 $f6, 0x10($sp) -/* CD9678 80242398 C600000C */ lwc1 $f0, 0xc($s0) -/* CD967C 8024239C E7A00014 */ swc1 $f0, 0x14($sp) -/* CD9680 802423A0 860200A8 */ lh $v0, 0xa8($s0) -/* CD9684 802423A4 27A50020 */ addiu $a1, $sp, 0x20 -/* CD9688 802423A8 44820000 */ mtc1 $v0, $f0 -/* CD968C 802423AC 00000000 */ nop -/* CD9690 802423B0 46800020 */ cvt.s.w $f0, $f0 -/* CD9694 802423B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD9698 802423B8 860200A6 */ lh $v0, 0xa6($s0) -/* CD969C 802423BC 27A60024 */ addiu $a2, $sp, 0x24 -/* CD96A0 802423C0 44820000 */ mtc1 $v0, $f0 -/* CD96A4 802423C4 00000000 */ nop -/* CD96A8 802423C8 46800020 */ cvt.s.w $f0, $f0 -/* CD96AC 802423CC E7A0001C */ swc1 $f0, 0x1c($sp) -/* CD96B0 802423D0 8E040080 */ lw $a0, 0x80($s0) -/* CD96B4 802423D4 0C037711 */ jal func_800DDC44 -/* CD96B8 802423D8 27A70028 */ addiu $a3, $sp, 0x28 -/* CD96BC 802423DC 0040902D */ daddu $s2, $v0, $zero -/* CD96C0 802423E0 16400005 */ bnez $s2, .L802423F8 -/* CD96C4 802423E4 00000000 */ nop -/* CD96C8 802423E8 8E050018 */ lw $a1, 0x18($s0) -/* CD96CC 802423EC 8E06000C */ lw $a2, 0xc($s0) -/* CD96D0 802423F0 0C00EA95 */ jal npc_move_heading -/* CD96D4 802423F4 0200202D */ daddu $a0, $s0, $zero -.L802423F8: -/* CD96D8 802423F8 8602008E */ lh $v0, 0x8e($s0) -/* CD96DC 802423FC 9603008E */ lhu $v1, 0x8e($s0) -/* CD96E0 80242400 18400007 */ blez $v0, .L80242420 -/* CD96E4 80242404 2462FFFF */ addiu $v0, $v1, -1 -/* CD96E8 80242408 A602008E */ sh $v0, 0x8e($s0) -/* CD96EC 8024240C 00021400 */ sll $v0, $v0, 0x10 -/* CD96F0 80242410 18400003 */ blez $v0, .L80242420 -/* CD96F4 80242414 00000000 */ nop -/* CD96F8 80242418 12400008 */ beqz $s2, .L8024243C -/* CD96FC 8024241C 00000000 */ nop -.L80242420: -/* CD9700 80242420 8E2200CC */ lw $v0, 0xcc($s1) -/* CD9704 80242424 A2200007 */ sb $zero, 7($s1) -/* CD9708 80242428 8C420028 */ lw $v0, 0x28($v0) -/* CD970C 8024242C A600008E */ sh $zero, 0x8e($s0) -/* CD9710 80242430 AE020028 */ sw $v0, 0x28($s0) -/* CD9714 80242434 2402000F */ addiu $v0, $zero, 0xf -/* CD9718 80242438 AE620070 */ sw $v0, 0x70($s3) -.L8024243C: -/* CD971C 8024243C 8FBF0040 */ lw $ra, 0x40($sp) -/* CD9720 80242440 8FB3003C */ lw $s3, 0x3c($sp) -/* CD9724 80242444 8FB20038 */ lw $s2, 0x38($sp) -/* CD9728 80242448 8FB10034 */ lw $s1, 0x34($sp) -/* CD972C 8024244C 8FB00030 */ lw $s0, 0x30($sp) -/* CD9730 80242450 03E00008 */ jr $ra -/* CD9734 80242454 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s index 5d9e7a4ed3..d4cf8c8a21 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -244,7 +244,7 @@ glabel func_802424D8_CD97B8 .L80242850: /* CD9B30 80242850 0260202D */ daddu $a0, $s3, $zero /* CD9B34 80242854 0280282D */ daddu $a1, $s4, $zero -/* CD9B38 80242858 0C0908BD */ jal func_802422F4_CD95D4 +/* CD9B38 80242858 0C0908BD */ jal flo_17_UnkNpcAIFunc12 /* CD9B3C 8024285C 02A0302D */ daddu $a2, $s5, $zero /* CD9B40 80242860 08090A21 */ j .L80242884 /* CD9B44 80242864 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s index cd3fa23b7b..8b7fb5db9e 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s @@ -281,7 +281,7 @@ glabel func_80242918_CD9BF8 .L80242D18: /* CD9FF8 80242D18 02A0202D */ daddu $a0, $s5, $zero /* CD9FFC 80242D1C 0260282D */ daddu $a1, $s3, $zero -/* CDA000 80242D20 0C0908BD */ jal func_802422F4_CD95D4 +/* CDA000 80242D20 0C0908BD */ jal flo_17_UnkNpcAIFunc12 /* CDA004 80242D24 0280302D */ daddu $a2, $s4, $zero /* CDA008 80242D28 08090C79 */ j .L802431E4 /* CDA00C 80242D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240544_CEE7A4.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240544_CEE7A4.s deleted file mode 100644 index 2ad8e56571..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240544_CEE7A4.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/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index 7449c7895d..b2c07feeb0 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -244,7 +244,7 @@ glabel func_80240728_CEE988 .L80240AA0: /* CEED00 80240AA0 0260202D */ daddu $a0, $s3, $zero /* CEED04 80240AA4 0280282D */ daddu $a1, $s4, $zero -/* CEED08 80240AA8 0C090151 */ jal func_80240544_CEE7A4 +/* CEED08 80240AA8 0C090151 */ jal flo_23_UnkNpcAIFunc12 /* CEED0C 80240AAC 02A0302D */ daddu $a2, $s5, $zero /* CEED10 80240AB0 080902B5 */ j .L80240AD4 /* CEED14 80240AB4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0_97B820.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0_97B820.s deleted file mode 100644 index 235b2de688..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0_97B820.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401F0_97B820 -/* 97B820 802401F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 97B824 802401F4 AFB3003C */ sw $s3, 0x3c($sp) -/* 97B828 802401F8 0080982D */ daddu $s3, $a0, $zero -/* 97B82C 802401FC AFBF0040 */ sw $ra, 0x40($sp) -/* 97B830 80240200 AFB20038 */ sw $s2, 0x38($sp) -/* 97B834 80240204 AFB10034 */ sw $s1, 0x34($sp) -/* 97B838 80240208 AFB00030 */ sw $s0, 0x30($sp) -/* 97B83C 8024020C 8E710148 */ lw $s1, 0x148($s3) -/* 97B840 80240210 0C00EABB */ jal get_npc_unsafe -/* 97B844 80240214 86240008 */ lh $a0, 8($s1) -/* 97B848 80240218 0040802D */ daddu $s0, $v0, $zero -/* 97B84C 8024021C 8E22007C */ lw $v0, 0x7c($s1) -/* 97B850 80240220 8603008E */ lh $v1, 0x8e($s0) -/* 97B854 80240224 2442FFFF */ addiu $v0, $v0, -1 -/* 97B858 80240228 14620012 */ bne $v1, $v0, .L80240274 -/* 97B85C 8024022C 00000000 */ nop -/* 97B860 80240230 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97B864 80240234 4600020D */ trunc.w.s $f8, $f0 -/* 97B868 80240238 44024000 */ mfc1 $v0, $f8 -/* 97B86C 8024023C 00000000 */ nop -/* 97B870 80240240 A6220010 */ sh $v0, 0x10($s1) -/* 97B874 80240244 C600003C */ lwc1 $f0, 0x3c($s0) -/* 97B878 80240248 4600020D */ trunc.w.s $f8, $f0 -/* 97B87C 8024024C 44024000 */ mfc1 $v0, $f8 -/* 97B880 80240250 00000000 */ nop -/* 97B884 80240254 A6220012 */ sh $v0, 0x12($s1) -/* 97B888 80240258 C6000040 */ lwc1 $f0, 0x40($s0) -/* 97B88C 8024025C 24020001 */ addiu $v0, $zero, 1 -/* 97B890 80240260 A2220007 */ sb $v0, 7($s1) -/* 97B894 80240264 4600020D */ trunc.w.s $f8, $f0 -/* 97B898 80240268 44024000 */ mfc1 $v0, $f8 -/* 97B89C 8024026C 00000000 */ nop -/* 97B8A0 80240270 A6220014 */ sh $v0, 0x14($s1) -.L80240274: -/* 97B8A4 80240274 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97B8A8 80240278 C602003C */ lwc1 $f2, 0x3c($s0) -/* 97B8AC 8024027C C6040040 */ lwc1 $f4, 0x40($s0) -/* 97B8B0 80240280 C6060018 */ lwc1 $f6, 0x18($s0) -/* 97B8B4 80240284 E7A00020 */ swc1 $f0, 0x20($sp) -/* 97B8B8 80240288 E7A20024 */ swc1 $f2, 0x24($sp) -/* 97B8BC 8024028C E7A40028 */ swc1 $f4, 0x28($sp) -/* 97B8C0 80240290 E7A60010 */ swc1 $f6, 0x10($sp) -/* 97B8C4 80240294 C600000C */ lwc1 $f0, 0xc($s0) -/* 97B8C8 80240298 E7A00014 */ swc1 $f0, 0x14($sp) -/* 97B8CC 8024029C 860200A8 */ lh $v0, 0xa8($s0) -/* 97B8D0 802402A0 27A50020 */ addiu $a1, $sp, 0x20 -/* 97B8D4 802402A4 44820000 */ mtc1 $v0, $f0 -/* 97B8D8 802402A8 00000000 */ nop -/* 97B8DC 802402AC 46800020 */ cvt.s.w $f0, $f0 -/* 97B8E0 802402B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 97B8E4 802402B4 860200A6 */ lh $v0, 0xa6($s0) -/* 97B8E8 802402B8 27A60024 */ addiu $a2, $sp, 0x24 -/* 97B8EC 802402BC 44820000 */ mtc1 $v0, $f0 -/* 97B8F0 802402C0 00000000 */ nop -/* 97B8F4 802402C4 46800020 */ cvt.s.w $f0, $f0 -/* 97B8F8 802402C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 97B8FC 802402CC 8E040080 */ lw $a0, 0x80($s0) -/* 97B900 802402D0 0C037711 */ jal func_800DDC44 -/* 97B904 802402D4 27A70028 */ addiu $a3, $sp, 0x28 -/* 97B908 802402D8 0040902D */ daddu $s2, $v0, $zero -/* 97B90C 802402DC 16400005 */ bnez $s2, .L802402F4 -/* 97B910 802402E0 00000000 */ nop -/* 97B914 802402E4 8E050018 */ lw $a1, 0x18($s0) -/* 97B918 802402E8 8E06000C */ lw $a2, 0xc($s0) -/* 97B91C 802402EC 0C00EA95 */ jal npc_move_heading -/* 97B920 802402F0 0200202D */ daddu $a0, $s0, $zero -.L802402F4: -/* 97B924 802402F4 8602008E */ lh $v0, 0x8e($s0) -/* 97B928 802402F8 9603008E */ lhu $v1, 0x8e($s0) -/* 97B92C 802402FC 18400007 */ blez $v0, .L8024031C -/* 97B930 80240300 2462FFFF */ addiu $v0, $v1, -1 -/* 97B934 80240304 A602008E */ sh $v0, 0x8e($s0) -/* 97B938 80240308 00021400 */ sll $v0, $v0, 0x10 -/* 97B93C 8024030C 18400003 */ blez $v0, .L8024031C -/* 97B940 80240310 00000000 */ nop -/* 97B944 80240314 12400008 */ beqz $s2, .L80240338 -/* 97B948 80240318 00000000 */ nop -.L8024031C: -/* 97B94C 8024031C 8E2200CC */ lw $v0, 0xcc($s1) -/* 97B950 80240320 A2200007 */ sb $zero, 7($s1) -/* 97B954 80240324 8C420028 */ lw $v0, 0x28($v0) -/* 97B958 80240328 A600008E */ sh $zero, 0x8e($s0) -/* 97B95C 8024032C AE020028 */ sw $v0, 0x28($s0) -/* 97B960 80240330 2402000F */ addiu $v0, $zero, 0xf -/* 97B964 80240334 AE620070 */ sw $v0, 0x70($s3) -.L80240338: -/* 97B968 80240338 8FBF0040 */ lw $ra, 0x40($sp) -/* 97B96C 8024033C 8FB3003C */ lw $s3, 0x3c($sp) -/* 97B970 80240340 8FB20038 */ lw $s2, 0x38($sp) -/* 97B974 80240344 8FB10034 */ lw $s1, 0x34($sp) -/* 97B978 80240348 8FB00030 */ lw $s0, 0x30($sp) -/* 97B97C 8024034C 03E00008 */ jr $ra -/* 97B980 80240350 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index 73194442a1..da10e611a4 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -244,7 +244,7 @@ glabel func_802403D4_97BA04 .L8024074C: /* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero /* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero -/* 97BD84 80240754 0C09007C */ jal func_802401F0_97B820 +/* 97BD84 80240754 0C09007C */ jal isk_04_UnkNpcAIFunc12 /* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero /* 97BD8C 8024075C 080901E0 */ j .L80240780 /* 97BD90 80240760 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802401B0_984FE0.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802401B0_984FE0.s deleted file mode 100644 index c562ad6df5..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802401B0_984FE0.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/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index f10558e79e..f947453a56 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -244,7 +244,7 @@ glabel func_80240394_9851C4 .L8024070C: /* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 985540 80240710 0280282D */ daddu $a1, $s4, $zero -/* 985544 80240714 0C09006C */ jal func_802401B0_984FE0 +/* 985544 80240714 0C09006C */ jal isk_08_UnkNpcAIFunc12 /* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero /* 98554C 8024071C 080901D0 */ j .L80240740 /* 985550 80240720 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_802401B0_998120.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_802401B0_998120.s deleted file mode 100644 index a1a1432340..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_802401B0_998120.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/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index b355e3dbb2..d7b07a228f 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -244,7 +244,7 @@ glabel func_80240394_998304 .L8024070C: /* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 998680 80240710 0280282D */ daddu $a1, $s4, $zero -/* 998684 80240714 0C09006C */ jal func_802401B0_998120 +/* 998684 80240714 0C09006C */ jal isk_18_UnkNpcAIFunc12 /* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero /* 99868C 8024071C 080901D0 */ j .L80240740 /* 998690 80240720 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240310_A47270.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240310_A47270.s deleted file mode 100644 index 794f55038a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240310_A47270.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/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index 92f2590cc8..937f6a1dae 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -244,7 +244,7 @@ glabel func_802404F4_A47454 .L8024086C: /* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero /* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero -/* A477D4 80240874 0C0900C4 */ jal func_80240310_A47270 +/* A477D4 80240874 0C0900C4 */ jal kpa_01_UnkNpcAIFunc12 /* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero /* A477DC 8024087C 08090228 */ j .L802408A0 /* A477E0 80240880 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240310_A488D0.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240310_A488D0.s deleted file mode 100644 index 9a9664ca15..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240310_A488D0.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/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index 292c684820..298626ccf0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -244,7 +244,7 @@ glabel func_802404F4_A48AB4 .L8024086C: /* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero /* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero -/* A48E34 80240874 0C0900C4 */ jal func_80240310_A488D0 +/* A48E34 80240874 0C0900C4 */ jal kpa_03_UnkNpcAIFunc12 /* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero /* A48E3C 8024087C 08090228 */ j .L802408A0 /* A48E40 80240880 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C_A94E4C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C_A94E4C.s deleted file mode 100644 index 4500594c84..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C_A94E4C.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024170C_A94E4C -/* A94E4C 8024170C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A94E50 80241710 AFB3003C */ sw $s3, 0x3c($sp) -/* A94E54 80241714 0080982D */ daddu $s3, $a0, $zero -/* A94E58 80241718 AFBF0040 */ sw $ra, 0x40($sp) -/* A94E5C 8024171C AFB20038 */ sw $s2, 0x38($sp) -/* A94E60 80241720 AFB10034 */ sw $s1, 0x34($sp) -/* A94E64 80241724 AFB00030 */ sw $s0, 0x30($sp) -/* A94E68 80241728 8E710148 */ lw $s1, 0x148($s3) -/* A94E6C 8024172C 0C00EABB */ jal get_npc_unsafe -/* A94E70 80241730 86240008 */ lh $a0, 8($s1) -/* A94E74 80241734 0040802D */ daddu $s0, $v0, $zero -/* A94E78 80241738 8E22007C */ lw $v0, 0x7c($s1) -/* A94E7C 8024173C 8603008E */ lh $v1, 0x8e($s0) -/* A94E80 80241740 2442FFFF */ addiu $v0, $v0, -1 -/* A94E84 80241744 14620012 */ bne $v1, $v0, .L80241790 -/* A94E88 80241748 00000000 */ nop -/* A94E8C 8024174C C6000038 */ lwc1 $f0, 0x38($s0) -/* A94E90 80241750 4600020D */ trunc.w.s $f8, $f0 -/* A94E94 80241754 44024000 */ mfc1 $v0, $f8 -/* A94E98 80241758 00000000 */ nop -/* A94E9C 8024175C A6220010 */ sh $v0, 0x10($s1) -/* A94EA0 80241760 C600003C */ lwc1 $f0, 0x3c($s0) -/* A94EA4 80241764 4600020D */ trunc.w.s $f8, $f0 -/* A94EA8 80241768 44024000 */ mfc1 $v0, $f8 -/* A94EAC 8024176C 00000000 */ nop -/* A94EB0 80241770 A6220012 */ sh $v0, 0x12($s1) -/* A94EB4 80241774 C6000040 */ lwc1 $f0, 0x40($s0) -/* A94EB8 80241778 24020001 */ addiu $v0, $zero, 1 -/* A94EBC 8024177C A2220007 */ sb $v0, 7($s1) -/* A94EC0 80241780 4600020D */ trunc.w.s $f8, $f0 -/* A94EC4 80241784 44024000 */ mfc1 $v0, $f8 -/* A94EC8 80241788 00000000 */ nop -/* A94ECC 8024178C A6220014 */ sh $v0, 0x14($s1) -.L80241790: -/* A94ED0 80241790 C6000038 */ lwc1 $f0, 0x38($s0) -/* A94ED4 80241794 C602003C */ lwc1 $f2, 0x3c($s0) -/* A94ED8 80241798 C6040040 */ lwc1 $f4, 0x40($s0) -/* A94EDC 8024179C C6060018 */ lwc1 $f6, 0x18($s0) -/* A94EE0 802417A0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A94EE4 802417A4 E7A20024 */ swc1 $f2, 0x24($sp) -/* A94EE8 802417A8 E7A40028 */ swc1 $f4, 0x28($sp) -/* A94EEC 802417AC E7A60010 */ swc1 $f6, 0x10($sp) -/* A94EF0 802417B0 C600000C */ lwc1 $f0, 0xc($s0) -/* A94EF4 802417B4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A94EF8 802417B8 860200A8 */ lh $v0, 0xa8($s0) -/* A94EFC 802417BC 27A50020 */ addiu $a1, $sp, 0x20 -/* A94F00 802417C0 44820000 */ mtc1 $v0, $f0 -/* A94F04 802417C4 00000000 */ nop -/* A94F08 802417C8 46800020 */ cvt.s.w $f0, $f0 -/* A94F0C 802417CC E7A00018 */ swc1 $f0, 0x18($sp) -/* A94F10 802417D0 860200A6 */ lh $v0, 0xa6($s0) -/* A94F14 802417D4 27A60024 */ addiu $a2, $sp, 0x24 -/* A94F18 802417D8 44820000 */ mtc1 $v0, $f0 -/* A94F1C 802417DC 00000000 */ nop -/* A94F20 802417E0 46800020 */ cvt.s.w $f0, $f0 -/* A94F24 802417E4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A94F28 802417E8 8E040080 */ lw $a0, 0x80($s0) -/* A94F2C 802417EC 0C037711 */ jal func_800DDC44 -/* A94F30 802417F0 27A70028 */ addiu $a3, $sp, 0x28 -/* A94F34 802417F4 0040902D */ daddu $s2, $v0, $zero -/* A94F38 802417F8 16400005 */ bnez $s2, .L80241810 -/* A94F3C 802417FC 00000000 */ nop -/* A94F40 80241800 8E050018 */ lw $a1, 0x18($s0) -/* A94F44 80241804 8E06000C */ lw $a2, 0xc($s0) -/* A94F48 80241808 0C00EA95 */ jal npc_move_heading -/* A94F4C 8024180C 0200202D */ daddu $a0, $s0, $zero -.L80241810: -/* A94F50 80241810 8602008E */ lh $v0, 0x8e($s0) -/* A94F54 80241814 9603008E */ lhu $v1, 0x8e($s0) -/* A94F58 80241818 18400007 */ blez $v0, .L80241838 -/* A94F5C 8024181C 2462FFFF */ addiu $v0, $v1, -1 -/* A94F60 80241820 A602008E */ sh $v0, 0x8e($s0) -/* A94F64 80241824 00021400 */ sll $v0, $v0, 0x10 -/* A94F68 80241828 18400003 */ blez $v0, .L80241838 -/* A94F6C 8024182C 00000000 */ nop -/* A94F70 80241830 12400008 */ beqz $s2, .L80241854 -/* A94F74 80241834 00000000 */ nop -.L80241838: -/* A94F78 80241838 8E2200CC */ lw $v0, 0xcc($s1) -/* A94F7C 8024183C A2200007 */ sb $zero, 7($s1) -/* A94F80 80241840 8C420028 */ lw $v0, 0x28($v0) -/* A94F84 80241844 A600008E */ sh $zero, 0x8e($s0) -/* A94F88 80241848 AE020028 */ sw $v0, 0x28($s0) -/* A94F8C 8024184C 2402000F */ addiu $v0, $zero, 0xf -/* A94F90 80241850 AE620070 */ sw $v0, 0x70($s3) -.L80241854: -/* A94F94 80241854 8FBF0040 */ lw $ra, 0x40($sp) -/* A94F98 80241858 8FB3003C */ lw $s3, 0x3c($sp) -/* A94F9C 8024185C 8FB20038 */ lw $s2, 0x38($sp) -/* A94FA0 80241860 8FB10034 */ lw $s1, 0x34($sp) -/* A94FA4 80241864 8FB00030 */ lw $s0, 0x30($sp) -/* A94FA8 80241868 03E00008 */ jr $ra -/* A94FAC 8024186C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index 44ff785ffd..e469a23cd1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -244,7 +244,7 @@ glabel func_802418F0_A95030 .L80241C68: /* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero /* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero -/* A953B0 80241C70 0C0905C3 */ jal func_8024170C_A94E4C +/* A953B0 80241C70 0C0905C3 */ jal kpa_102_UnkNpcAIFunc12 /* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero /* A953B8 80241C78 08090727 */ j .L80241C9C /* A953BC 80241C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802404C0_A52D80.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802404C0_A52D80.s deleted file mode 100644 index 0870a9d8f1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802404C0_A52D80.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/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 7b2bcce445..6fd0b68aae 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -244,7 +244,7 @@ glabel func_802406A4_A52F64 .L80240A1C: /* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A532E4 80240A24 0C090130 */ jal func_802404C0_A52D80 +/* A532E4 80240A24 0C090130 */ jal kpa_11_UnkNpcAIFunc12 /* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A532EC 80240A2C 08090294 */ j .L80240A50 /* A532F0 80240A30 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240360_A9CF90.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240360_A9CF90.s deleted file mode 100644 index 3710cb8e90..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240360_A9CF90.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/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index 0ff38cec5f..1a466e6492 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -244,7 +244,7 @@ glabel func_80240544_A9D174 .L802408BC: /* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero /* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero -/* A9D4F4 802408C4 0C0900D8 */ jal func_80240360_A9CF90 +/* A9D4F4 802408C4 0C0900D8 */ jal kpa_113_UnkNpcAIFunc12 /* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero /* A9D4FC 802408CC 0809023C */ j .L802408F0 /* A9D500 802408D0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC_A61DCC.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC_A61DCC.s deleted file mode 100644 index bc5f6c5a71..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC_A61DCC.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC_A61DCC -/* A61DCC 802413FC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A61DD0 80241400 AFB3003C */ sw $s3, 0x3c($sp) -/* A61DD4 80241404 0080982D */ daddu $s3, $a0, $zero -/* A61DD8 80241408 AFBF0040 */ sw $ra, 0x40($sp) -/* A61DDC 8024140C AFB20038 */ sw $s2, 0x38($sp) -/* A61DE0 80241410 AFB10034 */ sw $s1, 0x34($sp) -/* A61DE4 80241414 AFB00030 */ sw $s0, 0x30($sp) -/* A61DE8 80241418 8E710148 */ lw $s1, 0x148($s3) -/* A61DEC 8024141C 0C00EABB */ jal get_npc_unsafe -/* A61DF0 80241420 86240008 */ lh $a0, 8($s1) -/* A61DF4 80241424 0040802D */ daddu $s0, $v0, $zero -/* A61DF8 80241428 8E22007C */ lw $v0, 0x7c($s1) -/* A61DFC 8024142C 8603008E */ lh $v1, 0x8e($s0) -/* A61E00 80241430 2442FFFF */ addiu $v0, $v0, -1 -/* A61E04 80241434 14620012 */ bne $v1, $v0, .L80241480 -/* A61E08 80241438 00000000 */ nop -/* A61E0C 8024143C C6000038 */ lwc1 $f0, 0x38($s0) -/* A61E10 80241440 4600020D */ trunc.w.s $f8, $f0 -/* A61E14 80241444 44024000 */ mfc1 $v0, $f8 -/* A61E18 80241448 00000000 */ nop -/* A61E1C 8024144C A6220010 */ sh $v0, 0x10($s1) -/* A61E20 80241450 C600003C */ lwc1 $f0, 0x3c($s0) -/* A61E24 80241454 4600020D */ trunc.w.s $f8, $f0 -/* A61E28 80241458 44024000 */ mfc1 $v0, $f8 -/* A61E2C 8024145C 00000000 */ nop -/* A61E30 80241460 A6220012 */ sh $v0, 0x12($s1) -/* A61E34 80241464 C6000040 */ lwc1 $f0, 0x40($s0) -/* A61E38 80241468 24020001 */ addiu $v0, $zero, 1 -/* A61E3C 8024146C A2220007 */ sb $v0, 7($s1) -/* A61E40 80241470 4600020D */ trunc.w.s $f8, $f0 -/* A61E44 80241474 44024000 */ mfc1 $v0, $f8 -/* A61E48 80241478 00000000 */ nop -/* A61E4C 8024147C A6220014 */ sh $v0, 0x14($s1) -.L80241480: -/* A61E50 80241480 C6000038 */ lwc1 $f0, 0x38($s0) -/* A61E54 80241484 C602003C */ lwc1 $f2, 0x3c($s0) -/* A61E58 80241488 C6040040 */ lwc1 $f4, 0x40($s0) -/* A61E5C 8024148C C6060018 */ lwc1 $f6, 0x18($s0) -/* A61E60 80241490 E7A00020 */ swc1 $f0, 0x20($sp) -/* A61E64 80241494 E7A20024 */ swc1 $f2, 0x24($sp) -/* A61E68 80241498 E7A40028 */ swc1 $f4, 0x28($sp) -/* A61E6C 8024149C E7A60010 */ swc1 $f6, 0x10($sp) -/* A61E70 802414A0 C600000C */ lwc1 $f0, 0xc($s0) -/* A61E74 802414A4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A61E78 802414A8 860200A8 */ lh $v0, 0xa8($s0) -/* A61E7C 802414AC 27A50020 */ addiu $a1, $sp, 0x20 -/* A61E80 802414B0 44820000 */ mtc1 $v0, $f0 -/* A61E84 802414B4 00000000 */ nop -/* A61E88 802414B8 46800020 */ cvt.s.w $f0, $f0 -/* A61E8C 802414BC E7A00018 */ swc1 $f0, 0x18($sp) -/* A61E90 802414C0 860200A6 */ lh $v0, 0xa6($s0) -/* A61E94 802414C4 27A60024 */ addiu $a2, $sp, 0x24 -/* A61E98 802414C8 44820000 */ mtc1 $v0, $f0 -/* A61E9C 802414CC 00000000 */ nop -/* A61EA0 802414D0 46800020 */ cvt.s.w $f0, $f0 -/* A61EA4 802414D4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A61EA8 802414D8 8E040080 */ lw $a0, 0x80($s0) -/* A61EAC 802414DC 0C037711 */ jal func_800DDC44 -/* A61EB0 802414E0 27A70028 */ addiu $a3, $sp, 0x28 -/* A61EB4 802414E4 0040902D */ daddu $s2, $v0, $zero -/* A61EB8 802414E8 16400005 */ bnez $s2, .L80241500 -/* A61EBC 802414EC 00000000 */ nop -/* A61EC0 802414F0 8E050018 */ lw $a1, 0x18($s0) -/* A61EC4 802414F4 8E06000C */ lw $a2, 0xc($s0) -/* A61EC8 802414F8 0C00EA95 */ jal npc_move_heading -/* A61ECC 802414FC 0200202D */ daddu $a0, $s0, $zero -.L80241500: -/* A61ED0 80241500 8602008E */ lh $v0, 0x8e($s0) -/* A61ED4 80241504 9603008E */ lhu $v1, 0x8e($s0) -/* A61ED8 80241508 18400007 */ blez $v0, .L80241528 -/* A61EDC 8024150C 2462FFFF */ addiu $v0, $v1, -1 -/* A61EE0 80241510 A602008E */ sh $v0, 0x8e($s0) -/* A61EE4 80241514 00021400 */ sll $v0, $v0, 0x10 -/* A61EE8 80241518 18400003 */ blez $v0, .L80241528 -/* A61EEC 8024151C 00000000 */ nop -/* A61EF0 80241520 12400008 */ beqz $s2, .L80241544 -/* A61EF4 80241524 00000000 */ nop -.L80241528: -/* A61EF8 80241528 8E2200CC */ lw $v0, 0xcc($s1) -/* A61EFC 8024152C A2200007 */ sb $zero, 7($s1) -/* A61F00 80241530 8C420028 */ lw $v0, 0x28($v0) -/* A61F04 80241534 A600008E */ sh $zero, 0x8e($s0) -/* A61F08 80241538 AE020028 */ sw $v0, 0x28($s0) -/* A61F0C 8024153C 2402000F */ addiu $v0, $zero, 0xf -/* A61F10 80241540 AE620070 */ sw $v0, 0x70($s3) -.L80241544: -/* A61F14 80241544 8FBF0040 */ lw $ra, 0x40($sp) -/* A61F18 80241548 8FB3003C */ lw $s3, 0x3c($sp) -/* A61F1C 8024154C 8FB20038 */ lw $s2, 0x38($sp) -/* A61F20 80241550 8FB10034 */ lw $s1, 0x34($sp) -/* A61F24 80241554 8FB00030 */ lw $s0, 0x30($sp) -/* A61F28 80241558 03E00008 */ jr $ra -/* A61F2C 8024155C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index 616506debe..3c6688e6cf 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -244,7 +244,7 @@ glabel func_802415E0_A61FB0 .L80241958: /* A62328 80241958 0260202D */ daddu $a0, $s3, $zero /* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero -/* A62330 80241960 0C0904FF */ jal func_802413FC_A61DCC +/* A62330 80241960 0C0904FF */ jal kpa_50_UnkNpcAIFunc12 /* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero /* A62338 80241968 08090663 */ j .L8024198C /* A6233C 8024196C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802415FC_A6568C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802415FC_A6568C.s deleted file mode 100644 index 29415e7ffb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802415FC_A6568C.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/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index 9ab7d52a85..726ea1285d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -244,7 +244,7 @@ glabel func_802417E0_A65870 .L80241B58: /* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero /* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero -/* A65BF0 80241B60 0C09057F */ jal func_802415FC_A6568C +/* A65BF0 80241B60 0C09057F */ jal kpa_51_UnkNpcAIFunc12 /* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero /* A65BF8 80241B68 080906E3 */ j .L80241B8C /* A65BFC 80241B6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802404C0_A6E8A0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802404C0_A6E8A0.s deleted file mode 100644 index 9f849090bd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802404C0_A6E8A0.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/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index a56f28c679..200425ef5f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -244,7 +244,7 @@ glabel func_802406A4_A6EA84 .L80240A1C: /* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A6EE04 80240A24 0C090130 */ jal func_802404C0_A6E8A0 +/* A6EE04 80240A24 0C090130 */ jal kpa_61_UnkNpcAIFunc12 /* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A6EE0C 80240A2C 08090294 */ j .L80240A50 /* A6EE10 80240A30 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802404C0_A74D30.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802404C0_A74D30.s deleted file mode 100644 index 72f671a663..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802404C0_A74D30.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/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 478369e3b2..97a2726d6b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -244,7 +244,7 @@ glabel func_802406A4_A74F14 .L80240A1C: /* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A75294 80240A24 0C090130 */ jal func_802404C0_A74D30 +/* A75294 80240A24 0C090130 */ jal kpa_70_UnkNpcAIFunc12 /* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A7529C 80240A2C 08090294 */ j .L80240A50 /* A752A0 80240A30 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241040_A87A90.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241040_A87A90.s deleted file mode 100644 index 707bdb8429..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241040_A87A90.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/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 0180fbc6c9..4cac1a1f46 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -179,7 +179,7 @@ glabel func_80241224_A87C74 /* A87F14 802414C4 00000000 */ nop /* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero /* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero -/* A87F20 802414D0 0C090410 */ jal func_80241040_A87A90 +/* A87F20 802414D0 0C090410 */ jal kpa_91_UnkNpcAIFunc12 /* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero /* A87F28 802414D8 08090540 */ j .L80241500 /* A87F2C 802414DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241120_A8DBA0.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241120_A8DBA0.s deleted file mode 100644 index 14583d7da6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241120_A8DBA0.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/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index 90962618cd..1f4a9bf32d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -179,7 +179,7 @@ glabel func_80241304_A8DD84 /* A8E024 802415A4 00000000 */ nop /* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero /* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero -/* A8E030 802415B0 0C090448 */ jal func_80241120_A8DBA0 +/* A8E030 802415B0 0C090448 */ jal kpa_95_UnkNpcAIFunc12 /* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero /* A8E038 802415B8 08090578 */ j .L802415E0 /* A8E03C 802415BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802404C0_C611D0.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802404C0_C611D0.s deleted file mode 100644 index e86c7a57d6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802404C0_C611D0.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/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index 20258b4e0d..e6d902d04f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -244,7 +244,7 @@ glabel func_802406A4_C613B4 .L80240A1C: /* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero -/* C61734 80240A24 0C090130 */ jal func_802404C0_C611D0 +/* C61734 80240A24 0C090130 */ jal kzn_03_UnkNpcAIFunc12 /* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero /* C6173C 80240A2C 08090294 */ j .L80240A50 /* C61740 80240A30 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74_C79854.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74_C79854.s deleted file mode 100644 index e1a3890878..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74_C79854.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B74_C79854 -/* C79854 80242B74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C79858 80242B78 AFB3003C */ sw $s3, 0x3c($sp) -/* C7985C 80242B7C 0080982D */ daddu $s3, $a0, $zero -/* C79860 80242B80 AFBF0040 */ sw $ra, 0x40($sp) -/* C79864 80242B84 AFB20038 */ sw $s2, 0x38($sp) -/* C79868 80242B88 AFB10034 */ sw $s1, 0x34($sp) -/* C7986C 80242B8C AFB00030 */ sw $s0, 0x30($sp) -/* C79870 80242B90 8E710148 */ lw $s1, 0x148($s3) -/* C79874 80242B94 0C00EABB */ jal get_npc_unsafe -/* C79878 80242B98 86240008 */ lh $a0, 8($s1) -/* C7987C 80242B9C 0040802D */ daddu $s0, $v0, $zero -/* C79880 80242BA0 8E22007C */ lw $v0, 0x7c($s1) -/* C79884 80242BA4 8603008E */ lh $v1, 0x8e($s0) -/* C79888 80242BA8 2442FFFF */ addiu $v0, $v0, -1 -/* C7988C 80242BAC 14620012 */ bne $v1, $v0, .L80242BF8 -/* C79890 80242BB0 00000000 */ nop -/* C79894 80242BB4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C79898 80242BB8 4600020D */ trunc.w.s $f8, $f0 -/* C7989C 80242BBC 44024000 */ mfc1 $v0, $f8 -/* C798A0 80242BC0 00000000 */ nop -/* C798A4 80242BC4 A6220010 */ sh $v0, 0x10($s1) -/* C798A8 80242BC8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C798AC 80242BCC 4600020D */ trunc.w.s $f8, $f0 -/* C798B0 80242BD0 44024000 */ mfc1 $v0, $f8 -/* C798B4 80242BD4 00000000 */ nop -/* C798B8 80242BD8 A6220012 */ sh $v0, 0x12($s1) -/* C798BC 80242BDC C6000040 */ lwc1 $f0, 0x40($s0) -/* C798C0 80242BE0 24020001 */ addiu $v0, $zero, 1 -/* C798C4 80242BE4 A2220007 */ sb $v0, 7($s1) -/* C798C8 80242BE8 4600020D */ trunc.w.s $f8, $f0 -/* C798CC 80242BEC 44024000 */ mfc1 $v0, $f8 -/* C798D0 80242BF0 00000000 */ nop -/* C798D4 80242BF4 A6220014 */ sh $v0, 0x14($s1) -.L80242BF8: -/* C798D8 80242BF8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C798DC 80242BFC C602003C */ lwc1 $f2, 0x3c($s0) -/* C798E0 80242C00 C6040040 */ lwc1 $f4, 0x40($s0) -/* C798E4 80242C04 C6060018 */ lwc1 $f6, 0x18($s0) -/* C798E8 80242C08 E7A00020 */ swc1 $f0, 0x20($sp) -/* C798EC 80242C0C E7A20024 */ swc1 $f2, 0x24($sp) -/* C798F0 80242C10 E7A40028 */ swc1 $f4, 0x28($sp) -/* C798F4 80242C14 E7A60010 */ swc1 $f6, 0x10($sp) -/* C798F8 80242C18 C600000C */ lwc1 $f0, 0xc($s0) -/* C798FC 80242C1C E7A00014 */ swc1 $f0, 0x14($sp) -/* C79900 80242C20 860200A8 */ lh $v0, 0xa8($s0) -/* C79904 80242C24 27A50020 */ addiu $a1, $sp, 0x20 -/* C79908 80242C28 44820000 */ mtc1 $v0, $f0 -/* C7990C 80242C2C 00000000 */ nop -/* C79910 80242C30 46800020 */ cvt.s.w $f0, $f0 -/* C79914 80242C34 E7A00018 */ swc1 $f0, 0x18($sp) -/* C79918 80242C38 860200A6 */ lh $v0, 0xa6($s0) -/* C7991C 80242C3C 27A60024 */ addiu $a2, $sp, 0x24 -/* C79920 80242C40 44820000 */ mtc1 $v0, $f0 -/* C79924 80242C44 00000000 */ nop -/* C79928 80242C48 46800020 */ cvt.s.w $f0, $f0 -/* C7992C 80242C4C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C79930 80242C50 8E040080 */ lw $a0, 0x80($s0) -/* C79934 80242C54 0C037711 */ jal func_800DDC44 -/* C79938 80242C58 27A70028 */ addiu $a3, $sp, 0x28 -/* C7993C 80242C5C 0040902D */ daddu $s2, $v0, $zero -/* C79940 80242C60 16400005 */ bnez $s2, .L80242C78 -/* C79944 80242C64 00000000 */ nop -/* C79948 80242C68 8E050018 */ lw $a1, 0x18($s0) -/* C7994C 80242C6C 8E06000C */ lw $a2, 0xc($s0) -/* C79950 80242C70 0C00EA95 */ jal npc_move_heading -/* C79954 80242C74 0200202D */ daddu $a0, $s0, $zero -.L80242C78: -/* C79958 80242C78 8602008E */ lh $v0, 0x8e($s0) -/* C7995C 80242C7C 9603008E */ lhu $v1, 0x8e($s0) -/* C79960 80242C80 18400007 */ blez $v0, .L80242CA0 -/* C79964 80242C84 2462FFFF */ addiu $v0, $v1, -1 -/* C79968 80242C88 A602008E */ sh $v0, 0x8e($s0) -/* C7996C 80242C8C 00021400 */ sll $v0, $v0, 0x10 -/* C79970 80242C90 18400003 */ blez $v0, .L80242CA0 -/* C79974 80242C94 00000000 */ nop -/* C79978 80242C98 12400008 */ beqz $s2, .L80242CBC -/* C7997C 80242C9C 00000000 */ nop -.L80242CA0: -/* C79980 80242CA0 8E2200CC */ lw $v0, 0xcc($s1) -/* C79984 80242CA4 A2200007 */ sb $zero, 7($s1) -/* C79988 80242CA8 8C420028 */ lw $v0, 0x28($v0) -/* C7998C 80242CAC A600008E */ sh $zero, 0x8e($s0) -/* C79990 80242CB0 AE020028 */ sw $v0, 0x28($s0) -/* C79994 80242CB4 2402000F */ addiu $v0, $zero, 0xf -/* C79998 80242CB8 AE620070 */ sw $v0, 0x70($s3) -.L80242CBC: -/* C7999C 80242CBC 8FBF0040 */ lw $ra, 0x40($sp) -/* C799A0 80242CC0 8FB3003C */ lw $s3, 0x3c($sp) -/* C799A4 80242CC4 8FB20038 */ lw $s2, 0x38($sp) -/* C799A8 80242CC8 8FB10034 */ lw $s1, 0x34($sp) -/* C799AC 80242CCC 8FB00030 */ lw $s0, 0x30($sp) -/* C799B0 80242CD0 03E00008 */ jr $ra -/* C799B4 80242CD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index b437d272ff..0707daf779 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -244,7 +244,7 @@ glabel func_80242D58_C79A38 .L802430D0: /* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero /* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero -/* C79DB8 802430D8 0C090ADD */ jal func_80242B74_C79854 +/* C79DB8 802430D8 0C090ADD */ jal kzn_09_UnkNpcAIFunc12 /* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero /* C79DC0 802430E0 08090C41 */ j .L80243104 /* C79DC4 802430E4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64_C87914.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64_C87914.s deleted file mode 100644 index e2b65c3a70..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64_C87914.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E64_C87914 -/* C87914 80241E64 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C87918 80241E68 AFB3003C */ sw $s3, 0x3c($sp) -/* C8791C 80241E6C 0080982D */ daddu $s3, $a0, $zero -/* C87920 80241E70 AFBF0040 */ sw $ra, 0x40($sp) -/* C87924 80241E74 AFB20038 */ sw $s2, 0x38($sp) -/* C87928 80241E78 AFB10034 */ sw $s1, 0x34($sp) -/* C8792C 80241E7C AFB00030 */ sw $s0, 0x30($sp) -/* C87930 80241E80 8E710148 */ lw $s1, 0x148($s3) -/* C87934 80241E84 0C00EABB */ jal get_npc_unsafe -/* C87938 80241E88 86240008 */ lh $a0, 8($s1) -/* C8793C 80241E8C 0040802D */ daddu $s0, $v0, $zero -/* C87940 80241E90 8E22007C */ lw $v0, 0x7c($s1) -/* C87944 80241E94 8603008E */ lh $v1, 0x8e($s0) -/* C87948 80241E98 2442FFFF */ addiu $v0, $v0, -1 -/* C8794C 80241E9C 14620012 */ bne $v1, $v0, .L80241EE8 -/* C87950 80241EA0 00000000 */ nop -/* C87954 80241EA4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C87958 80241EA8 4600020D */ trunc.w.s $f8, $f0 -/* C8795C 80241EAC 44024000 */ mfc1 $v0, $f8 -/* C87960 80241EB0 00000000 */ nop -/* C87964 80241EB4 A6220010 */ sh $v0, 0x10($s1) -/* C87968 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8796C 80241EBC 4600020D */ trunc.w.s $f8, $f0 -/* C87970 80241EC0 44024000 */ mfc1 $v0, $f8 -/* C87974 80241EC4 00000000 */ nop -/* C87978 80241EC8 A6220012 */ sh $v0, 0x12($s1) -/* C8797C 80241ECC C6000040 */ lwc1 $f0, 0x40($s0) -/* C87980 80241ED0 24020001 */ addiu $v0, $zero, 1 -/* C87984 80241ED4 A2220007 */ sb $v0, 7($s1) -/* C87988 80241ED8 4600020D */ trunc.w.s $f8, $f0 -/* C8798C 80241EDC 44024000 */ mfc1 $v0, $f8 -/* C87990 80241EE0 00000000 */ nop -/* C87994 80241EE4 A6220014 */ sh $v0, 0x14($s1) -.L80241EE8: -/* C87998 80241EE8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C8799C 80241EEC C602003C */ lwc1 $f2, 0x3c($s0) -/* C879A0 80241EF0 C6040040 */ lwc1 $f4, 0x40($s0) -/* C879A4 80241EF4 C6060018 */ lwc1 $f6, 0x18($s0) -/* C879A8 80241EF8 E7A00020 */ swc1 $f0, 0x20($sp) -/* C879AC 80241EFC E7A20024 */ swc1 $f2, 0x24($sp) -/* C879B0 80241F00 E7A40028 */ swc1 $f4, 0x28($sp) -/* C879B4 80241F04 E7A60010 */ swc1 $f6, 0x10($sp) -/* C879B8 80241F08 C600000C */ lwc1 $f0, 0xc($s0) -/* C879BC 80241F0C E7A00014 */ swc1 $f0, 0x14($sp) -/* C879C0 80241F10 860200A8 */ lh $v0, 0xa8($s0) -/* C879C4 80241F14 27A50020 */ addiu $a1, $sp, 0x20 -/* C879C8 80241F18 44820000 */ mtc1 $v0, $f0 -/* C879CC 80241F1C 00000000 */ nop -/* C879D0 80241F20 46800020 */ cvt.s.w $f0, $f0 -/* C879D4 80241F24 E7A00018 */ swc1 $f0, 0x18($sp) -/* C879D8 80241F28 860200A6 */ lh $v0, 0xa6($s0) -/* C879DC 80241F2C 27A60024 */ addiu $a2, $sp, 0x24 -/* C879E0 80241F30 44820000 */ mtc1 $v0, $f0 -/* C879E4 80241F34 00000000 */ nop -/* C879E8 80241F38 46800020 */ cvt.s.w $f0, $f0 -/* C879EC 80241F3C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C879F0 80241F40 8E040080 */ lw $a0, 0x80($s0) -/* C879F4 80241F44 0C037711 */ jal func_800DDC44 -/* C879F8 80241F48 27A70028 */ addiu $a3, $sp, 0x28 -/* C879FC 80241F4C 0040902D */ daddu $s2, $v0, $zero -/* C87A00 80241F50 16400005 */ bnez $s2, .L80241F68 -/* C87A04 80241F54 00000000 */ nop -/* C87A08 80241F58 8E050018 */ lw $a1, 0x18($s0) -/* C87A0C 80241F5C 8E06000C */ lw $a2, 0xc($s0) -/* C87A10 80241F60 0C00EA95 */ jal npc_move_heading -/* C87A14 80241F64 0200202D */ daddu $a0, $s0, $zero -.L80241F68: -/* C87A18 80241F68 8602008E */ lh $v0, 0x8e($s0) -/* C87A1C 80241F6C 9603008E */ lhu $v1, 0x8e($s0) -/* C87A20 80241F70 18400007 */ blez $v0, .L80241F90 -/* C87A24 80241F74 2462FFFF */ addiu $v0, $v1, -1 -/* C87A28 80241F78 A602008E */ sh $v0, 0x8e($s0) -/* C87A2C 80241F7C 00021400 */ sll $v0, $v0, 0x10 -/* C87A30 80241F80 18400003 */ blez $v0, .L80241F90 -/* C87A34 80241F84 00000000 */ nop -/* C87A38 80241F88 12400008 */ beqz $s2, .L80241FAC -/* C87A3C 80241F8C 00000000 */ nop -.L80241F90: -/* C87A40 80241F90 8E2200CC */ lw $v0, 0xcc($s1) -/* C87A44 80241F94 A2200007 */ sb $zero, 7($s1) -/* C87A48 80241F98 8C420028 */ lw $v0, 0x28($v0) -/* C87A4C 80241F9C A600008E */ sh $zero, 0x8e($s0) -/* C87A50 80241FA0 AE020028 */ sw $v0, 0x28($s0) -/* C87A54 80241FA4 2402000F */ addiu $v0, $zero, 0xf -/* C87A58 80241FA8 AE620070 */ sw $v0, 0x70($s3) -.L80241FAC: -/* C87A5C 80241FAC 8FBF0040 */ lw $ra, 0x40($sp) -/* C87A60 80241FB0 8FB3003C */ lw $s3, 0x3c($sp) -/* C87A64 80241FB4 8FB20038 */ lw $s2, 0x38($sp) -/* C87A68 80241FB8 8FB10034 */ lw $s1, 0x34($sp) -/* C87A6C 80241FBC 8FB00030 */ lw $s0, 0x30($sp) -/* C87A70 80241FC0 03E00008 */ jr $ra -/* C87A74 80241FC4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index a67db01488..8af99721a7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -244,7 +244,7 @@ glabel func_80242048_C87AF8 .L802423C0: /* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero /* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero -/* C87E78 802423C8 0C090799 */ jal func_80241E64_C87914 +/* C87E78 802423C8 0C090799 */ jal kzn_17_UnkNpcAIFunc12 /* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero /* C87E80 802423D0 080908FD */ j .L802423F4 /* C87E84 802423D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802401B0_9F4BF0.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802401B0_9F4BF0.s deleted file mode 100644 index 171787a68b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802401B0_9F4BF0.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/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index e416d0c601..ffd8e84d0d 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -244,7 +244,7 @@ glabel func_80240394_9F4DD4 .L8024070C: /* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero -/* 9F5154 80240714 0C09006C */ jal func_802401B0_9F4BF0 +/* 9F5154 80240714 0C09006C */ jal nok_11_UnkNpcAIFunc12 /* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero /* 9F515C 8024071C 080901D0 */ j .L80240740 /* 9F5160 80240720 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240720_9FAF10.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240720_9FAF10.s deleted file mode 100644 index 115cd46b71..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240720_9FAF10.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/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index e7fc467555..233efc8070 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -244,7 +244,7 @@ glabel func_80240904_9FB0F4 .L80240C7C: /* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero /* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero -/* 9FB474 80240C84 0C0901C8 */ jal func_80240720_9FAF10 +/* 9FB474 80240C84 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 /* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero /* 9FB47C 80240C8C 0809032C */ j .L80240CB0 /* 9FB480 80240C90 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 3e2dc227b8..75e8163db7 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -179,7 +179,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC664 80241E74 00000000 */ nop /* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero /* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero -/* 9FC670 80241E80 0C0901C8 */ jal func_80240720_9FAF10 +/* 9FC670 80241E80 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 /* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero /* 9FC678 80241E88 080907AC */ j .L80241EB0 /* 9FC67C 80241E8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240370_A02BB0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240370_A02BB0.s deleted file mode 100644 index 0579285d14..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240370_A02BB0.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/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index 4206be510e..e65952094a 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -244,7 +244,7 @@ glabel func_80240554_A02D94 .L802408CC: /* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero /* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero -/* A03114 802408D4 0C0900DC */ jal func_80240370_A02BB0 +/* A03114 802408D4 0C0900DC */ jal nok_14_UnkNpcAIFunc12 /* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero /* A0311C 802408DC 08090240 */ j .L80240900 /* A03120 802408E0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240490_A07390.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240490_A07390.s deleted file mode 100644 index 6c6d94a570..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240490_A07390.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/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index 8b95270bee..5011b79dbe 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -244,7 +244,7 @@ glabel func_80240674_A07574 .L802409EC: /* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero /* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero -/* A078F4 802409F4 0C090124 */ jal func_80240490_A07390 +/* A078F4 802409F4 0C090124 */ jal nok_15_UnkNpcAIFunc12 /* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero /* A078FC 802409FC 08090288 */ j .L80240A20 /* A07900 80240A00 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0_882DA0.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0_882DA0.s deleted file mode 100644 index 6aa319b691..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0_882DA0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_882DA0 -/* 882DA0 80240BE0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 882DA4 80240BE4 AFB3003C */ sw $s3, 0x3c($sp) -/* 882DA8 80240BE8 0080982D */ daddu $s3, $a0, $zero -/* 882DAC 80240BEC AFBF0040 */ sw $ra, 0x40($sp) -/* 882DB0 80240BF0 AFB20038 */ sw $s2, 0x38($sp) -/* 882DB4 80240BF4 AFB10034 */ sw $s1, 0x34($sp) -/* 882DB8 80240BF8 AFB00030 */ sw $s0, 0x30($sp) -/* 882DBC 80240BFC 8E710148 */ lw $s1, 0x148($s3) -/* 882DC0 80240C00 0C00EABB */ jal get_npc_unsafe -/* 882DC4 80240C04 86240008 */ lh $a0, 8($s1) -/* 882DC8 80240C08 0040802D */ daddu $s0, $v0, $zero -/* 882DCC 80240C0C 8E22007C */ lw $v0, 0x7c($s1) -/* 882DD0 80240C10 8603008E */ lh $v1, 0x8e($s0) -/* 882DD4 80240C14 2442FFFF */ addiu $v0, $v0, -1 -/* 882DD8 80240C18 14620012 */ bne $v1, $v0, .L80240C64 -/* 882DDC 80240C1C 00000000 */ nop -/* 882DE0 80240C20 C6000038 */ lwc1 $f0, 0x38($s0) -/* 882DE4 80240C24 4600020D */ trunc.w.s $f8, $f0 -/* 882DE8 80240C28 44024000 */ mfc1 $v0, $f8 -/* 882DEC 80240C2C 00000000 */ nop -/* 882DF0 80240C30 A6220010 */ sh $v0, 0x10($s1) -/* 882DF4 80240C34 C600003C */ lwc1 $f0, 0x3c($s0) -/* 882DF8 80240C38 4600020D */ trunc.w.s $f8, $f0 -/* 882DFC 80240C3C 44024000 */ mfc1 $v0, $f8 -/* 882E00 80240C40 00000000 */ nop -/* 882E04 80240C44 A6220012 */ sh $v0, 0x12($s1) -/* 882E08 80240C48 C6000040 */ lwc1 $f0, 0x40($s0) -/* 882E0C 80240C4C 24020001 */ addiu $v0, $zero, 1 -/* 882E10 80240C50 A2220007 */ sb $v0, 7($s1) -/* 882E14 80240C54 4600020D */ trunc.w.s $f8, $f0 -/* 882E18 80240C58 44024000 */ mfc1 $v0, $f8 -/* 882E1C 80240C5C 00000000 */ nop -/* 882E20 80240C60 A6220014 */ sh $v0, 0x14($s1) -.L80240C64: -/* 882E24 80240C64 C6000038 */ lwc1 $f0, 0x38($s0) -/* 882E28 80240C68 C602003C */ lwc1 $f2, 0x3c($s0) -/* 882E2C 80240C6C C6040040 */ lwc1 $f4, 0x40($s0) -/* 882E30 80240C70 C6060018 */ lwc1 $f6, 0x18($s0) -/* 882E34 80240C74 E7A00020 */ swc1 $f0, 0x20($sp) -/* 882E38 80240C78 E7A20024 */ swc1 $f2, 0x24($sp) -/* 882E3C 80240C7C E7A40028 */ swc1 $f4, 0x28($sp) -/* 882E40 80240C80 E7A60010 */ swc1 $f6, 0x10($sp) -/* 882E44 80240C84 C600000C */ lwc1 $f0, 0xc($s0) -/* 882E48 80240C88 E7A00014 */ swc1 $f0, 0x14($sp) -/* 882E4C 80240C8C 860200A8 */ lh $v0, 0xa8($s0) -/* 882E50 80240C90 27A50020 */ addiu $a1, $sp, 0x20 -/* 882E54 80240C94 44820000 */ mtc1 $v0, $f0 -/* 882E58 80240C98 00000000 */ nop -/* 882E5C 80240C9C 46800020 */ cvt.s.w $f0, $f0 -/* 882E60 80240CA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 882E64 80240CA4 860200A6 */ lh $v0, 0xa6($s0) -/* 882E68 80240CA8 27A60024 */ addiu $a2, $sp, 0x24 -/* 882E6C 80240CAC 44820000 */ mtc1 $v0, $f0 -/* 882E70 80240CB0 00000000 */ nop -/* 882E74 80240CB4 46800020 */ cvt.s.w $f0, $f0 -/* 882E78 80240CB8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 882E7C 80240CBC 8E040080 */ lw $a0, 0x80($s0) -/* 882E80 80240CC0 0C037711 */ jal func_800DDC44 -/* 882E84 80240CC4 27A70028 */ addiu $a3, $sp, 0x28 -/* 882E88 80240CC8 0040902D */ daddu $s2, $v0, $zero -/* 882E8C 80240CCC 16400005 */ bnez $s2, .L80240CE4 -/* 882E90 80240CD0 00000000 */ nop -/* 882E94 80240CD4 8E050018 */ lw $a1, 0x18($s0) -/* 882E98 80240CD8 8E06000C */ lw $a2, 0xc($s0) -/* 882E9C 80240CDC 0C00EA95 */ jal npc_move_heading -/* 882EA0 80240CE0 0200202D */ daddu $a0, $s0, $zero -.L80240CE4: -/* 882EA4 80240CE4 8602008E */ lh $v0, 0x8e($s0) -/* 882EA8 80240CE8 9603008E */ lhu $v1, 0x8e($s0) -/* 882EAC 80240CEC 18400007 */ blez $v0, .L80240D0C -/* 882EB0 80240CF0 2462FFFF */ addiu $v0, $v1, -1 -/* 882EB4 80240CF4 A602008E */ sh $v0, 0x8e($s0) -/* 882EB8 80240CF8 00021400 */ sll $v0, $v0, 0x10 -/* 882EBC 80240CFC 18400003 */ blez $v0, .L80240D0C -/* 882EC0 80240D00 00000000 */ nop -/* 882EC4 80240D04 12400008 */ beqz $s2, .L80240D28 -/* 882EC8 80240D08 00000000 */ nop -.L80240D0C: -/* 882ECC 80240D0C 8E2200CC */ lw $v0, 0xcc($s1) -/* 882ED0 80240D10 A2200007 */ sb $zero, 7($s1) -/* 882ED4 80240D14 8C420028 */ lw $v0, 0x28($v0) -/* 882ED8 80240D18 A600008E */ sh $zero, 0x8e($s0) -/* 882EDC 80240D1C AE020028 */ sw $v0, 0x28($s0) -/* 882EE0 80240D20 2402000F */ addiu $v0, $zero, 0xf -/* 882EE4 80240D24 AE620070 */ sw $v0, 0x70($s3) -.L80240D28: -/* 882EE8 80240D28 8FBF0040 */ lw $ra, 0x40($sp) -/* 882EEC 80240D2C 8FB3003C */ lw $s3, 0x3c($sp) -/* 882EF0 80240D30 8FB20038 */ lw $s2, 0x38($sp) -/* 882EF4 80240D34 8FB10034 */ lw $s1, 0x34($sp) -/* 882EF8 80240D38 8FB00030 */ lw $s0, 0x30($sp) -/* 882EFC 80240D3C 03E00008 */ jr $ra -/* 882F00 80240D40 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index bd07dd7875..07f60e056f 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -244,7 +244,7 @@ glabel func_80240DC4_882F84 .L8024113C: /* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero /* 883300 80241140 0280282D */ daddu $a1, $s4, $zero -/* 883304 80241144 0C0902F8 */ jal func_80240BE0_882DA0 +/* 883304 80241144 0C0902F8 */ jal tik_09_UnkNpcAIFunc12 /* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero /* 88330C 8024114C 0809045C */ j .L80241170 /* 883310 80241150 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10_88A6E0.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10_88A6E0.s deleted file mode 100644 index 547d8a1b7a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10_88A6E0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B10_88A6E0 -/* 88A6E0 80241B10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 88A6E4 80241B14 AFB3003C */ sw $s3, 0x3c($sp) -/* 88A6E8 80241B18 0080982D */ daddu $s3, $a0, $zero -/* 88A6EC 80241B1C AFBF0040 */ sw $ra, 0x40($sp) -/* 88A6F0 80241B20 AFB20038 */ sw $s2, 0x38($sp) -/* 88A6F4 80241B24 AFB10034 */ sw $s1, 0x34($sp) -/* 88A6F8 80241B28 AFB00030 */ sw $s0, 0x30($sp) -/* 88A6FC 80241B2C 8E710148 */ lw $s1, 0x148($s3) -/* 88A700 80241B30 0C00EABB */ jal get_npc_unsafe -/* 88A704 80241B34 86240008 */ lh $a0, 8($s1) -/* 88A708 80241B38 0040802D */ daddu $s0, $v0, $zero -/* 88A70C 80241B3C 8E22007C */ lw $v0, 0x7c($s1) -/* 88A710 80241B40 8603008E */ lh $v1, 0x8e($s0) -/* 88A714 80241B44 2442FFFF */ addiu $v0, $v0, -1 -/* 88A718 80241B48 14620012 */ bne $v1, $v0, .L80241B94 -/* 88A71C 80241B4C 00000000 */ nop -/* 88A720 80241B50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 88A724 80241B54 4600020D */ trunc.w.s $f8, $f0 -/* 88A728 80241B58 44024000 */ mfc1 $v0, $f8 -/* 88A72C 80241B5C 00000000 */ nop -/* 88A730 80241B60 A6220010 */ sh $v0, 0x10($s1) -/* 88A734 80241B64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 88A738 80241B68 4600020D */ trunc.w.s $f8, $f0 -/* 88A73C 80241B6C 44024000 */ mfc1 $v0, $f8 -/* 88A740 80241B70 00000000 */ nop -/* 88A744 80241B74 A6220012 */ sh $v0, 0x12($s1) -/* 88A748 80241B78 C6000040 */ lwc1 $f0, 0x40($s0) -/* 88A74C 80241B7C 24020001 */ addiu $v0, $zero, 1 -/* 88A750 80241B80 A2220007 */ sb $v0, 7($s1) -/* 88A754 80241B84 4600020D */ trunc.w.s $f8, $f0 -/* 88A758 80241B88 44024000 */ mfc1 $v0, $f8 -/* 88A75C 80241B8C 00000000 */ nop -/* 88A760 80241B90 A6220014 */ sh $v0, 0x14($s1) -.L80241B94: -/* 88A764 80241B94 C6000038 */ lwc1 $f0, 0x38($s0) -/* 88A768 80241B98 C602003C */ lwc1 $f2, 0x3c($s0) -/* 88A76C 80241B9C C6040040 */ lwc1 $f4, 0x40($s0) -/* 88A770 80241BA0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 88A774 80241BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 88A778 80241BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 88A77C 80241BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 88A780 80241BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 88A784 80241BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 88A788 80241BB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 88A78C 80241BBC 860200A8 */ lh $v0, 0xa8($s0) -/* 88A790 80241BC0 27A50020 */ addiu $a1, $sp, 0x20 -/* 88A794 80241BC4 44820000 */ mtc1 $v0, $f0 -/* 88A798 80241BC8 00000000 */ nop -/* 88A79C 80241BCC 46800020 */ cvt.s.w $f0, $f0 -/* 88A7A0 80241BD0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 88A7A4 80241BD4 860200A6 */ lh $v0, 0xa6($s0) -/* 88A7A8 80241BD8 27A60024 */ addiu $a2, $sp, 0x24 -/* 88A7AC 80241BDC 44820000 */ mtc1 $v0, $f0 -/* 88A7B0 80241BE0 00000000 */ nop -/* 88A7B4 80241BE4 46800020 */ cvt.s.w $f0, $f0 -/* 88A7B8 80241BE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 88A7BC 80241BEC 8E040080 */ lw $a0, 0x80($s0) -/* 88A7C0 80241BF0 0C037711 */ jal func_800DDC44 -/* 88A7C4 80241BF4 27A70028 */ addiu $a3, $sp, 0x28 -/* 88A7C8 80241BF8 0040902D */ daddu $s2, $v0, $zero -/* 88A7CC 80241BFC 16400005 */ bnez $s2, .L80241C14 -/* 88A7D0 80241C00 00000000 */ nop -/* 88A7D4 80241C04 8E050018 */ lw $a1, 0x18($s0) -/* 88A7D8 80241C08 8E06000C */ lw $a2, 0xc($s0) -/* 88A7DC 80241C0C 0C00EA95 */ jal npc_move_heading -/* 88A7E0 80241C10 0200202D */ daddu $a0, $s0, $zero -.L80241C14: -/* 88A7E4 80241C14 8602008E */ lh $v0, 0x8e($s0) -/* 88A7E8 80241C18 9603008E */ lhu $v1, 0x8e($s0) -/* 88A7EC 80241C1C 18400007 */ blez $v0, .L80241C3C -/* 88A7F0 80241C20 2462FFFF */ addiu $v0, $v1, -1 -/* 88A7F4 80241C24 A602008E */ sh $v0, 0x8e($s0) -/* 88A7F8 80241C28 00021400 */ sll $v0, $v0, 0x10 -/* 88A7FC 80241C2C 18400003 */ blez $v0, .L80241C3C -/* 88A800 80241C30 00000000 */ nop -/* 88A804 80241C34 12400008 */ beqz $s2, .L80241C58 -/* 88A808 80241C38 00000000 */ nop -.L80241C3C: -/* 88A80C 80241C3C 8E2200CC */ lw $v0, 0xcc($s1) -/* 88A810 80241C40 A2200007 */ sb $zero, 7($s1) -/* 88A814 80241C44 8C420028 */ lw $v0, 0x28($v0) -/* 88A818 80241C48 A600008E */ sh $zero, 0x8e($s0) -/* 88A81C 80241C4C AE020028 */ sw $v0, 0x28($s0) -/* 88A820 80241C50 2402000F */ addiu $v0, $zero, 0xf -/* 88A824 80241C54 AE620070 */ sw $v0, 0x70($s3) -.L80241C58: -/* 88A828 80241C58 8FBF0040 */ lw $ra, 0x40($sp) -/* 88A82C 80241C5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 88A830 80241C60 8FB20038 */ lw $s2, 0x38($sp) -/* 88A834 80241C64 8FB10034 */ lw $s1, 0x34($sp) -/* 88A838 80241C68 8FB00030 */ lw $s0, 0x30($sp) -/* 88A83C 80241C6C 03E00008 */ jr $ra -/* 88A840 80241C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index 2b13b53c9f..2ad97eda62 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -244,7 +244,7 @@ glabel func_80241CF4_88A8C4 .L8024206C: /* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero /* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero -/* 88AC44 80242074 0C0906C4 */ jal func_80241B10_88A6E0 +/* 88AC44 80242074 0C0906C4 */ jal tik_12_UnkNpcAIFunc12 /* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero /* 88AC4C 8024207C 08090828 */ j .L802420A0 /* 88AC50 80242080 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10_89AE60.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10_89AE60.s deleted file mode 100644 index f149d12e74..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10_89AE60.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_89AE60 -/* 89AE60 80240B10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 89AE64 80240B14 AFB3003C */ sw $s3, 0x3c($sp) -/* 89AE68 80240B18 0080982D */ daddu $s3, $a0, $zero -/* 89AE6C 80240B1C AFBF0040 */ sw $ra, 0x40($sp) -/* 89AE70 80240B20 AFB20038 */ sw $s2, 0x38($sp) -/* 89AE74 80240B24 AFB10034 */ sw $s1, 0x34($sp) -/* 89AE78 80240B28 AFB00030 */ sw $s0, 0x30($sp) -/* 89AE7C 80240B2C 8E710148 */ lw $s1, 0x148($s3) -/* 89AE80 80240B30 0C00EABB */ jal get_npc_unsafe -/* 89AE84 80240B34 86240008 */ lh $a0, 8($s1) -/* 89AE88 80240B38 0040802D */ daddu $s0, $v0, $zero -/* 89AE8C 80240B3C 8E22007C */ lw $v0, 0x7c($s1) -/* 89AE90 80240B40 8603008E */ lh $v1, 0x8e($s0) -/* 89AE94 80240B44 2442FFFF */ addiu $v0, $v0, -1 -/* 89AE98 80240B48 14620012 */ bne $v1, $v0, .L80240B94 -/* 89AE9C 80240B4C 00000000 */ nop -/* 89AEA0 80240B50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 89AEA4 80240B54 4600020D */ trunc.w.s $f8, $f0 -/* 89AEA8 80240B58 44024000 */ mfc1 $v0, $f8 -/* 89AEAC 80240B5C 00000000 */ nop -/* 89AEB0 80240B60 A6220010 */ sh $v0, 0x10($s1) -/* 89AEB4 80240B64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 89AEB8 80240B68 4600020D */ trunc.w.s $f8, $f0 -/* 89AEBC 80240B6C 44024000 */ mfc1 $v0, $f8 -/* 89AEC0 80240B70 00000000 */ nop -/* 89AEC4 80240B74 A6220012 */ sh $v0, 0x12($s1) -/* 89AEC8 80240B78 C6000040 */ lwc1 $f0, 0x40($s0) -/* 89AECC 80240B7C 24020001 */ addiu $v0, $zero, 1 -/* 89AED0 80240B80 A2220007 */ sb $v0, 7($s1) -/* 89AED4 80240B84 4600020D */ trunc.w.s $f8, $f0 -/* 89AED8 80240B88 44024000 */ mfc1 $v0, $f8 -/* 89AEDC 80240B8C 00000000 */ nop -/* 89AEE0 80240B90 A6220014 */ sh $v0, 0x14($s1) -.L80240B94: -/* 89AEE4 80240B94 C6000038 */ lwc1 $f0, 0x38($s0) -/* 89AEE8 80240B98 C602003C */ lwc1 $f2, 0x3c($s0) -/* 89AEEC 80240B9C C6040040 */ lwc1 $f4, 0x40($s0) -/* 89AEF0 80240BA0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 89AEF4 80240BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 89AEF8 80240BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 89AEFC 80240BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 89AF00 80240BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 89AF04 80240BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 89AF08 80240BB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 89AF0C 80240BBC 860200A8 */ lh $v0, 0xa8($s0) -/* 89AF10 80240BC0 27A50020 */ addiu $a1, $sp, 0x20 -/* 89AF14 80240BC4 44820000 */ mtc1 $v0, $f0 -/* 89AF18 80240BC8 00000000 */ nop -/* 89AF1C 80240BCC 46800020 */ cvt.s.w $f0, $f0 -/* 89AF20 80240BD0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 89AF24 80240BD4 860200A6 */ lh $v0, 0xa6($s0) -/* 89AF28 80240BD8 27A60024 */ addiu $a2, $sp, 0x24 -/* 89AF2C 80240BDC 44820000 */ mtc1 $v0, $f0 -/* 89AF30 80240BE0 00000000 */ nop -/* 89AF34 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 89AF38 80240BE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 89AF3C 80240BEC 8E040080 */ lw $a0, 0x80($s0) -/* 89AF40 80240BF0 0C037711 */ jal func_800DDC44 -/* 89AF44 80240BF4 27A70028 */ addiu $a3, $sp, 0x28 -/* 89AF48 80240BF8 0040902D */ daddu $s2, $v0, $zero -/* 89AF4C 80240BFC 16400005 */ bnez $s2, .L80240C14 -/* 89AF50 80240C00 00000000 */ nop -/* 89AF54 80240C04 8E050018 */ lw $a1, 0x18($s0) -/* 89AF58 80240C08 8E06000C */ lw $a2, 0xc($s0) -/* 89AF5C 80240C0C 0C00EA95 */ jal npc_move_heading -/* 89AF60 80240C10 0200202D */ daddu $a0, $s0, $zero -.L80240C14: -/* 89AF64 80240C14 8602008E */ lh $v0, 0x8e($s0) -/* 89AF68 80240C18 9603008E */ lhu $v1, 0x8e($s0) -/* 89AF6C 80240C1C 18400007 */ blez $v0, .L80240C3C -/* 89AF70 80240C20 2462FFFF */ addiu $v0, $v1, -1 -/* 89AF74 80240C24 A602008E */ sh $v0, 0x8e($s0) -/* 89AF78 80240C28 00021400 */ sll $v0, $v0, 0x10 -/* 89AF7C 80240C2C 18400003 */ blez $v0, .L80240C3C -/* 89AF80 80240C30 00000000 */ nop -/* 89AF84 80240C34 12400008 */ beqz $s2, .L80240C58 -/* 89AF88 80240C38 00000000 */ nop -.L80240C3C: -/* 89AF8C 80240C3C 8E2200CC */ lw $v0, 0xcc($s1) -/* 89AF90 80240C40 A2200007 */ sb $zero, 7($s1) -/* 89AF94 80240C44 8C420028 */ lw $v0, 0x28($v0) -/* 89AF98 80240C48 A600008E */ sh $zero, 0x8e($s0) -/* 89AF9C 80240C4C AE020028 */ sw $v0, 0x28($s0) -/* 89AFA0 80240C50 2402000F */ addiu $v0, $zero, 0xf -/* 89AFA4 80240C54 AE620070 */ sw $v0, 0x70($s3) -.L80240C58: -/* 89AFA8 80240C58 8FBF0040 */ lw $ra, 0x40($sp) -/* 89AFAC 80240C5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 89AFB0 80240C60 8FB20038 */ lw $s2, 0x38($sp) -/* 89AFB4 80240C64 8FB10034 */ lw $s1, 0x34($sp) -/* 89AFB8 80240C68 8FB00030 */ lw $s0, 0x30($sp) -/* 89AFBC 80240C6C 03E00008 */ jr $ra -/* 89AFC0 80240C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index 40ee9aec59..df3a6325fd 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -244,7 +244,7 @@ glabel func_80240CF4_89B044 .L8024106C: /* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero /* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero -/* 89B3C4 80241074 0C0902C4 */ jal func_80240B10_89AE60 +/* 89B3C4 80241074 0C0902C4 */ jal tik_20_UnkNpcAIFunc12 /* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero /* 89B3CC 8024107C 08090428 */ j .L802410A0 /* 89B3D0 80241080 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240B10_8A2EE0.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240B10_8A2EE0.s deleted file mode 100644 index ffef6a9682..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240B10_8A2EE0.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/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index ab4b0067bf..b56fe0495d 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -244,7 +244,7 @@ glabel func_80240CF4_8A30C4 .L8024106C: /* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero /* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero -/* 8A3444 80241074 0C0902C4 */ jal func_80240B10_8A2EE0 +/* 8A3444 80241074 0C0902C4 */ jal tik_23_UnkNpcAIFunc12 /* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero /* 8A344C 8024107C 08090428 */ j .L802410A0 /* 8A3450 80241080 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880_8A6300.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880_8A6300.s deleted file mode 100644 index 351e2b0846..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880_8A6300.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240880_8A6300 -/* 8A6300 80240880 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A6304 80240884 AFB3003C */ sw $s3, 0x3c($sp) -/* 8A6308 80240888 0080982D */ daddu $s3, $a0, $zero -/* 8A630C 8024088C AFBF0040 */ sw $ra, 0x40($sp) -/* 8A6310 80240890 AFB20038 */ sw $s2, 0x38($sp) -/* 8A6314 80240894 AFB10034 */ sw $s1, 0x34($sp) -/* 8A6318 80240898 AFB00030 */ sw $s0, 0x30($sp) -/* 8A631C 8024089C 8E710148 */ lw $s1, 0x148($s3) -/* 8A6320 802408A0 0C00EABB */ jal get_npc_unsafe -/* 8A6324 802408A4 86240008 */ lh $a0, 8($s1) -/* 8A6328 802408A8 0040802D */ daddu $s0, $v0, $zero -/* 8A632C 802408AC 8E22007C */ lw $v0, 0x7c($s1) -/* 8A6330 802408B0 8603008E */ lh $v1, 0x8e($s0) -/* 8A6334 802408B4 2442FFFF */ addiu $v0, $v0, -1 -/* 8A6338 802408B8 14620012 */ bne $v1, $v0, .L80240904 -/* 8A633C 802408BC 00000000 */ nop -/* 8A6340 802408C0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8A6344 802408C4 4600020D */ trunc.w.s $f8, $f0 -/* 8A6348 802408C8 44024000 */ mfc1 $v0, $f8 -/* 8A634C 802408CC 00000000 */ nop -/* 8A6350 802408D0 A6220010 */ sh $v0, 0x10($s1) -/* 8A6354 802408D4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8A6358 802408D8 4600020D */ trunc.w.s $f8, $f0 -/* 8A635C 802408DC 44024000 */ mfc1 $v0, $f8 -/* 8A6360 802408E0 00000000 */ nop -/* 8A6364 802408E4 A6220012 */ sh $v0, 0x12($s1) -/* 8A6368 802408E8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8A636C 802408EC 24020001 */ addiu $v0, $zero, 1 -/* 8A6370 802408F0 A2220007 */ sb $v0, 7($s1) -/* 8A6374 802408F4 4600020D */ trunc.w.s $f8, $f0 -/* 8A6378 802408F8 44024000 */ mfc1 $v0, $f8 -/* 8A637C 802408FC 00000000 */ nop -/* 8A6380 80240900 A6220014 */ sh $v0, 0x14($s1) -.L80240904: -/* 8A6384 80240904 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8A6388 80240908 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A638C 8024090C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8A6390 80240910 C6060018 */ lwc1 $f6, 0x18($s0) -/* 8A6394 80240914 E7A00020 */ swc1 $f0, 0x20($sp) -/* 8A6398 80240918 E7A20024 */ swc1 $f2, 0x24($sp) -/* 8A639C 8024091C E7A40028 */ swc1 $f4, 0x28($sp) -/* 8A63A0 80240920 E7A60010 */ swc1 $f6, 0x10($sp) -/* 8A63A4 80240924 C600000C */ lwc1 $f0, 0xc($s0) -/* 8A63A8 80240928 E7A00014 */ swc1 $f0, 0x14($sp) -/* 8A63AC 8024092C 860200A8 */ lh $v0, 0xa8($s0) -/* 8A63B0 80240930 27A50020 */ addiu $a1, $sp, 0x20 -/* 8A63B4 80240934 44820000 */ mtc1 $v0, $f0 -/* 8A63B8 80240938 00000000 */ nop -/* 8A63BC 8024093C 46800020 */ cvt.s.w $f0, $f0 -/* 8A63C0 80240940 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8A63C4 80240944 860200A6 */ lh $v0, 0xa6($s0) -/* 8A63C8 80240948 27A60024 */ addiu $a2, $sp, 0x24 -/* 8A63CC 8024094C 44820000 */ mtc1 $v0, $f0 -/* 8A63D0 80240950 00000000 */ nop -/* 8A63D4 80240954 46800020 */ cvt.s.w $f0, $f0 -/* 8A63D8 80240958 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 8A63DC 8024095C 8E040080 */ lw $a0, 0x80($s0) -/* 8A63E0 80240960 0C037711 */ jal func_800DDC44 -/* 8A63E4 80240964 27A70028 */ addiu $a3, $sp, 0x28 -/* 8A63E8 80240968 0040902D */ daddu $s2, $v0, $zero -/* 8A63EC 8024096C 16400005 */ bnez $s2, .L80240984 -/* 8A63F0 80240970 00000000 */ nop -/* 8A63F4 80240974 8E050018 */ lw $a1, 0x18($s0) -/* 8A63F8 80240978 8E06000C */ lw $a2, 0xc($s0) -/* 8A63FC 8024097C 0C00EA95 */ jal npc_move_heading -/* 8A6400 80240980 0200202D */ daddu $a0, $s0, $zero -.L80240984: -/* 8A6404 80240984 8602008E */ lh $v0, 0x8e($s0) -/* 8A6408 80240988 9603008E */ lhu $v1, 0x8e($s0) -/* 8A640C 8024098C 18400007 */ blez $v0, .L802409AC -/* 8A6410 80240990 2462FFFF */ addiu $v0, $v1, -1 -/* 8A6414 80240994 A602008E */ sh $v0, 0x8e($s0) -/* 8A6418 80240998 00021400 */ sll $v0, $v0, 0x10 -/* 8A641C 8024099C 18400003 */ blez $v0, .L802409AC -/* 8A6420 802409A0 00000000 */ nop -/* 8A6424 802409A4 12400008 */ beqz $s2, .L802409C8 -/* 8A6428 802409A8 00000000 */ nop -.L802409AC: -/* 8A642C 802409AC 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A6430 802409B0 A2200007 */ sb $zero, 7($s1) -/* 8A6434 802409B4 8C420028 */ lw $v0, 0x28($v0) -/* 8A6438 802409B8 A600008E */ sh $zero, 0x8e($s0) -/* 8A643C 802409BC AE020028 */ sw $v0, 0x28($s0) -/* 8A6440 802409C0 2402000F */ addiu $v0, $zero, 0xf -/* 8A6444 802409C4 AE620070 */ sw $v0, 0x70($s3) -.L802409C8: -/* 8A6448 802409C8 8FBF0040 */ lw $ra, 0x40($sp) -/* 8A644C 802409CC 8FB3003C */ lw $s3, 0x3c($sp) -/* 8A6450 802409D0 8FB20038 */ lw $s2, 0x38($sp) -/* 8A6454 802409D4 8FB10034 */ lw $s1, 0x34($sp) -/* 8A6458 802409D8 8FB00030 */ lw $s0, 0x30($sp) -/* 8A645C 802409DC 03E00008 */ jr $ra -/* 8A6460 802409E0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 7d85a390b1..65c42afce4 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -244,7 +244,7 @@ glabel func_80240A64_8A64E4 .L80240DDC: /* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 8A6864 80240DE4 0C090220 */ jal func_80240880_8A6300 +/* 8A6864 80240DE4 0C090220 */ jal tik_24_UnkNpcAIFunc12 /* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero /* 8A686C 80240DEC 08090384 */ j .L80240E10 /* 8A6870 80240DF0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0_99CF30.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0_99CF30.s deleted file mode 100644 index c7c5059b75..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0_99CF30.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A0_99CF30 -/* 99CF30 802405A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99CF34 802405A4 AFB3003C */ sw $s3, 0x3c($sp) -/* 99CF38 802405A8 0080982D */ daddu $s3, $a0, $zero -/* 99CF3C 802405AC AFBF0040 */ sw $ra, 0x40($sp) -/* 99CF40 802405B0 AFB20038 */ sw $s2, 0x38($sp) -/* 99CF44 802405B4 AFB10034 */ sw $s1, 0x34($sp) -/* 99CF48 802405B8 AFB00030 */ sw $s0, 0x30($sp) -/* 99CF4C 802405BC 8E710148 */ lw $s1, 0x148($s3) -/* 99CF50 802405C0 0C00EABB */ jal get_npc_unsafe -/* 99CF54 802405C4 86240008 */ lh $a0, 8($s1) -/* 99CF58 802405C8 0040802D */ daddu $s0, $v0, $zero -/* 99CF5C 802405CC 8E22007C */ lw $v0, 0x7c($s1) -/* 99CF60 802405D0 8603008E */ lh $v1, 0x8e($s0) -/* 99CF64 802405D4 2442FFFF */ addiu $v0, $v0, -1 -/* 99CF68 802405D8 14620012 */ bne $v1, $v0, .L80240624 -/* 99CF6C 802405DC 00000000 */ nop -/* 99CF70 802405E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 99CF74 802405E4 4600020D */ trunc.w.s $f8, $f0 -/* 99CF78 802405E8 44024000 */ mfc1 $v0, $f8 -/* 99CF7C 802405EC 00000000 */ nop -/* 99CF80 802405F0 A6220010 */ sh $v0, 0x10($s1) -/* 99CF84 802405F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 99CF88 802405F8 4600020D */ trunc.w.s $f8, $f0 -/* 99CF8C 802405FC 44024000 */ mfc1 $v0, $f8 -/* 99CF90 80240600 00000000 */ nop -/* 99CF94 80240604 A6220012 */ sh $v0, 0x12($s1) -/* 99CF98 80240608 C6000040 */ lwc1 $f0, 0x40($s0) -/* 99CF9C 8024060C 24020001 */ addiu $v0, $zero, 1 -/* 99CFA0 80240610 A2220007 */ sb $v0, 7($s1) -/* 99CFA4 80240614 4600020D */ trunc.w.s $f8, $f0 -/* 99CFA8 80240618 44024000 */ mfc1 $v0, $f8 -/* 99CFAC 8024061C 00000000 */ nop -/* 99CFB0 80240620 A6220014 */ sh $v0, 0x14($s1) -.L80240624: -/* 99CFB4 80240624 C6000038 */ lwc1 $f0, 0x38($s0) -/* 99CFB8 80240628 C602003C */ lwc1 $f2, 0x3c($s0) -/* 99CFBC 8024062C C6040040 */ lwc1 $f4, 0x40($s0) -/* 99CFC0 80240630 C6060018 */ lwc1 $f6, 0x18($s0) -/* 99CFC4 80240634 E7A00020 */ swc1 $f0, 0x20($sp) -/* 99CFC8 80240638 E7A20024 */ swc1 $f2, 0x24($sp) -/* 99CFCC 8024063C E7A40028 */ swc1 $f4, 0x28($sp) -/* 99CFD0 80240640 E7A60010 */ swc1 $f6, 0x10($sp) -/* 99CFD4 80240644 C600000C */ lwc1 $f0, 0xc($s0) -/* 99CFD8 80240648 E7A00014 */ swc1 $f0, 0x14($sp) -/* 99CFDC 8024064C 860200A8 */ lh $v0, 0xa8($s0) -/* 99CFE0 80240650 27A50020 */ addiu $a1, $sp, 0x20 -/* 99CFE4 80240654 44820000 */ mtc1 $v0, $f0 -/* 99CFE8 80240658 00000000 */ nop -/* 99CFEC 8024065C 46800020 */ cvt.s.w $f0, $f0 -/* 99CFF0 80240660 E7A00018 */ swc1 $f0, 0x18($sp) -/* 99CFF4 80240664 860200A6 */ lh $v0, 0xa6($s0) -/* 99CFF8 80240668 27A60024 */ addiu $a2, $sp, 0x24 -/* 99CFFC 8024066C 44820000 */ mtc1 $v0, $f0 -/* 99D000 80240670 00000000 */ nop -/* 99D004 80240674 46800020 */ cvt.s.w $f0, $f0 -/* 99D008 80240678 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 99D00C 8024067C 8E040080 */ lw $a0, 0x80($s0) -/* 99D010 80240680 0C037711 */ jal func_800DDC44 -/* 99D014 80240684 27A70028 */ addiu $a3, $sp, 0x28 -/* 99D018 80240688 0040902D */ daddu $s2, $v0, $zero -/* 99D01C 8024068C 16400005 */ bnez $s2, .L802406A4 -/* 99D020 80240690 00000000 */ nop -/* 99D024 80240694 8E050018 */ lw $a1, 0x18($s0) -/* 99D028 80240698 8E06000C */ lw $a2, 0xc($s0) -/* 99D02C 8024069C 0C00EA95 */ jal npc_move_heading -/* 99D030 802406A0 0200202D */ daddu $a0, $s0, $zero -.L802406A4: -/* 99D034 802406A4 8602008E */ lh $v0, 0x8e($s0) -/* 99D038 802406A8 9603008E */ lhu $v1, 0x8e($s0) -/* 99D03C 802406AC 18400007 */ blez $v0, .L802406CC -/* 99D040 802406B0 2462FFFF */ addiu $v0, $v1, -1 -/* 99D044 802406B4 A602008E */ sh $v0, 0x8e($s0) -/* 99D048 802406B8 00021400 */ sll $v0, $v0, 0x10 -/* 99D04C 802406BC 18400003 */ blez $v0, .L802406CC -/* 99D050 802406C0 00000000 */ nop -/* 99D054 802406C4 12400008 */ beqz $s2, .L802406E8 -/* 99D058 802406C8 00000000 */ nop -.L802406CC: -/* 99D05C 802406CC 8E2200CC */ lw $v0, 0xcc($s1) -/* 99D060 802406D0 A2200007 */ sb $zero, 7($s1) -/* 99D064 802406D4 8C420028 */ lw $v0, 0x28($v0) -/* 99D068 802406D8 A600008E */ sh $zero, 0x8e($s0) -/* 99D06C 802406DC AE020028 */ sw $v0, 0x28($s0) -/* 99D070 802406E0 2402000F */ addiu $v0, $zero, 0xf -/* 99D074 802406E4 AE620070 */ sw $v0, 0x70($s3) -.L802406E8: -/* 99D078 802406E8 8FBF0040 */ lw $ra, 0x40($sp) -/* 99D07C 802406EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 99D080 802406F0 8FB20038 */ lw $s2, 0x38($sp) -/* 99D084 802406F4 8FB10034 */ lw $s1, 0x34($sp) -/* 99D088 802406F8 8FB00030 */ lw $s0, 0x30($sp) -/* 99D08C 802406FC 03E00008 */ jr $ra -/* 99D090 80240700 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index 0dbd8ea722..fb3f2394d3 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -244,7 +244,7 @@ glabel func_80240784_99D114 .L80240AFC: /* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero /* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero -/* 99D494 80240B04 0C090168 */ jal func_802405A0_99CF30 +/* 99D494 80240B04 0C090168 */ jal trd_01_UnkNpcAIFunc12 /* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 99D49C 80240B0C 080902CC */ j .L80240B30 /* 99D4A0 80240B10 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240290_9A1270.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240290_9A1270.s deleted file mode 100644 index f6fe4c75bf..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240290_9A1270.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/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index bc2b484c67..b63f13bb3a 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -244,7 +244,7 @@ glabel func_80240474_9A1454 .L802407EC: /* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero /* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero -/* 9A17D4 802407F4 0C0900A4 */ jal func_80240290_9A1270 +/* 9A17D4 802407F4 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 /* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero /* 9A17DC 802407FC 08090208 */ j .L80240820 /* 9A17E0 80240800 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index 8507c51d2d..40bb9457fd 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -179,7 +179,7 @@ glabel func_80241744_9A2724 /* 9A29C4 802419E4 00000000 */ nop /* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero /* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero -/* 9A29D0 802419F0 0C0900A4 */ jal func_80240290_9A1270 +/* 9A29D0 802419F0 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 /* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero /* 9A29D8 802419F8 08090688 */ j .L80241A20 /* 9A29DC 802419FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250_9A48A0.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250_9A48A0.s deleted file mode 100644 index 5a69ca5f31..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250_9A48A0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240250_9A48A0 -/* 9A48A0 80240250 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A48A4 80240254 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A48A8 80240258 0080982D */ daddu $s3, $a0, $zero -/* 9A48AC 8024025C AFBF0040 */ sw $ra, 0x40($sp) -/* 9A48B0 80240260 AFB20038 */ sw $s2, 0x38($sp) -/* 9A48B4 80240264 AFB10034 */ sw $s1, 0x34($sp) -/* 9A48B8 80240268 AFB00030 */ sw $s0, 0x30($sp) -/* 9A48BC 8024026C 8E710148 */ lw $s1, 0x148($s3) -/* 9A48C0 80240270 0C00EABB */ jal get_npc_unsafe -/* 9A48C4 80240274 86240008 */ lh $a0, 8($s1) -/* 9A48C8 80240278 0040802D */ daddu $s0, $v0, $zero -/* 9A48CC 8024027C 8E22007C */ lw $v0, 0x7c($s1) -/* 9A48D0 80240280 8603008E */ lh $v1, 0x8e($s0) -/* 9A48D4 80240284 2442FFFF */ addiu $v0, $v0, -1 -/* 9A48D8 80240288 14620012 */ bne $v1, $v0, .L802402D4 -/* 9A48DC 8024028C 00000000 */ nop -/* 9A48E0 80240290 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A48E4 80240294 4600020D */ trunc.w.s $f8, $f0 -/* 9A48E8 80240298 44024000 */ mfc1 $v0, $f8 -/* 9A48EC 8024029C 00000000 */ nop -/* 9A48F0 802402A0 A6220010 */ sh $v0, 0x10($s1) -/* 9A48F4 802402A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9A48F8 802402A8 4600020D */ trunc.w.s $f8, $f0 -/* 9A48FC 802402AC 44024000 */ mfc1 $v0, $f8 -/* 9A4900 802402B0 00000000 */ nop -/* 9A4904 802402B4 A6220012 */ sh $v0, 0x12($s1) -/* 9A4908 802402B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9A490C 802402BC 24020001 */ addiu $v0, $zero, 1 -/* 9A4910 802402C0 A2220007 */ sb $v0, 7($s1) -/* 9A4914 802402C4 4600020D */ trunc.w.s $f8, $f0 -/* 9A4918 802402C8 44024000 */ mfc1 $v0, $f8 -/* 9A491C 802402CC 00000000 */ nop -/* 9A4920 802402D0 A6220014 */ sh $v0, 0x14($s1) -.L802402D4: -/* 9A4924 802402D4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A4928 802402D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9A492C 802402DC C6040040 */ lwc1 $f4, 0x40($s0) -/* 9A4930 802402E0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9A4934 802402E4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9A4938 802402E8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9A493C 802402EC E7A40028 */ swc1 $f4, 0x28($sp) -/* 9A4940 802402F0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9A4944 802402F4 C600000C */ lwc1 $f0, 0xc($s0) -/* 9A4948 802402F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9A494C 802402FC 860200A8 */ lh $v0, 0xa8($s0) -/* 9A4950 80240300 27A50020 */ addiu $a1, $sp, 0x20 -/* 9A4954 80240304 44820000 */ mtc1 $v0, $f0 -/* 9A4958 80240308 00000000 */ nop -/* 9A495C 8024030C 46800020 */ cvt.s.w $f0, $f0 -/* 9A4960 80240310 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9A4964 80240314 860200A6 */ lh $v0, 0xa6($s0) -/* 9A4968 80240318 27A60024 */ addiu $a2, $sp, 0x24 -/* 9A496C 8024031C 44820000 */ mtc1 $v0, $f0 -/* 9A4970 80240320 00000000 */ nop -/* 9A4974 80240324 46800020 */ cvt.s.w $f0, $f0 -/* 9A4978 80240328 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9A497C 8024032C 8E040080 */ lw $a0, 0x80($s0) -/* 9A4980 80240330 0C037711 */ jal func_800DDC44 -/* 9A4984 80240334 27A70028 */ addiu $a3, $sp, 0x28 -/* 9A4988 80240338 0040902D */ daddu $s2, $v0, $zero -/* 9A498C 8024033C 16400005 */ bnez $s2, .L80240354 -/* 9A4990 80240340 00000000 */ nop -/* 9A4994 80240344 8E050018 */ lw $a1, 0x18($s0) -/* 9A4998 80240348 8E06000C */ lw $a2, 0xc($s0) -/* 9A499C 8024034C 0C00EA95 */ jal npc_move_heading -/* 9A49A0 80240350 0200202D */ daddu $a0, $s0, $zero -.L80240354: -/* 9A49A4 80240354 8602008E */ lh $v0, 0x8e($s0) -/* 9A49A8 80240358 9603008E */ lhu $v1, 0x8e($s0) -/* 9A49AC 8024035C 18400007 */ blez $v0, .L8024037C -/* 9A49B0 80240360 2462FFFF */ addiu $v0, $v1, -1 -/* 9A49B4 80240364 A602008E */ sh $v0, 0x8e($s0) -/* 9A49B8 80240368 00021400 */ sll $v0, $v0, 0x10 -/* 9A49BC 8024036C 18400003 */ blez $v0, .L8024037C -/* 9A49C0 80240370 00000000 */ nop -/* 9A49C4 80240374 12400008 */ beqz $s2, .L80240398 -/* 9A49C8 80240378 00000000 */ nop -.L8024037C: -/* 9A49CC 8024037C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A49D0 80240380 A2200007 */ sb $zero, 7($s1) -/* 9A49D4 80240384 8C420028 */ lw $v0, 0x28($v0) -/* 9A49D8 80240388 A600008E */ sh $zero, 0x8e($s0) -/* 9A49DC 8024038C AE020028 */ sw $v0, 0x28($s0) -/* 9A49E0 80240390 2402000F */ addiu $v0, $zero, 0xf -/* 9A49E4 80240394 AE620070 */ sw $v0, 0x70($s3) -.L80240398: -/* 9A49E8 80240398 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A49EC 8024039C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A49F0 802403A0 8FB20038 */ lw $s2, 0x38($sp) -/* 9A49F4 802403A4 8FB10034 */ lw $s1, 0x34($sp) -/* 9A49F8 802403A8 8FB00030 */ lw $s0, 0x30($sp) -/* 9A49FC 802403AC 03E00008 */ jr $ra -/* 9A4A00 802403B0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 1fcb07bda9..7260016571 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -244,7 +244,7 @@ glabel func_80240434_9A4A84 .L802407AC: /* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero /* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A4E04 802407B4 0C090094 */ jal func_80240250_9A48A0 +/* 9A4E04 802407B4 0C090094 */ jal trd_03_UnkNpcAIFunc12 /* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A4E0C 802407BC 080901F8 */ j .L802407E0 /* 9A4E10 802407C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240660_9A8A50.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240660_9A8A50.s deleted file mode 100644 index 2b8acdb7d2..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240660_9A8A50.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/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index 2506e21c54..9fde73625f 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -244,7 +244,7 @@ glabel func_80240844_9A8C34 .L80240BBC: /* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero /* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero -/* 9A8FB4 80240BC4 0C090198 */ jal func_80240660_9A8A50 +/* 9A8FB4 80240BC4 0C090198 */ jal trd_04_UnkNpcAIFunc12 /* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 /* 9A8FC0 80240BD0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index 153310860f..33cd130f43 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -179,7 +179,7 @@ glabel func_80241B14_9A9F04 /* 9AA1A4 80241DB4 00000000 */ nop /* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero /* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero -/* 9AA1B0 80241DC0 0C090198 */ jal func_80240660_9A8A50 +/* 9AA1B0 80241DC0 0C090198 */ jal trd_04_UnkNpcAIFunc12 /* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero /* 9AA1B8 80241DC8 0809077C */ j .L80241DF0 /* 9AA1BC 80241DCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802404C0_9B6E40.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802404C0_9B6E40.s deleted file mode 100644 index 8bc4d2fbc5..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802404C0_9B6E40.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/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index d9f3d95507..a3fa68dca6 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -244,7 +244,7 @@ glabel func_802406A4_9B7024 .L80240A1C: /* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* 9B73A4 80240A24 0C090130 */ jal func_802404C0_9B6E40 +/* 9B73A4 80240A24 0C090130 */ jal trd_07_UnkNpcAIFunc12 /* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* 9B73AC 80240A2C 08090294 */ j .L80240A50 /* 9B73B0 80240A30 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index e3fddee28b..15c1d32aaf 100644 --- a/include/functions.h +++ b/include/functions.h @@ -98,6 +98,7 @@ s32 pause_interp_vertical_scroll(s32 deltaBefore); void pause_draw_rect(s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, s32 ult, s32 dsdx, s32 dtdy); s32 func_800DCB7C(s32, f32*, f32*, f32*, f32*); +s32 func_800DDC44(s32, f32*, f32*, f32*, f32, f32, f32, f32); // Partner void func_800EBA3C(Npc* partner); diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index 4f6659a4fe..dd2fc16f2d 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -33,7 +33,7 @@ INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD8FC); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDAE4); -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDCEC); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 7e4969b4c6..13b8fbc1df 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241DB8_CC55C8); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242314_CC5B24); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242448_CC5C58); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index efbd689dff..4697b21998 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241C64_CD8F44); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802421C0_CD94A0); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802422F4_CD95D4); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index b97a6c0518..e24a01dc84 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_802402F8_CEE558); INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240410_CEE670); -INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240544_CEE7A4); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index b526e1f3bb..4e853b6757 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802400BC_97B6EC); -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802401F0_97B820); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index 4258c9503f..b7071586b7 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024007C_984EAC); -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_802401B0_984FE0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index cbb915e5ef..165941484e 100644 --- a/src/world/area_isk/isk_18/997F70.c +++ b/src/world/area_isk/isk_18/997F70.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_8024007C_997FEC); -INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_802401B0_998120); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index fa6730b8dc..5f31b08baa 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802401DC_A4713C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240310_A47270); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index e0934095cb..f866adcda6 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802401DC_A4879C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240310_A488D0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 6bb55cdd5c..399b80a303 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802415D8_A94D18); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024170C_A94E4C); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c index c1f96e9d90..7c71470768 100644 --- a/src/world/area_kpa/kpa_11/A52BD0.c +++ b/src/world/area_kpa/kpa_11/A52BD0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A52BD0", func_8024038C_A52C4C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A52BD0", func_802404C0_A52D80); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index d9f57946f9..c0236267dd 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802400FC_A9CD2C); INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_8024022C_A9CE5C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240360_A9CF90); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index 1f5a54e511..6db901d4db 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802412C8_A61C98); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802413FC_A61DCC); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index 7d73f1f1c0..3a14adb746 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802414C8_A65558); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802415FC_A6568C); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index ea3463aca0..0f770e9fe3 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024038C_A6E76C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802404C0_A6E8A0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c index 788bbb450d..b69a1699ec 100644 --- a/src/world/area_kpa/kpa_70/A74B80.c +++ b/src/world/area_kpa/kpa_70/A74B80.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74B80", func_8024038C_A74BFC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74B80", func_802404C0_A74D30); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index fd78aad2bc..dfa03efc30 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240B94_A875E4); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240F0C_A8795C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241040_A87A90); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 63478e349d..99d5691210 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240C74_A8D6F4); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240FEC_A8DA6C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241120_A8DBA0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index e2cc1bee5a..5b5f44be77 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024038C_C6109C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802404C0_C611D0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index c9a30075bc..06a6498e2c 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242A40_C79720); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242B74_C79854); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 495fbe8312..696a4b76b2 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241D30_C877E0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241E64_C87914); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 70b468445b..7f91162dc7 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024007C_9F4ABC); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802401B0_9F4BF0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index ca52af664b..cf866f907f 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802405EC_9FADDC); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240720_9FAF10); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 2a6980aab7..69af440b19 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024023C_A02A7C); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240370_A02BB0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 99da65c7ff..1fad869b70 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024035C_A0725C); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240490_A07390); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index e944287d44..908da9a015 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240AAC_882C6C); -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240BE0_882DA0); +#include "world/common/UnkNpcAIFunc12.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240D44_882F04); diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index 10ae3950d8..dab54e5488 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802419DC_88A5AC); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241B10_88A6E0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index 9a7fca1b86..bf6cbd179c 100644 --- a/src/world/area_tik/tik_20/89ACB0.c +++ b/src/world/area_tik/tik_20/89ACB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_802409DC_89AD2C); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240B10_89AE60); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c index de47de94f5..fd9426c9cb 100644 --- a/src/world/area_tik/tik_23/8A2D30.c +++ b/src/world/area_tik/tik_23/8A2D30.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A2D30", func_802409DC_8A2DAC); -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A2D30", func_80240B10_8A2EE0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index 8279da134a..5c72c4c7b7 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240360_8A5DE0); INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_8024074C_8A61CC); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240880_8A6300); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index a61d2ec4bc..48adb8d694 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_8024046C_99CDFC); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802405A0_99CF30); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index d244d8fce6..7f0f4bda06 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_8024015C_9A113C); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240290_9A1270); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c index 494955514e..398aa66c22 100644 --- a/src/world/area_trd/trd_03/9A46F0.c +++ b/src/world/area_trd/trd_03/9A46F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_8024011C_9A476C); -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_80240250_9A48A0); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index afc602105b..7928cc769f 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024052C_9A891C); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240660_9A8A50); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index eba776443a..dbbf2217c1 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024038C_9B6D0C); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802404C0_9B6E40); +#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/common/UnkNpcAIFunc12.inc.c b/src/world/common/UnkNpcAIFunc12.inc.c new file mode 100644 index 0000000000..32f5a6abba --- /dev/null +++ b/src/world/common/UnkNpcAIFunc12.inc.c @@ -0,0 +1,34 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcAIFunc12)(ScriptInstance* script, NpcAISettings* aiSettings, s32 arg2) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + f32 f1; + f32 f2; + f32 f3; + + if (npc->duration == enemy->varTable[4] - 1) { + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + } + + f1 = npc->pos.x; + f2 = npc->pos.y; + f3 = npc->pos.z; + + temp = func_800DDC44(npc->unk_80, &f1, &f2, &f3, npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius); + if (temp == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + if ((npc->duration <= 0) || (--npc->duration <= 0) || (temp != 0)) { + enemy->unk_07 = 0; + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 15; + } +} diff --git a/tools/substitute.py b/tools/substitute.py index 2cc8af2a1d..3fc5e3931c 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -3,6 +3,7 @@ import argparse import os import re +from pathlib import Path script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" @@ -50,7 +51,7 @@ for root, dirs, files in os.walk(asm_dir): f_text = f_text_orig for func in from_funcs: - f_text = f_text.replace(func, func_name) + f_text = f_text.replace(func, Path(f_path).parent.parent.name + "_" + func_name) if f_text != f_text_orig: with open(f_path, "w", newline="\n") as f: f.write(f_text)