diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s deleted file mode 100644 index 108944b527..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241C84_BE5434.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C84_BE5434 -/* BE5434 80241C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE5438 80241C88 AFB00010 */ sw $s0, 0x10($sp) -/* BE543C 80241C8C 0080802D */ daddu $s0, $a0, $zero -/* BE5440 80241C90 AFBF0014 */ sw $ra, 0x14($sp) -/* BE5444 80241C94 8E020148 */ lw $v0, 0x148($s0) -/* BE5448 80241C98 0C00EABB */ jal get_npc_unsafe -/* BE544C 80241C9C 84440008 */ lh $a0, 8($v0) -/* BE5450 80241CA0 0040202D */ daddu $a0, $v0, $zero -/* BE5454 80241CA4 8482008E */ lh $v0, 0x8e($a0) -/* BE5458 80241CA8 9483008E */ lhu $v1, 0x8e($a0) -/* BE545C 80241CAC 18400005 */ blez $v0, .L80241CC4 -/* BE5460 80241CB0 2462FFFF */ addiu $v0, $v1, -1 -/* BE5464 80241CB4 A482008E */ sh $v0, 0x8e($a0) -/* BE5468 80241CB8 00021400 */ sll $v0, $v0, 0x10 -/* BE546C 80241CBC 1C400006 */ bgtz $v0, .L80241CD8 -/* BE5470 80241CC0 00000000 */ nop -.L80241CC4: -/* BE5474 80241CC4 8482008C */ lh $v0, 0x8c($a0) -/* BE5478 80241CC8 14400003 */ bnez $v0, .L80241CD8 -/* BE547C 80241CCC 2402000E */ addiu $v0, $zero, 0xe -/* BE5480 80241CD0 A480008E */ sh $zero, 0x8e($a0) -/* BE5484 80241CD4 AE020070 */ sw $v0, 0x70($s0) -.L80241CD8: -/* BE5488 80241CD8 8FBF0014 */ lw $ra, 0x14($sp) -/* BE548C 80241CDC 8FB00010 */ lw $s0, 0x10($sp) -/* BE5490 80241CE0 03E00008 */ jr $ra -/* BE5494 80241CE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index 8ce09a1b30..596a05708a 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -109,7 +109,7 @@ glabel func_8024219C_BE594C /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero /* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero /* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero -/* BE5AF0 80242340 0C090721 */ jal func_80241C84_BE5434 +/* BE5AF0 80242340 0C090721 */ jal UnkNpcAIFunc3 /* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero /* BE5AF8 80242348 080908D9 */ j .L80242364 /* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s deleted file mode 100644 index 2a5c1285fc..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241744_BEE534.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_BEE534 -/* BEE534 80241744 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BEE538 80241748 AFB00010 */ sw $s0, 0x10($sp) -/* BEE53C 8024174C 0080802D */ daddu $s0, $a0, $zero -/* BEE540 80241750 AFBF0014 */ sw $ra, 0x14($sp) -/* BEE544 80241754 8E020148 */ lw $v0, 0x148($s0) -/* BEE548 80241758 0C00EABB */ jal get_npc_unsafe -/* BEE54C 8024175C 84440008 */ lh $a0, 8($v0) -/* BEE550 80241760 0040202D */ daddu $a0, $v0, $zero -/* BEE554 80241764 8482008E */ lh $v0, 0x8e($a0) -/* BEE558 80241768 9483008E */ lhu $v1, 0x8e($a0) -/* BEE55C 8024176C 18400005 */ blez $v0, .L80241784 -/* BEE560 80241770 2462FFFF */ addiu $v0, $v1, -1 -/* BEE564 80241774 A482008E */ sh $v0, 0x8e($a0) -/* BEE568 80241778 00021400 */ sll $v0, $v0, 0x10 -/* BEE56C 8024177C 1C400006 */ bgtz $v0, .L80241798 -/* BEE570 80241780 00000000 */ nop -.L80241784: -/* BEE574 80241784 8482008C */ lh $v0, 0x8c($a0) -/* BEE578 80241788 14400003 */ bnez $v0, .L80241798 -/* BEE57C 8024178C 2402000E */ addiu $v0, $zero, 0xe -/* BEE580 80241790 A480008E */ sh $zero, 0x8e($a0) -/* BEE584 80241794 AE020070 */ sw $v0, 0x70($s0) -.L80241798: -/* BEE588 80241798 8FBF0014 */ lw $ra, 0x14($sp) -/* BEE58C 8024179C 8FB00010 */ lw $s0, 0x10($sp) -/* BEE590 802417A0 03E00008 */ jr $ra -/* BEE594 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index 4fea933a15..7368a0f8b2 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -109,7 +109,7 @@ glabel func_80241C5C_BEEA4C /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero /* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero /* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero -/* BEEBF0 80241E00 0C0905D1 */ jal func_80241744_BEE534 +/* BEEBF0 80241E00 0C0905D1 */ jal UnkNpcAIFunc3 /* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero /* BEEBF8 80241E08 08090789 */ j .L80241E24 /* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s deleted file mode 100644 index e4afbbbb39..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F14_BFE794.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F14_BFE794 -/* BFE794 80240F14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFE798 80240F18 AFB00010 */ sw $s0, 0x10($sp) -/* BFE79C 80240F1C 0080802D */ daddu $s0, $a0, $zero -/* BFE7A0 80240F20 AFBF0014 */ sw $ra, 0x14($sp) -/* BFE7A4 80240F24 8E020148 */ lw $v0, 0x148($s0) -/* BFE7A8 80240F28 0C00EABB */ jal get_npc_unsafe -/* BFE7AC 80240F2C 84440008 */ lh $a0, 8($v0) -/* BFE7B0 80240F30 0040202D */ daddu $a0, $v0, $zero -/* BFE7B4 80240F34 8482008E */ lh $v0, 0x8e($a0) -/* BFE7B8 80240F38 9483008E */ lhu $v1, 0x8e($a0) -/* BFE7BC 80240F3C 18400005 */ blez $v0, .L80240F54 -/* BFE7C0 80240F40 2462FFFF */ addiu $v0, $v1, -1 -/* BFE7C4 80240F44 A482008E */ sh $v0, 0x8e($a0) -/* BFE7C8 80240F48 00021400 */ sll $v0, $v0, 0x10 -/* BFE7CC 80240F4C 1C400006 */ bgtz $v0, .L80240F68 -/* BFE7D0 80240F50 00000000 */ nop -.L80240F54: -/* BFE7D4 80240F54 8482008C */ lh $v0, 0x8c($a0) -/* BFE7D8 80240F58 14400003 */ bnez $v0, .L80240F68 -/* BFE7DC 80240F5C 2402000E */ addiu $v0, $zero, 0xe -/* BFE7E0 80240F60 A480008E */ sh $zero, 0x8e($a0) -/* BFE7E4 80240F64 AE020070 */ sw $v0, 0x70($s0) -.L80240F68: -/* BFE7E8 80240F68 8FBF0014 */ lw $ra, 0x14($sp) -/* BFE7EC 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* BFE7F0 80240F70 03E00008 */ jr $ra -/* BFE7F4 80240F74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index 115692bf36..bb1ea83b94 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -109,7 +109,7 @@ glabel func_8024142C_BFECAC /* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero /* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero /* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero -/* BFEE50 802415D0 0C0903C5 */ jal func_80240F14_BFE794 +/* BFEE50 802415D0 0C0903C5 */ jal UnkNpcAIFunc3 /* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero /* BFEE58 802415D8 0809057D */ j .L802415F4 /* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s deleted file mode 100644 index 2648e7b444..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240DF4_C37324.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_C37324 -/* C37324 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C37328 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* C3732C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* C37330 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* C37334 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* C37338 80240E08 0C00EABB */ jal get_npc_unsafe -/* C3733C 80240E0C 84440008 */ lh $a0, 8($v0) -/* C37340 80240E10 0040202D */ daddu $a0, $v0, $zero -/* C37344 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* C37348 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* C3734C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* C37350 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* C37354 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* C37358 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* C3735C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* C37360 80240E30 00000000 */ nop -.L80240E34: -/* C37364 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* C37368 80240E38 14400003 */ bnez $v0, .L80240E48 -/* C3736C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* C37370 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* C37374 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* C37378 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* C3737C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* C37380 80240E50 03E00008 */ jr $ra -/* C37384 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index c3f7bfe8a8..8d55a1b440 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -109,7 +109,7 @@ glabel func_8024130C_C3783C /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero /* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero /* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal func_80240DF4_C37324 +/* C379E0 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero /* C379E8 802414B8 08090535 */ j .L802414D4 /* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s deleted file mode 100644 index e40a0322b7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242554_C42304 -/* C42304 80242554 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C42308 80242558 AFB00010 */ sw $s0, 0x10($sp) -/* C4230C 8024255C 0080802D */ daddu $s0, $a0, $zero -/* C42310 80242560 AFBF0014 */ sw $ra, 0x14($sp) -/* C42314 80242564 8E020148 */ lw $v0, 0x148($s0) -/* C42318 80242568 0C00EABB */ jal get_npc_unsafe -/* C4231C 8024256C 84440008 */ lh $a0, 8($v0) -/* C42320 80242570 0040202D */ daddu $a0, $v0, $zero -/* C42324 80242574 8482008E */ lh $v0, 0x8e($a0) -/* C42328 80242578 9483008E */ lhu $v1, 0x8e($a0) -/* C4232C 8024257C 18400005 */ blez $v0, .L80242594 -/* C42330 80242580 2462FFFF */ addiu $v0, $v1, -1 -/* C42334 80242584 A482008E */ sh $v0, 0x8e($a0) -/* C42338 80242588 00021400 */ sll $v0, $v0, 0x10 -/* C4233C 8024258C 1C400006 */ bgtz $v0, .L802425A8 -/* C42340 80242590 00000000 */ nop -.L80242594: -/* C42344 80242594 8482008C */ lh $v0, 0x8c($a0) -/* C42348 80242598 14400003 */ bnez $v0, .L802425A8 -/* C4234C 8024259C 2402000E */ addiu $v0, $zero, 0xe -/* C42350 802425A0 A480008E */ sh $zero, 0x8e($a0) -/* C42354 802425A4 AE020070 */ sw $v0, 0x70($s0) -.L802425A8: -/* C42358 802425A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C4235C 802425AC 8FB00010 */ lw $s0, 0x10($sp) -/* C42360 802425B0 03E00008 */ jr $ra -/* C42364 802425B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index 26f9e61aba..0614bf0d27 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -109,7 +109,7 @@ glabel func_80242A6C_C4281C /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero /* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero /* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal func_80242554_C42304 +/* C429C0 80242C10 0C090955 */ jal UnkNpcAIFunc3 /* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero /* C429C8 80242C18 08090B0D */ j .L80242C34 /* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s deleted file mode 100644 index d60561be83..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242218_C48DF8 -/* C48DF8 80242218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C48DFC 8024221C AFB00010 */ sw $s0, 0x10($sp) -/* C48E00 80242220 0080802D */ daddu $s0, $a0, $zero -/* C48E04 80242224 AFBF0014 */ sw $ra, 0x14($sp) -/* C48E08 80242228 8E020148 */ lw $v0, 0x148($s0) -/* C48E0C 8024222C 0C00EABB */ jal get_npc_unsafe -/* C48E10 80242230 84440008 */ lh $a0, 8($v0) -/* C48E14 80242234 0040202D */ daddu $a0, $v0, $zero -/* C48E18 80242238 8482008E */ lh $v0, 0x8e($a0) -/* C48E1C 8024223C 9483008E */ lhu $v1, 0x8e($a0) -/* C48E20 80242240 18400005 */ blez $v0, .L80242258 -/* C48E24 80242244 2462FFFF */ addiu $v0, $v1, -1 -/* C48E28 80242248 A482008E */ sh $v0, 0x8e($a0) -/* C48E2C 8024224C 00021400 */ sll $v0, $v0, 0x10 -/* C48E30 80242250 1C400006 */ bgtz $v0, .L8024226C -/* C48E34 80242254 00000000 */ nop -.L80242258: -/* C48E38 80242258 8482008C */ lh $v0, 0x8c($a0) -/* C48E3C 8024225C 14400003 */ bnez $v0, .L8024226C -/* C48E40 80242260 2402000E */ addiu $v0, $zero, 0xe -/* C48E44 80242264 A480008E */ sh $zero, 0x8e($a0) -/* C48E48 80242268 AE020070 */ sw $v0, 0x70($s0) -.L8024226C: -/* C48E4C 8024226C 8FBF0014 */ lw $ra, 0x14($sp) -/* C48E50 80242270 8FB00010 */ lw $s0, 0x10($sp) -/* C48E54 80242274 03E00008 */ jr $ra -/* C48E58 80242278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 0ab0a00af2..82c79f9539 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -109,7 +109,7 @@ glabel func_80242730_C49310 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero /* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero /* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal func_80242218_C48DF8 +/* C494B4 802428D4 0C090886 */ jal UnkNpcAIFunc3 /* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero /* C494BC 802428DC 08090A3E */ j .L802428F8 /* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s deleted file mode 100644 index ae7d0908a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241114_CB6114.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241114_CB6114 -/* CB6114 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB6118 80241118 AFB00010 */ sw $s0, 0x10($sp) -/* CB611C 8024111C 0080802D */ daddu $s0, $a0, $zero -/* CB6120 80241120 AFBF0014 */ sw $ra, 0x14($sp) -/* CB6124 80241124 8E020148 */ lw $v0, 0x148($s0) -/* CB6128 80241128 0C00EABB */ jal get_npc_unsafe -/* CB612C 8024112C 84440008 */ lh $a0, 8($v0) -/* CB6130 80241130 0040202D */ daddu $a0, $v0, $zero -/* CB6134 80241134 8482008E */ lh $v0, 0x8e($a0) -/* CB6138 80241138 9483008E */ lhu $v1, 0x8e($a0) -/* CB613C 8024113C 18400005 */ blez $v0, .L80241154 -/* CB6140 80241140 2462FFFF */ addiu $v0, $v1, -1 -/* CB6144 80241144 A482008E */ sh $v0, 0x8e($a0) -/* CB6148 80241148 00021400 */ sll $v0, $v0, 0x10 -/* CB614C 8024114C 1C400006 */ bgtz $v0, .L80241168 -/* CB6150 80241150 00000000 */ nop -.L80241154: -/* CB6154 80241154 8482008C */ lh $v0, 0x8c($a0) -/* CB6158 80241158 14400003 */ bnez $v0, .L80241168 -/* CB615C 8024115C 2402000E */ addiu $v0, $zero, 0xe -/* CB6160 80241160 A480008E */ sh $zero, 0x8e($a0) -/* CB6164 80241164 AE020070 */ sw $v0, 0x70($s0) -.L80241168: -/* CB6168 80241168 8FBF0014 */ lw $ra, 0x14($sp) -/* CB616C 8024116C 8FB00010 */ lw $s0, 0x10($sp) -/* CB6170 80241170 03E00008 */ jr $ra -/* CB6174 80241174 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 56186ee1eb..4eae08a448 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -109,7 +109,7 @@ glabel func_8024162C_CB662C /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero /* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero /* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* CB67D0 802417D0 0C090445 */ jal func_80241114_CB6114 +/* CB67D0 802417D0 0C090445 */ jal UnkNpcAIFunc3 /* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero /* CB67D8 802417D8 080905FD */ j .L802417F4 /* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s deleted file mode 100644 index 4e1db15cd2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240FB8_CC47C8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8_CC47C8 -/* CC47C8 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC47CC 80240FBC AFB00010 */ sw $s0, 0x10($sp) -/* CC47D0 80240FC0 0080802D */ daddu $s0, $a0, $zero -/* CC47D4 80240FC4 AFBF0014 */ sw $ra, 0x14($sp) -/* CC47D8 80240FC8 8E020148 */ lw $v0, 0x148($s0) -/* CC47DC 80240FCC 0C00EABB */ jal get_npc_unsafe -/* CC47E0 80240FD0 84440008 */ lh $a0, 8($v0) -/* CC47E4 80240FD4 0040202D */ daddu $a0, $v0, $zero -/* CC47E8 80240FD8 8482008E */ lh $v0, 0x8e($a0) -/* CC47EC 80240FDC 9483008E */ lhu $v1, 0x8e($a0) -/* CC47F0 80240FE0 18400005 */ blez $v0, .L80240FF8 -/* CC47F4 80240FE4 2462FFFF */ addiu $v0, $v1, -1 -/* CC47F8 80240FE8 A482008E */ sh $v0, 0x8e($a0) -/* CC47FC 80240FEC 00021400 */ sll $v0, $v0, 0x10 -/* CC4800 80240FF0 1C400006 */ bgtz $v0, .L8024100C -/* CC4804 80240FF4 00000000 */ nop -.L80240FF8: -/* CC4808 80240FF8 8482008C */ lh $v0, 0x8c($a0) -/* CC480C 80240FFC 14400003 */ bnez $v0, .L8024100C -/* CC4810 80241000 2402000E */ addiu $v0, $zero, 0xe -/* CC4814 80241004 A480008E */ sh $zero, 0x8e($a0) -/* CC4818 80241008 AE020070 */ sw $v0, 0x70($s0) -.L8024100C: -/* CC481C 8024100C 8FBF0014 */ lw $ra, 0x14($sp) -/* CC4820 80241010 8FB00010 */ lw $s0, 0x10($sp) -/* CC4824 80241014 03E00008 */ jr $ra -/* CC4828 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 2612d201ee..3ed6c211b6 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -109,7 +109,7 @@ glabel func_802414D0_CC4CE0 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero /* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero /* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero -/* CC4E84 80241674 0C0903EE */ jal func_80240FB8_CC47C8 +/* CC4E84 80241674 0C0903EE */ jal UnkNpcAIFunc3 /* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero /* CC4E8C 8024167C 080905A6 */ j .L80241698 /* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index 6640612636..f8d9a70c60 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -160,7 +160,7 @@ glabel func_80241DB8_CC55C8 .L80241FF4: /* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero /* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero -/* CC580C 80241FFC 0C0903EE */ jal func_80240FB8_CC47C8 +/* CC580C 80241FFC 0C0903EE */ jal UnkNpcAIFunc3 /* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero /* CC5814 80242004 08090806 */ j .L80242018 /* CC5818 80242008 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s deleted file mode 100644 index 145ace4a68..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241904_CCCC14.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241904_CCCC14 -/* CCCC14 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCCC18 80241908 AFB00010 */ sw $s0, 0x10($sp) -/* CCCC1C 8024190C 0080802D */ daddu $s0, $a0, $zero -/* CCCC20 80241910 AFBF0014 */ sw $ra, 0x14($sp) -/* CCCC24 80241914 8E020148 */ lw $v0, 0x148($s0) -/* CCCC28 80241918 0C00EABB */ jal get_npc_unsafe -/* CCCC2C 8024191C 84440008 */ lh $a0, 8($v0) -/* CCCC30 80241920 0040202D */ daddu $a0, $v0, $zero -/* CCCC34 80241924 8482008E */ lh $v0, 0x8e($a0) -/* CCCC38 80241928 9483008E */ lhu $v1, 0x8e($a0) -/* CCCC3C 8024192C 18400005 */ blez $v0, .L80241944 -/* CCCC40 80241930 2462FFFF */ addiu $v0, $v1, -1 -/* CCCC44 80241934 A482008E */ sh $v0, 0x8e($a0) -/* CCCC48 80241938 00021400 */ sll $v0, $v0, 0x10 -/* CCCC4C 8024193C 1C400006 */ bgtz $v0, .L80241958 -/* CCCC50 80241940 00000000 */ nop -.L80241944: -/* CCCC54 80241944 8482008C */ lh $v0, 0x8c($a0) -/* CCCC58 80241948 14400003 */ bnez $v0, .L80241958 -/* CCCC5C 8024194C 2402000E */ addiu $v0, $zero, 0xe -/* CCCC60 80241950 A480008E */ sh $zero, 0x8e($a0) -/* CCCC64 80241954 AE020070 */ sw $v0, 0x70($s0) -.L80241958: -/* CCCC68 80241958 8FBF0014 */ lw $ra, 0x14($sp) -/* CCCC6C 8024195C 8FB00010 */ lw $s0, 0x10($sp) -/* CCCC70 80241960 03E00008 */ jr $ra -/* CCCC74 80241964 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 8187678829..26e4ce4c21 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -109,7 +109,7 @@ glabel func_80241E1C_CCD12C /* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero /* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero /* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero -/* CCD2D0 80241FC0 0C090641 */ jal func_80241904_CCCC14 +/* CCD2D0 80241FC0 0C090641 */ jal UnkNpcAIFunc3 /* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero /* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 /* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s deleted file mode 100644 index 6454ec9f6d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241C44_CD3A74.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C44_CD3A74 -/* CD3A74 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD3A78 80241C48 AFB00010 */ sw $s0, 0x10($sp) -/* CD3A7C 80241C4C 0080802D */ daddu $s0, $a0, $zero -/* CD3A80 80241C50 AFBF0014 */ sw $ra, 0x14($sp) -/* CD3A84 80241C54 8E020148 */ lw $v0, 0x148($s0) -/* CD3A88 80241C58 0C00EABB */ jal get_npc_unsafe -/* CD3A8C 80241C5C 84440008 */ lh $a0, 8($v0) -/* CD3A90 80241C60 0040202D */ daddu $a0, $v0, $zero -/* CD3A94 80241C64 8482008E */ lh $v0, 0x8e($a0) -/* CD3A98 80241C68 9483008E */ lhu $v1, 0x8e($a0) -/* CD3A9C 80241C6C 18400005 */ blez $v0, .L80241C84 -/* CD3AA0 80241C70 2462FFFF */ addiu $v0, $v1, -1 -/* CD3AA4 80241C74 A482008E */ sh $v0, 0x8e($a0) -/* CD3AA8 80241C78 00021400 */ sll $v0, $v0, 0x10 -/* CD3AAC 80241C7C 1C400006 */ bgtz $v0, .L80241C98 -/* CD3AB0 80241C80 00000000 */ nop -.L80241C84: -/* CD3AB4 80241C84 8482008C */ lh $v0, 0x8c($a0) -/* CD3AB8 80241C88 14400003 */ bnez $v0, .L80241C98 -/* CD3ABC 80241C8C 2402000E */ addiu $v0, $zero, 0xe -/* CD3AC0 80241C90 A480008E */ sh $zero, 0x8e($a0) -/* CD3AC4 80241C94 AE020070 */ sw $v0, 0x70($s0) -.L80241C98: -/* CD3AC8 80241C98 8FBF0014 */ lw $ra, 0x14($sp) -/* CD3ACC 80241C9C 8FB00010 */ lw $s0, 0x10($sp) -/* CD3AD0 80241CA0 03E00008 */ jr $ra -/* CD3AD4 80241CA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 1022ef51c5..27f1a80f7d 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -109,7 +109,7 @@ glabel func_8024215C_CD3F8C /* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero /* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero /* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero -/* CD4130 80242300 0C090711 */ jal func_80241C44_CD3A74 +/* CD4130 80242300 0C090711 */ jal UnkNpcAIFunc3 /* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero /* CD4138 80242308 080908C9 */ j .L80242324 /* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s deleted file mode 100644 index d1e55e52fd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E64_CD8144 -/* CD8144 80240E64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD8148 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* CD814C 80240E6C 0080802D */ daddu $s0, $a0, $zero -/* CD8150 80240E70 AFBF0014 */ sw $ra, 0x14($sp) -/* CD8154 80240E74 8E020148 */ lw $v0, 0x148($s0) -/* CD8158 80240E78 0C00EABB */ jal get_npc_unsafe -/* CD815C 80240E7C 84440008 */ lh $a0, 8($v0) -/* CD8160 80240E80 0040202D */ daddu $a0, $v0, $zero -/* CD8164 80240E84 8482008E */ lh $v0, 0x8e($a0) -/* CD8168 80240E88 9483008E */ lhu $v1, 0x8e($a0) -/* CD816C 80240E8C 18400005 */ blez $v0, .L80240EA4 -/* CD8170 80240E90 2462FFFF */ addiu $v0, $v1, -1 -/* CD8174 80240E94 A482008E */ sh $v0, 0x8e($a0) -/* CD8178 80240E98 00021400 */ sll $v0, $v0, 0x10 -/* CD817C 80240E9C 1C400006 */ bgtz $v0, .L80240EB8 -/* CD8180 80240EA0 00000000 */ nop -.L80240EA4: -/* CD8184 80240EA4 8482008C */ lh $v0, 0x8c($a0) -/* CD8188 80240EA8 14400003 */ bnez $v0, .L80240EB8 -/* CD818C 80240EAC 2402000E */ addiu $v0, $zero, 0xe -/* CD8190 80240EB0 A480008E */ sh $zero, 0x8e($a0) -/* CD8194 80240EB4 AE020070 */ sw $v0, 0x70($s0) -.L80240EB8: -/* CD8198 80240EB8 8FBF0014 */ lw $ra, 0x14($sp) -/* CD819C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) -/* CD81A0 80240EC0 03E00008 */ jr $ra -/* CD81A4 80240EC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 9209bca312..17642be878 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -109,7 +109,7 @@ glabel func_8024137C_CD865C /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero /* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero /* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero -/* CD8800 80241520 0C090399 */ jal func_80240E64_CD8144 +/* CD8800 80241520 0C090399 */ jal UnkNpcAIFunc3 /* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero /* CD8808 80241528 08090551 */ j .L80241544 /* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index a136362ea6..3cc236a0f1 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -160,7 +160,7 @@ glabel func_80241C64_CD8F44 .L80241EA0: /* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero /* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero -/* CD9188 80241EA8 0C090399 */ jal func_80240E64_CD8144 +/* CD9188 80241EA8 0C090399 */ jal UnkNpcAIFunc3 /* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero /* CD9190 80241EB0 080907B1 */ j .L80241EC4 /* CD9194 80241EB4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s deleted file mode 100644 index 31b08adfb8..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E34_CF3A04.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E34_CF3A04 -/* CF3A04 80240E34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF3A08 80240E38 AFB00010 */ sw $s0, 0x10($sp) -/* CF3A0C 80240E3C 0080802D */ daddu $s0, $a0, $zero -/* CF3A10 80240E40 AFBF0014 */ sw $ra, 0x14($sp) -/* CF3A14 80240E44 8E020148 */ lw $v0, 0x148($s0) -/* CF3A18 80240E48 0C00EABB */ jal get_npc_unsafe -/* CF3A1C 80240E4C 84440008 */ lh $a0, 8($v0) -/* CF3A20 80240E50 0040202D */ daddu $a0, $v0, $zero -/* CF3A24 80240E54 8482008E */ lh $v0, 0x8e($a0) -/* CF3A28 80240E58 9483008E */ lhu $v1, 0x8e($a0) -/* CF3A2C 80240E5C 18400005 */ blez $v0, .L80240E74 -/* CF3A30 80240E60 2462FFFF */ addiu $v0, $v1, -1 -/* CF3A34 80240E64 A482008E */ sh $v0, 0x8e($a0) -/* CF3A38 80240E68 00021400 */ sll $v0, $v0, 0x10 -/* CF3A3C 80240E6C 1C400006 */ bgtz $v0, .L80240E88 -/* CF3A40 80240E70 00000000 */ nop -.L80240E74: -/* CF3A44 80240E74 8482008C */ lh $v0, 0x8c($a0) -/* CF3A48 80240E78 14400003 */ bnez $v0, .L80240E88 -/* CF3A4C 80240E7C 2402000E */ addiu $v0, $zero, 0xe -/* CF3A50 80240E80 A480008E */ sh $zero, 0x8e($a0) -/* CF3A54 80240E84 AE020070 */ sw $v0, 0x70($s0) -.L80240E88: -/* CF3A58 80240E88 8FBF0014 */ lw $ra, 0x14($sp) -/* CF3A5C 80240E8C 8FB00010 */ lw $s0, 0x10($sp) -/* CF3A60 80240E90 03E00008 */ jr $ra -/* CF3A64 80240E94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index f905e30eee..e81b2388b2 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -109,7 +109,7 @@ glabel func_8024134C_CF3F1C /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero /* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CF40C0 802414F0 0C09038D */ jal func_80240E34_CF3A04 +/* CF40C0 802414F0 0C09038D */ jal UnkNpcAIFunc3 /* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CF40C8 802414F8 08090545 */ j .L80241514 /* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s deleted file mode 100644 index e3dc839dec..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE4_A18004 -/* A18004 80241DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A18008 80241DE8 AFB00010 */ sw $s0, 0x10($sp) -/* A1800C 80241DEC 0080802D */ daddu $s0, $a0, $zero -/* A18010 80241DF0 AFBF0014 */ sw $ra, 0x14($sp) -/* A18014 80241DF4 8E020148 */ lw $v0, 0x148($s0) -/* A18018 80241DF8 0C00EABB */ jal get_npc_unsafe -/* A1801C 80241DFC 84440008 */ lh $a0, 8($v0) -/* A18020 80241E00 0040202D */ daddu $a0, $v0, $zero -/* A18024 80241E04 8482008E */ lh $v0, 0x8e($a0) -/* A18028 80241E08 9483008E */ lhu $v1, 0x8e($a0) -/* A1802C 80241E0C 18400005 */ blez $v0, .L80241E24 -/* A18030 80241E10 2462FFFF */ addiu $v0, $v1, -1 -/* A18034 80241E14 A482008E */ sh $v0, 0x8e($a0) -/* A18038 80241E18 00021400 */ sll $v0, $v0, 0x10 -/* A1803C 80241E1C 1C400006 */ bgtz $v0, .L80241E38 -/* A18040 80241E20 00000000 */ nop -.L80241E24: -/* A18044 80241E24 8482008C */ lh $v0, 0x8c($a0) -/* A18048 80241E28 14400003 */ bnez $v0, .L80241E38 -/* A1804C 80241E2C 2402000E */ addiu $v0, $zero, 0xe -/* A18050 80241E30 A480008E */ sh $zero, 0x8e($a0) -/* A18054 80241E34 AE020070 */ sw $v0, 0x70($s0) -.L80241E38: -/* A18058 80241E38 8FBF0014 */ lw $ra, 0x14($sp) -/* A1805C 80241E3C 8FB00010 */ lw $s0, 0x10($sp) -/* A18060 80241E40 03E00008 */ jr $ra -/* A18064 80241E44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 29e6bc64fe..686318e515 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -109,7 +109,7 @@ glabel func_802422FC_A1851C /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero /* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero /* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero -/* A186C0 802424A0 0C090779 */ jal func_80241DE4_A18004 +/* A186C0 802424A0 0C090779 */ jal UnkNpcAIFunc3 /* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero /* A186C8 802424A8 08090931 */ j .L802424C4 /* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s deleted file mode 100644 index d91894f8dc..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA4_A1CBA4 -/* A1CBA4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1CBA8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) -/* A1CBAC 80241AAC 0080802D */ daddu $s0, $a0, $zero -/* A1CBB0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) -/* A1CBB4 80241AB4 8E020148 */ lw $v0, 0x148($s0) -/* A1CBB8 80241AB8 0C00EABB */ jal get_npc_unsafe -/* A1CBBC 80241ABC 84440008 */ lh $a0, 8($v0) -/* A1CBC0 80241AC0 0040202D */ daddu $a0, $v0, $zero -/* A1CBC4 80241AC4 8482008E */ lh $v0, 0x8e($a0) -/* A1CBC8 80241AC8 9483008E */ lhu $v1, 0x8e($a0) -/* A1CBCC 80241ACC 18400005 */ blez $v0, .L80241AE4 -/* A1CBD0 80241AD0 2462FFFF */ addiu $v0, $v1, -1 -/* A1CBD4 80241AD4 A482008E */ sh $v0, 0x8e($a0) -/* A1CBD8 80241AD8 00021400 */ sll $v0, $v0, 0x10 -/* A1CBDC 80241ADC 1C400006 */ bgtz $v0, .L80241AF8 -/* A1CBE0 80241AE0 00000000 */ nop -.L80241AE4: -/* A1CBE4 80241AE4 8482008C */ lh $v0, 0x8c($a0) -/* A1CBE8 80241AE8 14400003 */ bnez $v0, .L80241AF8 -/* A1CBEC 80241AEC 2402000E */ addiu $v0, $zero, 0xe -/* A1CBF0 80241AF0 A480008E */ sh $zero, 0x8e($a0) -/* A1CBF4 80241AF4 AE020070 */ sw $v0, 0x70($s0) -.L80241AF8: -/* A1CBF8 80241AF8 8FBF0014 */ lw $ra, 0x14($sp) -/* A1CBFC 80241AFC 8FB00010 */ lw $s0, 0x10($sp) -/* A1CC00 80241B00 03E00008 */ jr $ra -/* A1CC04 80241B04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index b5a80164b5..9735c6e736 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -109,7 +109,7 @@ glabel func_80241FBC_A1D0BC /* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero /* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero /* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero -/* A1D260 80242160 0C0906A9 */ jal func_80241AA4_A1CBA4 +/* A1D260 80242160 0C0906A9 */ jal UnkNpcAIFunc3 /* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero /* A1D268 80242168 08090861 */ j .L80242184 /* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s deleted file mode 100644 index 0e1ef73a9e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8CEE64 -/* 8CEE64 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CEE68 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8CEE6C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8CEE70 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CEE74 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8CEE78 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8CEE7C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8CEE80 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8CEE84 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8CEE88 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8CEE8C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8CEE90 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8CEE94 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8CEE98 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8CEE9C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8CEEA0 80240E30 00000000 */ nop -.L80240E34: -/* 8CEEA4 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8CEEA8 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8CEEAC 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8CEEB0 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8CEEB4 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8CEEB8 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CEEBC 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CEEC0 80240E50 03E00008 */ jr $ra -/* 8CEEC4 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 03f9ccfca5..5a43cc4d2f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -109,7 +109,7 @@ glabel func_8024130C_8CF37C /* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8CF520 802414B0 0C09037D */ jal func_80240DF4_8CEE64 +/* 8CF520 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8CF528 802414B8 08090535 */ j .L802414D4 /* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s deleted file mode 100644 index cd01107e4a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240DF4_8D2304.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8D2304 -/* 8D2304 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D2308 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D230C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8D2310 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D2314 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8D2318 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8D231C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8D2320 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8D2324 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8D2328 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8D232C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8D2330 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8D2334 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8D2338 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8D233C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8D2340 80240E30 00000000 */ nop -.L80240E34: -/* 8D2344 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8D2348 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8D234C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8D2350 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8D2354 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8D2358 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D235C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2360 80240E50 03E00008 */ jr $ra -/* 8D2364 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index c797754db2..1d1b2ac8cb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -109,7 +109,7 @@ glabel func_8024130C_8D281C /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal func_80240DF4_8D2304 +/* 8D29C0 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D29C8 802414B8 08090535 */ j .L802414D4 /* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s deleted file mode 100644 index 1c8a174279..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240DF4_8D6BF4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8D6BF4 -/* 8D6BF4 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D6BF8 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6BFC 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8D6C00 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D6C04 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8D6C08 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8D6C0C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8D6C10 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8D6C14 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8D6C18 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8D6C1C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8D6C20 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6C24 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8D6C28 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8D6C2C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8D6C30 80240E30 00000000 */ nop -.L80240E34: -/* 8D6C34 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8D6C38 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8D6C3C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8D6C40 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8D6C44 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8D6C48 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D6C4C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6C50 80240E50 03E00008 */ jr $ra -/* 8D6C54 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index 0cd893f4bc..334e3cda25 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -109,7 +109,7 @@ glabel func_8024130C_8D710C /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal func_80240DF4_8D6BF4 +/* 8D72B0 802414B0 0C09037D */ jal UnkNpcAIFunc3 /* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D72B8 802414B8 08090535 */ j .L802414D4 /* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s deleted file mode 100644 index 42552e2471..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D4_C5BA14 -/* C5BA14 802412D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5BA18 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* C5BA1C 802412DC 0080802D */ daddu $s0, $a0, $zero -/* C5BA20 802412E0 AFBF0014 */ sw $ra, 0x14($sp) -/* C5BA24 802412E4 8E020148 */ lw $v0, 0x148($s0) -/* C5BA28 802412E8 0C00EABB */ jal get_npc_unsafe -/* C5BA2C 802412EC 84440008 */ lh $a0, 8($v0) -/* C5BA30 802412F0 0040202D */ daddu $a0, $v0, $zero -/* C5BA34 802412F4 8482008E */ lh $v0, 0x8e($a0) -/* C5BA38 802412F8 9483008E */ lhu $v1, 0x8e($a0) -/* C5BA3C 802412FC 18400005 */ blez $v0, .L80241314 -/* C5BA40 80241300 2462FFFF */ addiu $v0, $v1, -1 -/* C5BA44 80241304 A482008E */ sh $v0, 0x8e($a0) -/* C5BA48 80241308 00021400 */ sll $v0, $v0, 0x10 -/* C5BA4C 8024130C 1C400006 */ bgtz $v0, .L80241328 -/* C5BA50 80241310 00000000 */ nop -.L80241314: -/* C5BA54 80241314 8482008C */ lh $v0, 0x8c($a0) -/* C5BA58 80241318 14400003 */ bnez $v0, .L80241328 -/* C5BA5C 8024131C 2402000E */ addiu $v0, $zero, 0xe -/* C5BA60 80241320 A480008E */ sh $zero, 0x8e($a0) -/* C5BA64 80241324 AE020070 */ sw $v0, 0x70($s0) -.L80241328: -/* C5BA68 80241328 8FBF0014 */ lw $ra, 0x14($sp) -/* C5BA6C 8024132C 8FB00010 */ lw $s0, 0x10($sp) -/* C5BA70 80241330 03E00008 */ jr $ra -/* C5BA74 80241334 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 146497178f..b61a2c2a90 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -109,7 +109,7 @@ glabel func_802417EC_C5BF2C /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero /* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero /* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal func_802412D4_C5BA14 +/* C5C0D0 80241990 0C0904B5 */ jal UnkNpcAIFunc3 /* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero /* C5C0D8 80241998 0809066D */ j .L802419B4 /* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s deleted file mode 100644 index ec561c6ff6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241614_C6F944.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241614_C6F944 -/* C6F944 80241614 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6F948 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* C6F94C 8024161C 0080802D */ daddu $s0, $a0, $zero -/* C6F950 80241620 AFBF0014 */ sw $ra, 0x14($sp) -/* C6F954 80241624 8E020148 */ lw $v0, 0x148($s0) -/* C6F958 80241628 0C00EABB */ jal get_npc_unsafe -/* C6F95C 8024162C 84440008 */ lh $a0, 8($v0) -/* C6F960 80241630 0040202D */ daddu $a0, $v0, $zero -/* C6F964 80241634 8482008E */ lh $v0, 0x8e($a0) -/* C6F968 80241638 9483008E */ lhu $v1, 0x8e($a0) -/* C6F96C 8024163C 18400005 */ blez $v0, .L80241654 -/* C6F970 80241640 2462FFFF */ addiu $v0, $v1, -1 -/* C6F974 80241644 A482008E */ sh $v0, 0x8e($a0) -/* C6F978 80241648 00021400 */ sll $v0, $v0, 0x10 -/* C6F97C 8024164C 1C400006 */ bgtz $v0, .L80241668 -/* C6F980 80241650 00000000 */ nop -.L80241654: -/* C6F984 80241654 8482008C */ lh $v0, 0x8c($a0) -/* C6F988 80241658 14400003 */ bnez $v0, .L80241668 -/* C6F98C 8024165C 2402000E */ addiu $v0, $zero, 0xe -/* C6F990 80241660 A480008E */ sh $zero, 0x8e($a0) -/* C6F994 80241664 AE020070 */ sw $v0, 0x70($s0) -.L80241668: -/* C6F998 80241668 8FBF0014 */ lw $ra, 0x14($sp) -/* C6F99C 8024166C 8FB00010 */ lw $s0, 0x10($sp) -/* C6F9A0 80241670 03E00008 */ jr $ra -/* C6F9A4 80241674 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 11d11c33bf..f872e97836 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -109,7 +109,7 @@ glabel func_80241B2C_C6FE5C /* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero /* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero /* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero -/* C70000 80241CD0 0C090585 */ jal func_80241614_C6F944 +/* C70000 80241CD0 0C090585 */ jal UnkNpcAIFunc3 /* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero /* C70008 80241CD8 0809073D */ j .L80241CF4 /* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s deleted file mode 100644 index 3846362187..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241844_C72CC4 -/* C72CC4 80241844 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C72CC8 80241848 AFB00010 */ sw $s0, 0x10($sp) -/* C72CCC 8024184C 0080802D */ daddu $s0, $a0, $zero -/* C72CD0 80241850 AFBF0014 */ sw $ra, 0x14($sp) -/* C72CD4 80241854 8E020148 */ lw $v0, 0x148($s0) -/* C72CD8 80241858 0C00EABB */ jal get_npc_unsafe -/* C72CDC 8024185C 84440008 */ lh $a0, 8($v0) -/* C72CE0 80241860 0040202D */ daddu $a0, $v0, $zero -/* C72CE4 80241864 8482008E */ lh $v0, 0x8e($a0) -/* C72CE8 80241868 9483008E */ lhu $v1, 0x8e($a0) -/* C72CEC 8024186C 18400005 */ blez $v0, .L80241884 -/* C72CF0 80241870 2462FFFF */ addiu $v0, $v1, -1 -/* C72CF4 80241874 A482008E */ sh $v0, 0x8e($a0) -/* C72CF8 80241878 00021400 */ sll $v0, $v0, 0x10 -/* C72CFC 8024187C 1C400006 */ bgtz $v0, .L80241898 -/* C72D00 80241880 00000000 */ nop -.L80241884: -/* C72D04 80241884 8482008C */ lh $v0, 0x8c($a0) -/* C72D08 80241888 14400003 */ bnez $v0, .L80241898 -/* C72D0C 8024188C 2402000E */ addiu $v0, $zero, 0xe -/* C72D10 80241890 A480008E */ sh $zero, 0x8e($a0) -/* C72D14 80241894 AE020070 */ sw $v0, 0x70($s0) -.L80241898: -/* C72D18 80241898 8FBF0014 */ lw $ra, 0x14($sp) -/* C72D1C 8024189C 8FB00010 */ lw $s0, 0x10($sp) -/* C72D20 802418A0 03E00008 */ jr $ra -/* C72D24 802418A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 1265b6893b..79b5cce549 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -109,7 +109,7 @@ glabel func_80241D5C_C731DC /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero /* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero /* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal func_80241844_C72CC4 +/* C73380 80241F00 0C090611 */ jal UnkNpcAIFunc3 /* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero /* C73388 80241F08 080907C9 */ j .L80241F24 /* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s deleted file mode 100644 index 0f9bf167da..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241254_C813F4 -/* C813F4 80241254 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C813F8 80241258 AFB00010 */ sw $s0, 0x10($sp) -/* C813FC 8024125C 0080802D */ daddu $s0, $a0, $zero -/* C81400 80241260 AFBF0014 */ sw $ra, 0x14($sp) -/* C81404 80241264 8E020148 */ lw $v0, 0x148($s0) -/* C81408 80241268 0C00EABB */ jal get_npc_unsafe -/* C8140C 8024126C 84440008 */ lh $a0, 8($v0) -/* C81410 80241270 0040202D */ daddu $a0, $v0, $zero -/* C81414 80241274 8482008E */ lh $v0, 0x8e($a0) -/* C81418 80241278 9483008E */ lhu $v1, 0x8e($a0) -/* C8141C 8024127C 18400005 */ blez $v0, .L80241294 -/* C81420 80241280 2462FFFF */ addiu $v0, $v1, -1 -/* C81424 80241284 A482008E */ sh $v0, 0x8e($a0) -/* C81428 80241288 00021400 */ sll $v0, $v0, 0x10 -/* C8142C 8024128C 1C400006 */ bgtz $v0, .L802412A8 -/* C81430 80241290 00000000 */ nop -.L80241294: -/* C81434 80241294 8482008C */ lh $v0, 0x8c($a0) -/* C81438 80241298 14400003 */ bnez $v0, .L802412A8 -/* C8143C 8024129C 2402000E */ addiu $v0, $zero, 0xe -/* C81440 802412A0 A480008E */ sh $zero, 0x8e($a0) -/* C81444 802412A4 AE020070 */ sw $v0, 0x70($s0) -.L802412A8: -/* C81448 802412A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8144C 802412AC 8FB00010 */ lw $s0, 0x10($sp) -/* C81450 802412B0 03E00008 */ jr $ra -/* C81454 802412B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 1403002f1c..ba742d6018 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -109,7 +109,7 @@ glabel func_8024176C_C8190C /* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero /* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero /* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C81AB0 80241910 0C090495 */ jal func_80241254_C813F4 +/* C81AB0 80241910 0C090495 */ jal UnkNpcAIFunc3 /* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero /* C81AB8 80241918 0809064D */ j .L80241934 /* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s deleted file mode 100644 index a9726ca891..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240E94_BAE7D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E94_BAE7D4 -/* BAE7D4 80240E94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAE7D8 80240E98 AFB00010 */ sw $s0, 0x10($sp) -/* BAE7DC 80240E9C 0080802D */ daddu $s0, $a0, $zero -/* BAE7E0 80240EA0 AFBF0014 */ sw $ra, 0x14($sp) -/* BAE7E4 80240EA4 8E020148 */ lw $v0, 0x148($s0) -/* BAE7E8 80240EA8 0C00EABB */ jal get_npc_unsafe -/* BAE7EC 80240EAC 84440008 */ lh $a0, 8($v0) -/* BAE7F0 80240EB0 0040202D */ daddu $a0, $v0, $zero -/* BAE7F4 80240EB4 8482008E */ lh $v0, 0x8e($a0) -/* BAE7F8 80240EB8 9483008E */ lhu $v1, 0x8e($a0) -/* BAE7FC 80240EBC 18400005 */ blez $v0, .L80240ED4 -/* BAE800 80240EC0 2462FFFF */ addiu $v0, $v1, -1 -/* BAE804 80240EC4 A482008E */ sh $v0, 0x8e($a0) -/* BAE808 80240EC8 00021400 */ sll $v0, $v0, 0x10 -/* BAE80C 80240ECC 1C400006 */ bgtz $v0, .L80240EE8 -/* BAE810 80240ED0 00000000 */ nop -.L80240ED4: -/* BAE814 80240ED4 8482008C */ lh $v0, 0x8c($a0) -/* BAE818 80240ED8 14400003 */ bnez $v0, .L80240EE8 -/* BAE81C 80240EDC 2402000E */ addiu $v0, $zero, 0xe -/* BAE820 80240EE0 A480008E */ sh $zero, 0x8e($a0) -/* BAE824 80240EE4 AE020070 */ sw $v0, 0x70($s0) -.L80240EE8: -/* BAE828 80240EE8 8FBF0014 */ lw $ra, 0x14($sp) -/* BAE82C 80240EEC 8FB00010 */ lw $s0, 0x10($sp) -/* BAE830 80240EF0 03E00008 */ jr $ra -/* BAE834 80240EF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 9b215b0a0c..be5e0a69c4 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -109,7 +109,7 @@ glabel func_802413AC_BAECEC /* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero /* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero /* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BAEE90 80241550 0C0903A5 */ jal func_80240E94_BAE7D4 +/* BAEE90 80241550 0C0903A5 */ jal UnkNpcAIFunc3 /* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero /* BAEE98 80241558 0809055D */ j .L80241574 /* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s deleted file mode 100644 index c6e5de5891..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C8_9F6008 -/* 9F6008 802415C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9F600C 802415CC AFB00010 */ sw $s0, 0x10($sp) -/* 9F6010 802415D0 0080802D */ daddu $s0, $a0, $zero -/* 9F6014 802415D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9F6018 802415D8 8E020148 */ lw $v0, 0x148($s0) -/* 9F601C 802415DC 0C00EABB */ jal get_npc_unsafe -/* 9F6020 802415E0 84440008 */ lh $a0, 8($v0) -/* 9F6024 802415E4 0040202D */ daddu $a0, $v0, $zero -/* 9F6028 802415E8 8482008E */ lh $v0, 0x8e($a0) -/* 9F602C 802415EC 9483008E */ lhu $v1, 0x8e($a0) -/* 9F6030 802415F0 18400005 */ blez $v0, .L80241608 -/* 9F6034 802415F4 2462FFFF */ addiu $v0, $v1, -1 -/* 9F6038 802415F8 A482008E */ sh $v0, 0x8e($a0) -/* 9F603C 802415FC 00021400 */ sll $v0, $v0, 0x10 -/* 9F6040 80241600 1C400006 */ bgtz $v0, .L8024161C -/* 9F6044 80241604 00000000 */ nop -.L80241608: -/* 9F6048 80241608 8482008C */ lh $v0, 0x8c($a0) -/* 9F604C 8024160C 14400003 */ bnez $v0, .L8024161C -/* 9F6050 80241610 2402000E */ addiu $v0, $zero, 0xe -/* 9F6054 80241614 A480008E */ sh $zero, 0x8e($a0) -/* 9F6058 80241618 AE020070 */ sw $v0, 0x70($s0) -.L8024161C: -/* 9F605C 8024161C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9F6060 80241620 8FB00010 */ lw $s0, 0x10($sp) -/* 9F6064 80241624 03E00008 */ jr $ra -/* 9F6068 80241628 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 74447a238c..ed8d84d103 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -109,7 +109,7 @@ glabel func_80241AE0_9F6520 /* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero /* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero /* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero -/* 9F66C4 80241C84 0C090572 */ jal func_802415C8_9F6008 +/* 9F66C4 80241C84 0C090572 */ jal UnkNpcAIFunc3 /* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero /* 9F66CC 80241C8C 0809072A */ j .L80241CA8 /* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s deleted file mode 100644 index 451585c88f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241788_A03FC8 -/* A03FC8 80241788 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A03FCC 8024178C AFB00010 */ sw $s0, 0x10($sp) -/* A03FD0 80241790 0080802D */ daddu $s0, $a0, $zero -/* A03FD4 80241794 AFBF0014 */ sw $ra, 0x14($sp) -/* A03FD8 80241798 8E020148 */ lw $v0, 0x148($s0) -/* A03FDC 8024179C 0C00EABB */ jal get_npc_unsafe -/* A03FE0 802417A0 84440008 */ lh $a0, 8($v0) -/* A03FE4 802417A4 0040202D */ daddu $a0, $v0, $zero -/* A03FE8 802417A8 8482008E */ lh $v0, 0x8e($a0) -/* A03FEC 802417AC 9483008E */ lhu $v1, 0x8e($a0) -/* A03FF0 802417B0 18400005 */ blez $v0, .L802417C8 -/* A03FF4 802417B4 2462FFFF */ addiu $v0, $v1, -1 -/* A03FF8 802417B8 A482008E */ sh $v0, 0x8e($a0) -/* A03FFC 802417BC 00021400 */ sll $v0, $v0, 0x10 -/* A04000 802417C0 1C400006 */ bgtz $v0, .L802417DC -/* A04004 802417C4 00000000 */ nop -.L802417C8: -/* A04008 802417C8 8482008C */ lh $v0, 0x8c($a0) -/* A0400C 802417CC 14400003 */ bnez $v0, .L802417DC -/* A04010 802417D0 2402000E */ addiu $v0, $zero, 0xe -/* A04014 802417D4 A480008E */ sh $zero, 0x8e($a0) -/* A04018 802417D8 AE020070 */ sw $v0, 0x70($s0) -.L802417DC: -/* A0401C 802417DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A04020 802417E0 8FB00010 */ lw $s0, 0x10($sp) -/* A04024 802417E4 03E00008 */ jr $ra -/* A04028 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 032e470d3a..12884a8ecc 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -109,7 +109,7 @@ glabel func_80241CA0_A044E0 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero /* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero /* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal func_80241788_A03FC8 +/* A04684 80241E44 0C0905E2 */ jal UnkNpcAIFunc3 /* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero /* A0468C 80241E4C 0809079A */ j .L80241E68 /* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s deleted file mode 100644 index c34e8d666c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A8_A087A8 -/* A087A8 802418A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A087AC 802418AC AFB00010 */ sw $s0, 0x10($sp) -/* A087B0 802418B0 0080802D */ daddu $s0, $a0, $zero -/* A087B4 802418B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A087B8 802418B8 8E020148 */ lw $v0, 0x148($s0) -/* A087BC 802418BC 0C00EABB */ jal get_npc_unsafe -/* A087C0 802418C0 84440008 */ lh $a0, 8($v0) -/* A087C4 802418C4 0040202D */ daddu $a0, $v0, $zero -/* A087C8 802418C8 8482008E */ lh $v0, 0x8e($a0) -/* A087CC 802418CC 9483008E */ lhu $v1, 0x8e($a0) -/* A087D0 802418D0 18400005 */ blez $v0, .L802418E8 -/* A087D4 802418D4 2462FFFF */ addiu $v0, $v1, -1 -/* A087D8 802418D8 A482008E */ sh $v0, 0x8e($a0) -/* A087DC 802418DC 00021400 */ sll $v0, $v0, 0x10 -/* A087E0 802418E0 1C400006 */ bgtz $v0, .L802418FC -/* A087E4 802418E4 00000000 */ nop -.L802418E8: -/* A087E8 802418E8 8482008C */ lh $v0, 0x8c($a0) -/* A087EC 802418EC 14400003 */ bnez $v0, .L802418FC -/* A087F0 802418F0 2402000E */ addiu $v0, $zero, 0xe -/* A087F4 802418F4 A480008E */ sh $zero, 0x8e($a0) -/* A087F8 802418F8 AE020070 */ sw $v0, 0x70($s0) -.L802418FC: -/* A087FC 802418FC 8FBF0014 */ lw $ra, 0x14($sp) -/* A08800 80241900 8FB00010 */ lw $s0, 0x10($sp) -/* A08804 80241904 03E00008 */ jr $ra -/* A08808 80241908 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 138b9e1687..bfa65b38a1 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -109,7 +109,7 @@ glabel func_80241DC0_A08CC0 /* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero /* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero /* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero -/* A08E64 80241F64 0C09062A */ jal func_802418A8_A087A8 +/* A08E64 80241F64 0C09062A */ jal UnkNpcAIFunc3 /* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero /* A08E6C 80241F6C 080907E2 */ j .L80241F88 /* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s deleted file mode 100644 index d6c96ab42a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241194_DAE594.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241194_DAE594 -/* DAE594 80241194 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAE598 80241198 AFB00010 */ sw $s0, 0x10($sp) -/* DAE59C 8024119C 0080802D */ daddu $s0, $a0, $zero -/* DAE5A0 802411A0 AFBF0014 */ sw $ra, 0x14($sp) -/* DAE5A4 802411A4 8E020148 */ lw $v0, 0x148($s0) -/* DAE5A8 802411A8 0C00EABB */ jal get_npc_unsafe -/* DAE5AC 802411AC 84440008 */ lh $a0, 8($v0) -/* DAE5B0 802411B0 0040202D */ daddu $a0, $v0, $zero -/* DAE5B4 802411B4 8482008E */ lh $v0, 0x8e($a0) -/* DAE5B8 802411B8 9483008E */ lhu $v1, 0x8e($a0) -/* DAE5BC 802411BC 18400005 */ blez $v0, .L802411D4 -/* DAE5C0 802411C0 2462FFFF */ addiu $v0, $v1, -1 -/* DAE5C4 802411C4 A482008E */ sh $v0, 0x8e($a0) -/* DAE5C8 802411C8 00021400 */ sll $v0, $v0, 0x10 -/* DAE5CC 802411CC 1C400006 */ bgtz $v0, .L802411E8 -/* DAE5D0 802411D0 00000000 */ nop -.L802411D4: -/* DAE5D4 802411D4 8482008C */ lh $v0, 0x8c($a0) -/* DAE5D8 802411D8 14400003 */ bnez $v0, .L802411E8 -/* DAE5DC 802411DC 2402000E */ addiu $v0, $zero, 0xe -/* DAE5E0 802411E0 A480008E */ sh $zero, 0x8e($a0) -/* DAE5E4 802411E4 AE020070 */ sw $v0, 0x70($s0) -.L802411E8: -/* DAE5E8 802411E8 8FBF0014 */ lw $ra, 0x14($sp) -/* DAE5EC 802411EC 8FB00010 */ lw $s0, 0x10($sp) -/* DAE5F0 802411F0 03E00008 */ jr $ra -/* DAE5F4 802411F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index a3eb473b1d..426fe39fb6 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -109,7 +109,7 @@ glabel func_802416AC_DAEAAC /* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero /* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero /* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero -/* DAEC50 80241850 0C090465 */ jal func_80241194_DAE594 +/* DAEC50 80241850 0C090465 */ jal UnkNpcAIFunc3 /* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero /* DAEC58 80241858 0809061D */ j .L80241874 /* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s deleted file mode 100644 index fcd81f6694..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241848_DB3B08.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241848_DB3B08 -/* DB3B08 80241848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB3B0C 8024184C AFB00010 */ sw $s0, 0x10($sp) -/* DB3B10 80241850 0080802D */ daddu $s0, $a0, $zero -/* DB3B14 80241854 AFBF0014 */ sw $ra, 0x14($sp) -/* DB3B18 80241858 8E020148 */ lw $v0, 0x148($s0) -/* DB3B1C 8024185C 0C00EABB */ jal get_npc_unsafe -/* DB3B20 80241860 84440008 */ lh $a0, 8($v0) -/* DB3B24 80241864 0040202D */ daddu $a0, $v0, $zero -/* DB3B28 80241868 8482008E */ lh $v0, 0x8e($a0) -/* DB3B2C 8024186C 9483008E */ lhu $v1, 0x8e($a0) -/* DB3B30 80241870 18400005 */ blez $v0, .L80241888 -/* DB3B34 80241874 2462FFFF */ addiu $v0, $v1, -1 -/* DB3B38 80241878 A482008E */ sh $v0, 0x8e($a0) -/* DB3B3C 8024187C 00021400 */ sll $v0, $v0, 0x10 -/* DB3B40 80241880 1C400006 */ bgtz $v0, .L8024189C -/* DB3B44 80241884 00000000 */ nop -.L80241888: -/* DB3B48 80241888 8482008C */ lh $v0, 0x8c($a0) -/* DB3B4C 8024188C 14400003 */ bnez $v0, .L8024189C -/* DB3B50 80241890 2402000E */ addiu $v0, $zero, 0xe -/* DB3B54 80241894 A480008E */ sh $zero, 0x8e($a0) -/* DB3B58 80241898 AE020070 */ sw $v0, 0x70($s0) -.L8024189C: -/* DB3B5C 8024189C 8FBF0014 */ lw $ra, 0x14($sp) -/* DB3B60 802418A0 8FB00010 */ lw $s0, 0x10($sp) -/* DB3B64 802418A4 03E00008 */ jr $ra -/* DB3B68 802418A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index cd2a6b1d23..42ce993af6 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -109,7 +109,7 @@ glabel func_80241D60_DB4020 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero /* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal func_80241848_DB3B08 +/* DB41C4 80241F04 0C090612 */ jal UnkNpcAIFunc3 /* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero /* DB41CC 80241F0C 080907CA */ j .L80241F28 /* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s deleted file mode 100644 index 36cd8a2a95..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024276C_DBFA1C -/* DBFA1C 8024276C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBFA20 80242770 AFB00010 */ sw $s0, 0x10($sp) -/* DBFA24 80242774 0080802D */ daddu $s0, $a0, $zero -/* DBFA28 80242778 AFBF0014 */ sw $ra, 0x14($sp) -/* DBFA2C 8024277C 8E020148 */ lw $v0, 0x148($s0) -/* DBFA30 80242780 0C00EABB */ jal get_npc_unsafe -/* DBFA34 80242784 84440008 */ lh $a0, 8($v0) -/* DBFA38 80242788 0040202D */ daddu $a0, $v0, $zero -/* DBFA3C 8024278C 8482008E */ lh $v0, 0x8e($a0) -/* DBFA40 80242790 9483008E */ lhu $v1, 0x8e($a0) -/* DBFA44 80242794 18400005 */ blez $v0, .L802427AC -/* DBFA48 80242798 2462FFFF */ addiu $v0, $v1, -1 -/* DBFA4C 8024279C A482008E */ sh $v0, 0x8e($a0) -/* DBFA50 802427A0 00021400 */ sll $v0, $v0, 0x10 -/* DBFA54 802427A4 1C400006 */ bgtz $v0, .L802427C0 -/* DBFA58 802427A8 00000000 */ nop -.L802427AC: -/* DBFA5C 802427AC 8482008C */ lh $v0, 0x8c($a0) -/* DBFA60 802427B0 14400003 */ bnez $v0, .L802427C0 -/* DBFA64 802427B4 2402000E */ addiu $v0, $zero, 0xe -/* DBFA68 802427B8 A480008E */ sh $zero, 0x8e($a0) -/* DBFA6C 802427BC AE020070 */ sw $v0, 0x70($s0) -.L802427C0: -/* DBFA70 802427C0 8FBF0014 */ lw $ra, 0x14($sp) -/* DBFA74 802427C4 8FB00010 */ lw $s0, 0x10($sp) -/* DBFA78 802427C8 03E00008 */ jr $ra -/* DBFA7C 802427CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 4356034195..2b43bc919b 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -109,7 +109,7 @@ glabel func_80242C84_DBFF34 /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero /* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero /* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal func_8024276C_DBFA1C +/* DC00D8 80242E28 0C0909DB */ jal UnkNpcAIFunc3 /* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero /* DC00E0 80242E30 08090B93 */ j .L80242E4C /* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s deleted file mode 100644 index df26fc4af7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241DA8_DF0C48.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA8_DF0C48 -/* DF0C48 80241DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF0C4C 80241DAC AFB00010 */ sw $s0, 0x10($sp) -/* DF0C50 80241DB0 0080802D */ daddu $s0, $a0, $zero -/* DF0C54 80241DB4 AFBF0014 */ sw $ra, 0x14($sp) -/* DF0C58 80241DB8 8E020148 */ lw $v0, 0x148($s0) -/* DF0C5C 80241DBC 0C00EABB */ jal get_npc_unsafe -/* DF0C60 80241DC0 84440008 */ lh $a0, 8($v0) -/* DF0C64 80241DC4 0040202D */ daddu $a0, $v0, $zero -/* DF0C68 80241DC8 8482008E */ lh $v0, 0x8e($a0) -/* DF0C6C 80241DCC 9483008E */ lhu $v1, 0x8e($a0) -/* DF0C70 80241DD0 18400005 */ blez $v0, .L80241DE8 -/* DF0C74 80241DD4 2462FFFF */ addiu $v0, $v1, -1 -/* DF0C78 80241DD8 A482008E */ sh $v0, 0x8e($a0) -/* DF0C7C 80241DDC 00021400 */ sll $v0, $v0, 0x10 -/* DF0C80 80241DE0 1C400006 */ bgtz $v0, .L80241DFC -/* DF0C84 80241DE4 00000000 */ nop -.L80241DE8: -/* DF0C88 80241DE8 8482008C */ lh $v0, 0x8c($a0) -/* DF0C8C 80241DEC 14400003 */ bnez $v0, .L80241DFC -/* DF0C90 80241DF0 2402000E */ addiu $v0, $zero, 0xe -/* DF0C94 80241DF4 A480008E */ sh $zero, 0x8e($a0) -/* DF0C98 80241DF8 AE020070 */ sw $v0, 0x70($s0) -.L80241DFC: -/* DF0C9C 80241DFC 8FBF0014 */ lw $ra, 0x14($sp) -/* DF0CA0 80241E00 8FB00010 */ lw $s0, 0x10($sp) -/* DF0CA4 80241E04 03E00008 */ jr $ra -/* DF0CA8 80241E08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index e946771094..b238209bd1 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -109,7 +109,7 @@ glabel func_802422C0_DF1160 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero /* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero /* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal func_80241DA8_DF0C48 +/* DF1304 80242464 0C09076A */ jal UnkNpcAIFunc3 /* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero /* DF130C 8024246C 08090922 */ j .L80242488 /* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s deleted file mode 100644 index b7d170e5e2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241344_D211D4 -/* D211D4 80241344 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D211D8 80241348 AFB00010 */ sw $s0, 0x10($sp) -/* D211DC 8024134C 0080802D */ daddu $s0, $a0, $zero -/* D211E0 80241350 AFBF0014 */ sw $ra, 0x14($sp) -/* D211E4 80241354 8E020148 */ lw $v0, 0x148($s0) -/* D211E8 80241358 0C00EABB */ jal get_npc_unsafe -/* D211EC 8024135C 84440008 */ lh $a0, 8($v0) -/* D211F0 80241360 0040202D */ daddu $a0, $v0, $zero -/* D211F4 80241364 8482008E */ lh $v0, 0x8e($a0) -/* D211F8 80241368 9483008E */ lhu $v1, 0x8e($a0) -/* D211FC 8024136C 18400005 */ blez $v0, .L80241384 -/* D21200 80241370 2462FFFF */ addiu $v0, $v1, -1 -/* D21204 80241374 A482008E */ sh $v0, 0x8e($a0) -/* D21208 80241378 00021400 */ sll $v0, $v0, 0x10 -/* D2120C 8024137C 1C400006 */ bgtz $v0, .L80241398 -/* D21210 80241380 00000000 */ nop -.L80241384: -/* D21214 80241384 8482008C */ lh $v0, 0x8c($a0) -/* D21218 80241388 14400003 */ bnez $v0, .L80241398 -/* D2121C 8024138C 2402000E */ addiu $v0, $zero, 0xe -/* D21220 80241390 A480008E */ sh $zero, 0x8e($a0) -/* D21224 80241394 AE020070 */ sw $v0, 0x70($s0) -.L80241398: -/* D21228 80241398 8FBF0014 */ lw $ra, 0x14($sp) -/* D2122C 8024139C 8FB00010 */ lw $s0, 0x10($sp) -/* D21230 802413A0 03E00008 */ jr $ra -/* D21234 802413A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index 68dbae9e36..2718a6047a 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -109,7 +109,7 @@ glabel func_8024185C_D216EC /* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero /* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero /* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero -/* D21890 80241A00 0C0904D1 */ jal func_80241344_D211D4 +/* D21890 80241A00 0C0904D1 */ jal UnkNpcAIFunc3 /* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero /* D21898 80241A08 08090689 */ j .L80241A24 /* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s deleted file mode 100644 index 9773b38980..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E4_87BDC4 -/* 87BDC4 802421E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87BDC8 802421E8 AFB00010 */ sw $s0, 0x10($sp) -/* 87BDCC 802421EC 0080802D */ daddu $s0, $a0, $zero -/* 87BDD0 802421F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 87BDD4 802421F4 8E020148 */ lw $v0, 0x148($s0) -/* 87BDD8 802421F8 0C00EABB */ jal get_npc_unsafe -/* 87BDDC 802421FC 84440008 */ lh $a0, 8($v0) -/* 87BDE0 80242200 0040202D */ daddu $a0, $v0, $zero -/* 87BDE4 80242204 8482008E */ lh $v0, 0x8e($a0) -/* 87BDE8 80242208 9483008E */ lhu $v1, 0x8e($a0) -/* 87BDEC 8024220C 18400005 */ blez $v0, .L80242224 -/* 87BDF0 80242210 2462FFFF */ addiu $v0, $v1, -1 -/* 87BDF4 80242214 A482008E */ sh $v0, 0x8e($a0) -/* 87BDF8 80242218 00021400 */ sll $v0, $v0, 0x10 -/* 87BDFC 8024221C 1C400006 */ bgtz $v0, .L80242238 -/* 87BE00 80242220 00000000 */ nop -.L80242224: -/* 87BE04 80242224 8482008C */ lh $v0, 0x8c($a0) -/* 87BE08 80242228 14400003 */ bnez $v0, .L80242238 -/* 87BE0C 8024222C 2402000E */ addiu $v0, $zero, 0xe -/* 87BE10 80242230 A480008E */ sh $zero, 0x8e($a0) -/* 87BE14 80242234 AE020070 */ sw $v0, 0x70($s0) -.L80242238: -/* 87BE18 80242238 8FBF0014 */ lw $ra, 0x14($sp) -/* 87BE1C 8024223C 8FB00010 */ lw $s0, 0x10($sp) -/* 87BE20 80242240 03E00008 */ jr $ra -/* 87BE24 80242244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index dcd010b25f..b7de9cd948 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -109,7 +109,7 @@ glabel func_802426FC_87C2DC /* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero /* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero /* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero -/* 87C480 802428A0 0C090879 */ jal func_802421E4_87BDC4 +/* 87C480 802428A0 0C090879 */ jal UnkNpcAIFunc3 /* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero /* 87C488 802428A8 08090A31 */ j .L802428C4 /* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s deleted file mode 100644 index 6fda49ee13..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C0C_9AAFFC -/* 9AAFFC 80242C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AB000 80242C10 AFB00010 */ sw $s0, 0x10($sp) -/* 9AB004 80242C14 0080802D */ daddu $s0, $a0, $zero -/* 9AB008 80242C18 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AB00C 80242C1C 8E020148 */ lw $v0, 0x148($s0) -/* 9AB010 80242C20 0C00EABB */ jal get_npc_unsafe -/* 9AB014 80242C24 84440008 */ lh $a0, 8($v0) -/* 9AB018 80242C28 0040202D */ daddu $a0, $v0, $zero -/* 9AB01C 80242C2C 8482008E */ lh $v0, 0x8e($a0) -/* 9AB020 80242C30 9483008E */ lhu $v1, 0x8e($a0) -/* 9AB024 80242C34 18400005 */ blez $v0, .L80242C4C -/* 9AB028 80242C38 2462FFFF */ addiu $v0, $v1, -1 -/* 9AB02C 80242C3C A482008E */ sh $v0, 0x8e($a0) -/* 9AB030 80242C40 00021400 */ sll $v0, $v0, 0x10 -/* 9AB034 80242C44 1C400006 */ bgtz $v0, .L80242C60 -/* 9AB038 80242C48 00000000 */ nop -.L80242C4C: -/* 9AB03C 80242C4C 8482008C */ lh $v0, 0x8c($a0) -/* 9AB040 80242C50 14400003 */ bnez $v0, .L80242C60 -/* 9AB044 80242C54 2402000E */ addiu $v0, $zero, 0xe -/* 9AB048 80242C58 A480008E */ sh $zero, 0x8e($a0) -/* 9AB04C 80242C5C AE020070 */ sw $v0, 0x70($s0) -.L80242C60: -/* 9AB050 80242C60 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AB054 80242C64 8FB00010 */ lw $s0, 0x10($sp) -/* 9AB058 80242C68 03E00008 */ jr $ra -/* 9AB05C 80242C6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index fdb24ab773..ac1d6b2baf 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -109,7 +109,7 @@ glabel func_80243124_9AB514 /* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero /* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero /* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero -/* 9AB6B8 802432C8 0C090B03 */ jal func_80242C0C_9AAFFC +/* 9AB6B8 802432C8 0C090B03 */ jal UnkNpcAIFunc3 /* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero /* 9AB6C0 802432D0 08090CBB */ j .L802432EC /* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s deleted file mode 100644 index bf3cbc15f4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802418D8_9B8258.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D8_9B8258 -/* 9B8258 802418D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B825C 802418DC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8260 802418E0 0080802D */ daddu $s0, $a0, $zero -/* 9B8264 802418E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B8268 802418E8 8E020148 */ lw $v0, 0x148($s0) -/* 9B826C 802418EC 0C00EABB */ jal get_npc_unsafe -/* 9B8270 802418F0 84440008 */ lh $a0, 8($v0) -/* 9B8274 802418F4 0040202D */ daddu $a0, $v0, $zero -/* 9B8278 802418F8 8482008E */ lh $v0, 0x8e($a0) -/* 9B827C 802418FC 9483008E */ lhu $v1, 0x8e($a0) -/* 9B8280 80241900 18400005 */ blez $v0, .L80241918 -/* 9B8284 80241904 2462FFFF */ addiu $v0, $v1, -1 -/* 9B8288 80241908 A482008E */ sh $v0, 0x8e($a0) -/* 9B828C 8024190C 00021400 */ sll $v0, $v0, 0x10 -/* 9B8290 80241910 1C400006 */ bgtz $v0, .L8024192C -/* 9B8294 80241914 00000000 */ nop -.L80241918: -/* 9B8298 80241918 8482008C */ lh $v0, 0x8c($a0) -/* 9B829C 8024191C 14400003 */ bnez $v0, .L8024192C -/* 9B82A0 80241920 2402000E */ addiu $v0, $zero, 0xe -/* 9B82A4 80241924 A480008E */ sh $zero, 0x8e($a0) -/* 9B82A8 80241928 AE020070 */ sw $v0, 0x70($s0) -.L8024192C: -/* 9B82AC 8024192C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B82B0 80241930 8FB00010 */ lw $s0, 0x10($sp) -/* 9B82B4 80241934 03E00008 */ jr $ra -/* 9B82B8 80241938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index cd9299bd8c..74c471a25f 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -109,7 +109,7 @@ glabel func_80241DF0_9B8770 /* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero /* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero /* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero -/* 9B8914 80241F94 0C090636 */ jal func_802418D8_9B8258 +/* 9B8914 80241F94 0C090636 */ jal UnkNpcAIFunc3 /* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero /* 9B891C 80241F9C 080907EE */ j .L80241FB8 /* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero diff --git a/include/common_structs.h b/include/common_structs.h index 859151d6cd..5bf772177e 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -102,7 +102,7 @@ typedef struct Npc { /* 0x084 */ char unk_84[4]; /* 0x088 */ s16 isFacingAway; /* 0x08A */ s16 yawCamOffset; - /* 0x08C */ char unk_8C[2]; + /* 0x08C */ s16 unk_8C; /* 0x08E */ s16 duration; /* formerly interp_counter */ /* 0x090 */ Vec3s homePos; /* 0x096 */ char unk_96[12]; diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 25aec44bfb..2b2a996f15 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -39,7 +39,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241AE4_BE5294); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241B50_BE5300); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241C84_BE5434); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241CE8_BE5498); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index 15ee0aa405..27e950cfed 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802415A4_BEE394); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241610_BEE400); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241744_BEE534); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802417A8_BEE598); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 5f52ca2914..fea0889e57 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240D74_BFE5F4); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240DE0_BFE660); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F14_BFE794); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F78_BFE7F8); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index d67f4be315..4d325af878 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240C54_C37184); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240CC0_C371F0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240DF4_C37324); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240E58_C37388); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 91a0211327..ee565ac924 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -53,7 +53,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802423B4_C42164); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242420_C421D0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242554_C42304); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802425B8_C42368); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index c3ee26d073..5615d9b7f9 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242078_C48C58); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802420E4_C48CC4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242218_C48DF8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024227C_C48E5C); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index f3770008f2..d442067970 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74_CB5F74); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240FE0_CB5FE0); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241114_CB6114); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241178_CB6178); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 66b39ff220..06eda1bece 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E18_CC4628); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E84_CC4694); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240FB8_CC47C8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024101C_CC482C); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 5a8839672b..c803d04f92 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764_CCCA74); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802417D0_CCCAE0); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241904_CCCC14); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241968_CCCC78); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 80c656fabd..61e472d7ed 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241AA4_CD38D4); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241B10_CD3940); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241C44_CD3A74); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241CA8_CD3AD8); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 0c0e586bea..24e69bda54 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240CC4_CD7FA4); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240D30_CD8010); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240E64_CD8144); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240EC8_CD81A8); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 391111f892..3cd801570c 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C94_CF3864); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240D00_CF38D0); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240E34_CF3A04); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240E98_CF3A68); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index f7ceb301b9..6ad6124807 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241CB0_A17ED0); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241DE4_A18004); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241E48_A18068); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 459737beee..4a3b8eb3d3 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241970_A1CA70); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241AA4_A1CBA4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241B08_A1CC08); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index fca5d7eed9..d4f8c67856 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240CC0_8CED30); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240DF4_8CEE64); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240E58_8CEEC8); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 3da8c35ffa..a695f1fde8 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240C54_8D2164); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240CC0_8D21D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240DF4_8D2304); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240E58_8D2368); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index d9f63fa0f5..3ad9b8b8df 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240C54_8D6A54); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240CC0_8D6AC0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240DF4_8D6BF4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240E58_8D6C58); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index d2dd639b04..ba8680ebea 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802411A0_C5B8E0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802412D4_C5BA14); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241338_C5BA78); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index d7002da87c..99eb861a79 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802414E0_C6F810); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241614_C6F944); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241678_C6F9A8); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index b784059611..4da8f413c2 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241710_C72B90); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241844_C72CC4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802418A8_C72D28); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 9be2eab9cd..3575cfc20d 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241120_C812C0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241254_C813F4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802412B8_C81458); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 587a1ca76f..293d63460f 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240D60_BAE6A0); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240E94_BAE7D4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240EF8_BAE838); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index a56dcf1a9b..5b95093f99 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241494_9F5ED4); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802415C8_9F6008); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024162C_9F606C); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index aee9d34941..3a3df924f5 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241654_A03E94); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241788_A03FC8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802417EC_A0402C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index ddca1215de..3285877b2d 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241774_A08674); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802418A8_A087A8); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024190C_A0880C); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index e4ae976622..4b88139136 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241060_DAE460); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241194_DAE594); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802411F8_DAE5F8); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index c868927300..4a4c969b73 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241714_DB39D4); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241848_DB3B08); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802418AC_DB3B6C); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 2938a5db3f..3cdc4fc031 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -59,7 +59,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242638_DBF8E8); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024276C_DBFA1C); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802427D0_DBFA80); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index a5519cb941..48f20bcf4f 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C74_DF0B14); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241DA8_DF0C48); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241E0C_DF0CAC); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 57d4b88226..8819e388d9 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241210_D210A0); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241344_D211D4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802413A8_D21238); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 6111d31a35..2dbf7e9baf 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802420B0_87BC90); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802421E4_87BDC4); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242248_87BE28); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 81226ad54e..edb3d35a87 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242AD8_9AAEC8); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C0C_9AAFFC); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C70_9AB060); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 9854d05329..61c7efc71f 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802417A4_9B8124); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802418D8_9B8258); +#include "world/common/UnkNpcAIFunc3.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024193C_9B82BC); diff --git a/src/world/common/UnkNpcAIFunc3.inc.c b/src/world/common/UnkNpcAIFunc3.inc.c new file mode 100644 index 0000000000..96553e0c20 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc3.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc3(ScriptInstance* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + if ((npc->duration <= 0) || ((--npc->duration << 0x10) <= 0)) { + if (npc->unk_8C == 0) { + npc->duration = 0; + script->functionTemp[0].s = 14; + } + } +}