pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

UnkNpcAIFunc10

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-22 15:16:08 -05:00
parent 9a9cc74ebb
commit 8574e9b538
22 changed files with 32 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024191C_8B198C
/* 8B198C 8024191C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8B1990 80241920 AFB00010 */ sw $s0, 0x10($sp)
/* 8B1994 80241924 0080802D */ daddu $s0, $a0, $zero
/* 8B1998 80241928 AFBF0014 */ sw $ra, 0x14($sp)
/* 8B199C 8024192C 8E020148 */ lw $v0, 0x148($s0)
/* 8B19A0 80241930 0C00EABB */ jal get_npc_unsafe
/* 8B19A4 80241934 84440008 */ lh $a0, 8($v0)
/* 8B19A8 80241938 9443008E */ lhu $v1, 0x8e($v0)
/* 8B19AC 8024193C 2463FFFF */ addiu $v1, $v1, -1
/* 8B19B0 80241940 A443008E */ sh $v1, 0x8e($v0)
/* 8B19B4 80241944 00031C00 */ sll $v1, $v1, 0x10
/* 8B19B8 80241948 14600002 */ bnez $v1, .L80241954
/* 8B19BC 8024194C 2402000F */ addiu $v0, $zero, 0xf
/* 8B19C0 80241950 AE020070 */ sw $v0, 0x70($s0)
.L80241954:
/* 8B19C4 80241954 8FBF0014 */ lw $ra, 0x14($sp)
/* 8B19C8 80241958 8FB00010 */ lw $s0, 0x10($sp)
/* 8B19CC 8024195C 03E00008 */ jr $ra
/* 8B19D0 80241960 27BD0018 */ addiu $sp, $sp, 0x18

2
asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
View File

@ -139,7 +139,7 @@ glabel func_80241C18_8B1C88
/* 8B1E8C 80241E1C 00000000 */ nop
/* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero
/* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero
/* 8B1E98 80241E28 0C090647 */ jal func_8024191C_8B198C
/* 8B1E98 80241E28 0C090647 */ jal UnkNpcAIFunc10
/* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero
/* 8B1EA0 80241E30 0809079A */ j .L80241E68
/* 8B1EA4 80241E34 00000000 */ nop

23
asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802404F8_8D42B8
/* 8D42B8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8D42BC 802404FC AFB00010 */ sw $s0, 0x10($sp)
/* 8D42C0 80240500 0080802D */ daddu $s0, $a0, $zero
/* 8D42C4 80240504 AFBF0014 */ sw $ra, 0x14($sp)
/* 8D42C8 80240508 8E020148 */ lw $v0, 0x148($s0)
/* 8D42CC 8024050C 0C00EABB */ jal get_npc_unsafe
/* 8D42D0 80240510 84440008 */ lh $a0, 8($v0)
/* 8D42D4 80240514 9443008E */ lhu $v1, 0x8e($v0)
/* 8D42D8 80240518 2463FFFF */ addiu $v1, $v1, -1
/* 8D42DC 8024051C A443008E */ sh $v1, 0x8e($v0)
/* 8D42E0 80240520 00031C00 */ sll $v1, $v1, 0x10
/* 8D42E4 80240524 14600002 */ bnez $v1, .L80240530
/* 8D42E8 80240528 2402000F */ addiu $v0, $zero, 0xf
/* 8D42EC 8024052C AE020070 */ sw $v0, 0x70($s0)
.L80240530:
/* 8D42F0 80240530 8FBF0014 */ lw $ra, 0x14($sp)
/* 8D42F4 80240534 8FB00010 */ lw $s0, 0x10($sp)
/* 8D42F8 80240538 03E00008 */ jr $ra
/* 8D42FC 8024053C 27BD0018 */ addiu $sp, $sp, 0x18

16
asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
View File

@ -46,7 +46,7 @@ glabel func_802407F4_8D45B4
/* 8D4658 80240898 8E4200B0 */ lw $v0, 0xb0($s2)
/* 8D465C 8024089C 30420004 */ andi $v0, $v0, 4
/* 8D4660 802408A0 1040002F */ beqz $v0, .L80240960
/* 8D4664 802408A4 00000000 */ nop
/* 8D4664 802408A4 00000000 */ nop
.L802408A8:
/* 8D4668 802408A8 AE800070 */ sw $zero, 0x70($s4)
/* 8D466C 802408AC C600000C */ lwc1 $f0, 0xc($s0)
@ -106,7 +106,7 @@ glabel func_802407F4_8D45B4
/* 8D4734 80240974 00220821 */ addu $at, $at, $v0
/* 8D4738 80240978 8C221EA8 */ lw $v0, 0x1ea8($at)
/* 8D473C 8024097C 00400008 */ jr $v0
/* 8D4740 80240980 00000000 */ nop
/* 8D4740 80240980 00000000 */ nop
/* 8D4744 80240984 0280202D */ daddu $a0, $s4, $zero
/* 8D4748 80240988 0260282D */ daddu $a1, $s3, $zero
/* 8D474C 8024098C 0C090000 */ jal func_80240000_8D3DC0
@ -116,7 +116,7 @@ glabel func_802407F4_8D45B4
/* 8D475C 8024099C 0C09002D */ jal func_802400B4_8D3E74
/* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero
/* 8D4764 802409A4 08090291 */ j .L80240A44
/* 8D4768 802409A8 00000000 */ nop
/* 8D4768 802409A8 00000000 */ nop
/* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero
/* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero
/* 8D4774 802409B4 0C090075 */ jal func_802401D4_8D3F94
@ -126,7 +126,7 @@ glabel func_802407F4_8D45B4
/* 8D4784 802409C4 0C09008D */ jal NpcJumpFunc
/* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero
/* 8D478C 802409CC 08090291 */ j .L80240A44
/* 8D4790 802409D0 00000000 */ nop
/* 8D4790 802409D0 00000000 */ nop
/* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero
/* 8D4798 802409D8 0260282D */ daddu $a1, $s3, $zero
/* 8D479C 802409DC 0C0900AB */ jal func_802402AC_8D406C
@ -136,13 +136,13 @@ glabel func_802407F4_8D45B4
/* 8D47AC 802409EC 0C0900F7 */ jal func_802403DC_8D419C
/* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero
/* 8D47B4 802409F4 08090291 */ j .L80240A44
/* 8D47B8 802409F8 00000000 */ nop
/* 8D47B8 802409F8 00000000 */ nop
/* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero
/* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero
/* 8D47C4 80240A04 0C09013E */ jal func_802404F8_8D42B8
/* 8D47C4 80240A04 0C09013E */ jal UnkNpcAIFunc10
/* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero
/* 8D47CC 80240A0C 08090291 */ j .L80240A44
/* 8D47D0 80240A10 00000000 */ nop
/* 8D47D0 80240A10 00000000 */ nop
/* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero
/* 8D47D8 80240A18 0260282D */ daddu $a1, $s3, $zero
/* 8D47DC 80240A1C 0C090150 */ jal func_80240540_8D4300
@ -152,7 +152,7 @@ glabel func_802407F4_8D45B4
/* 8D47EC 80240A2C 0C09017B */ jal func_802405EC_8D43AC
/* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero
/* 8D47F4 80240A34 08090291 */ j .L80240A44
/* 8D47F8 80240A38 00000000 */ nop
/* 8D47F8 80240A38 00000000 */ nop
/* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C
/* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero
.L80240A44:

23
asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240868_8DA968
/* 8DA968 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8DA96C 8024086C AFB00010 */ sw $s0, 0x10($sp)
/* 8DA970 80240870 0080802D */ daddu $s0, $a0, $zero
/* 8DA974 80240874 AFBF0014 */ sw $ra, 0x14($sp)
/* 8DA978 80240878 8E020148 */ lw $v0, 0x148($s0)
/* 8DA97C 8024087C 0C00EABB */ jal get_npc_unsafe
/* 8DA980 80240880 84440008 */ lh $a0, 8($v0)
/* 8DA984 80240884 9443008E */ lhu $v1, 0x8e($v0)
/* 8DA988 80240888 2463FFFF */ addiu $v1, $v1, -1
/* 8DA98C 8024088C A443008E */ sh $v1, 0x8e($v0)
/* 8DA990 80240890 00031C00 */ sll $v1, $v1, 0x10
/* 8DA994 80240894 14600002 */ bnez $v1, .L802408A0
/* 8DA998 80240898 2402000F */ addiu $v0, $zero, 0xf
/* 8DA99C 8024089C AE020070 */ sw $v0, 0x70($s0)
.L802408A0:
/* 8DA9A0 802408A0 8FBF0014 */ lw $ra, 0x14($sp)
/* 8DA9A4 802408A4 8FB00010 */ lw $s0, 0x10($sp)
/* 8DA9A8 802408A8 03E00008 */ jr $ra
/* 8DA9AC 802408AC 27BD0018 */ addiu $sp, $sp, 0x18

2
asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
View File

@ -139,7 +139,7 @@ glabel func_80240B64_8DAC64
/* 8DAE68 80240D68 00000000 */ nop
/* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero
/* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero
/* 8DAE74 80240D74 0C09021A */ jal func_80240868_8DA968
/* 8DAE74 80240D74 0C09021A */ jal UnkNpcAIFunc10
/* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero
/* 8DAE7C 80240D7C 0809036D */ j .L80240DB4
/* 8DAE80 80240D80 00000000 */ nop

23
asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802404F8_9C58D8.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802404F8_9C58D8
/* 9C58D8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 9C58DC 802404FC AFB00010 */ sw $s0, 0x10($sp)
/* 9C58E0 80240500 0080802D */ daddu $s0, $a0, $zero
/* 9C58E4 80240504 AFBF0014 */ sw $ra, 0x14($sp)
/* 9C58E8 80240508 8E020148 */ lw $v0, 0x148($s0)
/* 9C58EC 8024050C 0C00EABB */ jal get_npc_unsafe
/* 9C58F0 80240510 84440008 */ lh $a0, 8($v0)
/* 9C58F4 80240514 9443008E */ lhu $v1, 0x8e($v0)
/* 9C58F8 80240518 2463FFFF */ addiu $v1, $v1, -1
/* 9C58FC 8024051C A443008E */ sh $v1, 0x8e($v0)
/* 9C5900 80240520 00031C00 */ sll $v1, $v1, 0x10
/* 9C5904 80240524 14600002 */ bnez $v1, .L80240530
/* 9C5908 80240528 2402000F */ addiu $v0, $zero, 0xf
/* 9C590C 8024052C AE020070 */ sw $v0, 0x70($s0)
.L80240530:
/* 9C5910 80240530 8FBF0014 */ lw $ra, 0x14($sp)
/* 9C5914 80240534 8FB00010 */ lw $s0, 0x10($sp)
/* 9C5918 80240538 03E00008 */ jr $ra
/* 9C591C 8024053C 27BD0018 */ addiu $sp, $sp, 0x18

2
asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
View File

@ -139,7 +139,7 @@ glabel func_802407F4_9C5BD4
/* 9C5DD8 802409F8 00000000 */ nop
/* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero
/* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero
/* 9C5DE4 80240A04 0C09013E */ jal func_802404F8_9C58D8
/* 9C5DE4 80240A04 0C09013E */ jal UnkNpcAIFunc10
/* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero
/* 9C5DEC 80240A0C 08090291 */ j .L80240A44
/* 9C5DF0 80240A10 00000000 */ nop

23
asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802413D4_D9E8A4.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802413D4_D9E8A4
/* D9E8A4 802413D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D9E8A8 802413D8 AFB00010 */ sw $s0, 0x10($sp)
/* D9E8AC 802413DC 0080802D */ daddu $s0, $a0, $zero
/* D9E8B0 802413E0 AFBF0014 */ sw $ra, 0x14($sp)
/* D9E8B4 802413E4 8E020148 */ lw $v0, 0x148($s0)
/* D9E8B8 802413E8 0C00EABB */ jal get_npc_unsafe
/* D9E8BC 802413EC 84440008 */ lh $a0, 8($v0)
/* D9E8C0 802413F0 9443008E */ lhu $v1, 0x8e($v0)
/* D9E8C4 802413F4 2463FFFF */ addiu $v1, $v1, -1
/* D9E8C8 802413F8 A443008E */ sh $v1, 0x8e($v0)
/* D9E8CC 802413FC 00031C00 */ sll $v1, $v1, 0x10
/* D9E8D0 80241400 14600002 */ bnez $v1, .L8024140C
/* D9E8D4 80241404 2402000F */ addiu $v0, $zero, 0xf
/* D9E8D8 80241408 AE020070 */ sw $v0, 0x70($s0)
.L8024140C:
/* D9E8DC 8024140C 8FBF0014 */ lw $ra, 0x14($sp)
/* D9E8E0 80241410 8FB00010 */ lw $s0, 0x10($sp)
/* D9E8E4 80241414 03E00008 */ jr $ra
/* D9E8E8 80241418 27BD0018 */ addiu $sp, $sp, 0x18

2
asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
View File

@ -139,7 +139,7 @@ glabel func_802416D0_D9EBA0
/* D9EDA4 802418D4 00000000 */ nop
/* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero
/* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero
/* D9EDB0 802418E0 0C0904F5 */ jal func_802413D4_D9E8A4
/* D9EDB0 802418E0 0C0904F5 */ jal UnkNpcAIFunc10
/* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero
/* D9EDB8 802418E8 08090648 */ j .L80241920
/* D9EDBC 802418EC 00000000 */ nop

23
asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240868_93FE18.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240868_93FE18
/* 93FE18 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 93FE1C 8024086C AFB00010 */ sw $s0, 0x10($sp)
/* 93FE20 80240870 0080802D */ daddu $s0, $a0, $zero
/* 93FE24 80240874 AFBF0014 */ sw $ra, 0x14($sp)
/* 93FE28 80240878 8E020148 */ lw $v0, 0x148($s0)
/* 93FE2C 8024087C 0C00EABB */ jal get_npc_unsafe
/* 93FE30 80240880 84440008 */ lh $a0, 8($v0)
/* 93FE34 80240884 9443008E */ lhu $v1, 0x8e($v0)
/* 93FE38 80240888 2463FFFF */ addiu $v1, $v1, -1
/* 93FE3C 8024088C A443008E */ sh $v1, 0x8e($v0)
/* 93FE40 80240890 00031C00 */ sll $v1, $v1, 0x10
/* 93FE44 80240894 14600002 */ bnez $v1, .L802408A0
/* 93FE48 80240898 2402000F */ addiu $v0, $zero, 0xf
/* 93FE4C 8024089C AE020070 */ sw $v0, 0x70($s0)
.L802408A0:
/* 93FE50 802408A0 8FBF0014 */ lw $ra, 0x14($sp)
/* 93FE54 802408A4 8FB00010 */ lw $s0, 0x10($sp)
/* 93FE58 802408A8 03E00008 */ jr $ra
/* 93FE5C 802408AC 27BD0018 */ addiu $sp, $sp, 0x18

2
asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
View File

@ -139,7 +139,7 @@ glabel func_80240B64_940114
/* 940318 80240D68 00000000 */ nop
/* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero
/* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero
/* 940324 80240D74 0C09021A */ jal func_80240868_93FE18
/* 940324 80240D74 0C09021A */ jal UnkNpcAIFunc10
/* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero
/* 94032C 80240D7C 0809036D */ j .L80240DB4
/* 940330 80240D80 00000000 */ nop

23
asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802410BC_99DA4C
/* 99DA4C 802410BC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 99DA50 802410C0 AFB00010 */ sw $s0, 0x10($sp)
/* 99DA54 802410C4 0080802D */ daddu $s0, $a0, $zero
/* 99DA58 802410C8 AFBF0014 */ sw $ra, 0x14($sp)
/* 99DA5C 802410CC 8E020148 */ lw $v0, 0x148($s0)
/* 99DA60 802410D0 0C00EABB */ jal get_npc_unsafe
/* 99DA64 802410D4 84440008 */ lh $a0, 8($v0)
/* 99DA68 802410D8 9443008E */ lhu $v1, 0x8e($v0)
/* 99DA6C 802410DC 2463FFFF */ addiu $v1, $v1, -1
/* 99DA70 802410E0 A443008E */ sh $v1, 0x8e($v0)
/* 99DA74 802410E4 00031C00 */ sll $v1, $v1, 0x10
/* 99DA78 802410E8 14600002 */ bnez $v1, .L802410F4
/* 99DA7C 802410EC 2402000F */ addiu $v0, $zero, 0xf
/* 99DA80 802410F0 AE020070 */ sw $v0, 0x70($s0)
.L802410F4:
/* 99DA84 802410F4 8FBF0014 */ lw $ra, 0x14($sp)
/* 99DA88 802410F8 8FB00010 */ lw $s0, 0x10($sp)
/* 99DA8C 802410FC 03E00008 */ jr $ra
/* 99DA90 80241100 27BD0018 */ addiu $sp, $sp, 0x18

2
asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
View File

@ -139,7 +139,7 @@ glabel func_802413B8_99DD48
/* 99DF4C 802415BC 00000000 */ nop
/* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero
/* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero
/* 99DF58 802415C8 0C09042F */ jal func_802410BC_99DA4C
/* 99DF58 802415C8 0C09042F */ jal UnkNpcAIFunc10
/* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero
/* 99DF60 802415D0 08090582 */ j .L80241608
/* 99DF64 802415D4 00000000 */ nop

2
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0_8B1740);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241800_8B1870);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024191C_8B198C);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241964_8B19D4);

2
src/world/area_kmr/kmr_07/8D3DC0.c
View File

@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC_8D406C);
INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802403DC_8D419C);
INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802404F8_8D42B8);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240540_8D4300);

2
src/world/area_kmr/kmr_11/8DA3A0.c
View File

@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024061C_8DA71C);
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024074C_8DA84C);
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240868_8DA968);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802408B0_8DA9B0);

2
src/world/area_nok/nok_01/9C53E0.c
View File

@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802402AC_9C568C);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802403DC_9C57BC);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802404F8_9C58D8);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240540_9C5920);

2
src/world/area_omo/omo_02/D9D510.c
View File

@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241188_D9E658);
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802412B8_D9E788);
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802413D4_D9E8A4);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024141C_D9E8EC);

2
src/world/area_sbk/sbk_30/93F5B0.c
View File

@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024061C_93FBCC);
INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024074C_93FCFC);
INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240868_93FE18);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802408B0_93FE60);

2
src/world/area_trd/trd_01/99CD80.c
View File

@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70_99D800);
INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240FA0_99D930);
INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802410BC_99DA4C);
# include "world/common/UnkNpcAIFunc10.inc.c"
INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241104_99DA94);

11
src/world/common/UnkNpcAIFunc10.inc.c Normal file
View File

@ -0,0 +1,11 @@
#include "common.h"
#include "map.h"
static void UnkNpcAIFunc10(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) == 0) {
script->functionTemp[0].s = 15;
}
}