pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

UnkNpcAIFunc4

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-21 23:25:13 -05:00
parent 931d3b358b
commit a82d6893ed
30 changed files with 51 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802416B8_B4C128
/* B4C128 802416B8 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B4C12C 802416BC AFB10014 */ sw $s1, 0x14($sp)
/* B4C130 802416C0 0080882D */ daddu $s1, $a0, $zero
/* B4C134 802416C4 AFBF0018 */ sw $ra, 0x18($sp)
/* B4C138 802416C8 AFB00010 */ sw $s0, 0x10($sp)
/* B4C13C 802416CC 8E300148 */ lw $s0, 0x148($s1)
/* B4C140 802416D0 0C00EABB */ jal get_npc_unsafe
/* B4C144 802416D4 86040008 */ lh $a0, 8($s0)
/* B4C148 802416D8 3C054387 */ lui $a1, 0x4387
/* B4C14C 802416DC 0040202D */ daddu $a0, $v0, $zero
/* B4C150 802416E0 0C00ECD0 */ jal set_npc_yaw
/* B4C154 802416E4 A480008E */ sh $zero, 0x8e($a0)
/* B4C158 802416E8 24020003 */ addiu $v0, $zero, 3
/* B4C15C 802416EC AE00006C */ sw $zero, 0x6c($s0)
/* B4C160 802416F0 AE220070 */ sw $v0, 0x70($s1)
/* B4C164 802416F4 8FBF0018 */ lw $ra, 0x18($sp)
/* B4C168 802416F8 8FB10014 */ lw $s1, 0x14($sp)
/* B4C16C 802416FC 8FB00010 */ lw $s0, 0x10($sp)
/* B4C170 80241700 03E00008 */ jr $ra
/* B4C174 80241704 27BD0020 */ addiu $sp, $sp, 0x20

26
asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
View File

@ -46,7 +46,7 @@ glabel func_8024219C_B4CC0C
/* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1)
/* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4
/* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC
/* B4CCBC 8024224C 00000000 */ nop
/* B4CCBC 8024224C 00000000 */ nop
.L80242250:
/* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801
/* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2)
@ -86,10 +86,10 @@ glabel func_8024219C_B4CC0C
/* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2)
/* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e
/* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC
/* B4CD48 802422D8 00000000 */ nop
/* B4CD48 802422D8 00000000 */ nop
/* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1)
/* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC
/* B4CD54 802422E4 00000000 */ nop
/* B4CD54 802422E4 00000000 */ nop
/* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4_B4C544
/* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero
/* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC
@ -104,7 +104,7 @@ glabel func_8024219C_B4CC0C
/* B4CD80 80242310 00220821 */ addu $at, $at, $v0
/* B4CD84 80242314 8C227C28 */ lw $v0, 0x7c28($at)
/* B4CD88 80242318 00400008 */ jr $v0
/* B4CD8C 8024231C 00000000 */ nop
/* B4CD8C 8024231C 00000000 */ nop
/* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero
/* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero
/* B4CD98 80242328 0C012568 */ jal func_800495A0
@ -114,17 +114,17 @@ glabel func_8024219C_B4CC0C
/* B4CDA8 80242338 0C0125AE */ jal func_800496B8
/* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero
/* B4CDB0 80242340 0809090A */ j .L80242428
/* B4CDB4 80242344 00000000 */ nop
/* B4CDB4 80242344 00000000 */ nop
/* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero
/* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero
/* B4CDC0 80242350 0C0905AE */ jal func_802416B8_B4C128
/* B4CDC0 80242350 0C0905AE */ jal UnkNpcAIFunc4
/* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero
/* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero
/* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero
/* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178
/* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero
/* B4CDD8 80242368 0809090A */ j .L80242428
/* B4CDDC 8024236C 00000000 */ nop
/* B4CDDC 8024236C 00000000 */ nop
/* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero
/* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero
/* B4CDE8 80242378 0C01278F */ jal func_80049E3C
@ -134,7 +134,7 @@ glabel func_8024219C_B4CC0C
/* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC
/* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero
/* B4CE00 80242390 0809090A */ j .L80242428
/* B4CE04 80242394 00000000 */ nop
/* B4CE04 80242394 00000000 */ nop
/* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero
/* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero
/* B4CE10 802423A0 0C0127DF */ jal func_80049F7C
@ -144,13 +144,13 @@ glabel func_8024219C_B4CC0C
/* B4CE20 802423B0 0C012849 */ jal func_8004A124
/* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero
/* B4CE28 802423B8 0809090A */ j .L80242428
/* B4CE2C 802423BC 00000000 */ nop
/* B4CE2C 802423BC 00000000 */ nop
/* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero
/* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero
/* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8
/* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero
/* B4CE40 802423D0 0809090A */ j .L80242428
/* B4CE44 802423D4 00000000 */ nop
/* B4CE44 802423D4 00000000 */ nop
/* B4CE48 802423D8 0C090633 */ jal func_802418CC_B4C33C
/* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero
/* B4CE50 802423E0 0C09064E */ jal func_80241938_B4C3A8
@ -158,17 +158,17 @@ glabel func_8024219C_B4CC0C
/* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2)
/* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20
/* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428
/* B4CE64 802423F4 00000000 */ nop
/* B4CE64 802423F4 00000000 */ nop
/* B4CE68 802423F8 0C09066A */ jal func_802419A8_B4C418
/* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero
/* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2)
/* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21
/* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428
/* B4CE7C 8024240C 00000000 */ nop
/* B4CE7C 8024240C 00000000 */ nop
/* B4CE80 80242410 0C0906A0 */ jal func_80241A80_B4C4F0
/* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero
/* B4CE88 80242418 0809090A */ j .L80242428
/* B4CE8C 8024241C 00000000 */ nop
/* B4CE8C 8024241C 00000000 */ nop
/* B4CE90 80242420 0C0129CF */ jal func_8004A73C
/* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero
.L80242428:

23
asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024268C_B4D0FC.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024268C_B4D0FC
/* B4D0FC 8024268C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* B4D100 80242690 AFB00010 */ sw $s0, 0x10($sp)
/* B4D104 80242694 0080802D */ daddu $s0, $a0, $zero
/* B4D108 80242698 AFBF0014 */ sw $ra, 0x14($sp)
/* B4D10C 8024269C 0C00FB5A */ jal get_enemy_safe
/* B4D110 802426A0 0000202D */ daddu $a0, $zero, $zero
/* B4D114 802426A4 14400003 */ bnez $v0, .L802426B4
/* B4D118 802426A8 24020001 */ addiu $v0, $zero, 1
/* B4D11C 802426AC 080909AE */ j .L802426B8
/* B4D120 802426B0 AE000084 */ sw $zero, 0x84($s0)
.L802426B4:
/* B4D124 802426B4 AE020084 */ sw $v0, 0x84($s0)
.L802426B8:
/* B4D128 802426B8 8FBF0014 */ lw $ra, 0x14($sp)
/* B4D12C 802426BC 8FB00010 */ lw $s0, 0x10($sp)
/* B4D130 802426C0 24020002 */ addiu $v0, $zero, 2
/* B4D134 802426C4 03E00008 */ jr $ra
/* B4D138 802426C8 27BD0018 */ addiu $sp, $sp, 0x18
/* B4D13C 802426CC 00000000 */ nop

24
asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241608_B53E38.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241608_B53E38
/* B53E38 80241608 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B53E3C 8024160C AFB10014 */ sw $s1, 0x14($sp)
/* B53E40 80241610 0080882D */ daddu $s1, $a0, $zero
/* B53E44 80241614 AFBF0018 */ sw $ra, 0x18($sp)
/* B53E48 80241618 AFB00010 */ sw $s0, 0x10($sp)
/* B53E4C 8024161C 8E300148 */ lw $s0, 0x148($s1)
/* B53E50 80241620 0C00EABB */ jal get_npc_unsafe
/* B53E54 80241624 86040008 */ lh $a0, 8($s0)
/* B53E58 80241628 3C054387 */ lui $a1, 0x4387
/* B53E5C 8024162C 0040202D */ daddu $a0, $v0, $zero
/* B53E60 80241630 0C00ECD0 */ jal set_npc_yaw
/* B53E64 80241634 A480008E */ sh $zero, 0x8e($a0)
/* B53E68 80241638 24020003 */ addiu $v0, $zero, 3
/* B53E6C 8024163C AE00006C */ sw $zero, 0x6c($s0)
/* B53E70 80241640 AE220070 */ sw $v0, 0x70($s1)
/* B53E74 80241644 8FBF0018 */ lw $ra, 0x18($sp)
/* B53E78 80241648 8FB10014 */ lw $s1, 0x14($sp)
/* B53E7C 8024164C 8FB00010 */ lw $s0, 0x10($sp)
/* B53E80 80241650 03E00008 */ jr $ra
/* B53E84 80241654 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
View File

@ -117,7 +117,7 @@ glabel func_802420EC_B5491C
/* B54AC4 80242294 00000000 */ nop
/* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero
/* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero
/* B54AD0 802422A0 0C090582 */ jal func_80241608_B53E38
/* B54AD0 802422A0 0C090582 */ jal UnkNpcAIFunc4
/* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero
/* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero
/* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero

24
asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240000_B59870.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240000_B59870
/* B59870 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B59874 80240004 AFB10014 */ sw $s1, 0x14($sp)
/* B59878 80240008 0080882D */ daddu $s1, $a0, $zero
/* B5987C 8024000C AFBF0018 */ sw $ra, 0x18($sp)
/* B59880 80240010 AFB00010 */ sw $s0, 0x10($sp)
/* B59884 80240014 8E300148 */ lw $s0, 0x148($s1)
/* B59888 80240018 0C00EABB */ jal get_npc_unsafe
/* B5988C 8024001C 86040008 */ lh $a0, 8($s0)
/* B59890 80240020 3C054387 */ lui $a1, 0x4387
/* B59894 80240024 0040202D */ daddu $a0, $v0, $zero
/* B59898 80240028 0C00ECD0 */ jal set_npc_yaw
/* B5989C 8024002C A480008E */ sh $zero, 0x8e($a0)
/* B598A0 80240030 24020003 */ addiu $v0, $zero, 3
/* B598A4 80240034 AE00006C */ sw $zero, 0x6c($s0)
/* B598A8 80240038 AE220070 */ sw $v0, 0x70($s1)
/* B598AC 8024003C 8FBF0018 */ lw $ra, 0x18($sp)
/* B598B0 80240040 8FB10014 */ lw $s1, 0x14($sp)
/* B598B4 80240044 8FB00010 */ lw $s0, 0x10($sp)
/* B598B8 80240048 03E00008 */ jr $ra
/* B598BC 8024004C 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
View File

@ -117,7 +117,7 @@ glabel func_80240AE4_B5A354
/* B5A4FC 80240C8C 00000000 */ nop
/* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero
/* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero
/* B5A508 80240C98 0C090000 */ jal func_80240000_B59870
/* B5A508 80240C98 0C090000 */ jal UnkNpcAIFunc4
/* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero
/* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero
/* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero

24
asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241454_B5F704.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241454_B5F704
/* B5F704 80241454 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B5F708 80241458 AFB10014 */ sw $s1, 0x14($sp)
/* B5F70C 8024145C 0080882D */ daddu $s1, $a0, $zero
/* B5F710 80241460 AFBF0018 */ sw $ra, 0x18($sp)
/* B5F714 80241464 AFB00010 */ sw $s0, 0x10($sp)
/* B5F718 80241468 8E300148 */ lw $s0, 0x148($s1)
/* B5F71C 8024146C 0C00EABB */ jal get_npc_unsafe
/* B5F720 80241470 86040008 */ lh $a0, 8($s0)
/* B5F724 80241474 3C054387 */ lui $a1, 0x4387
/* B5F728 80241478 0040202D */ daddu $a0, $v0, $zero
/* B5F72C 8024147C 0C00ECD0 */ jal set_npc_yaw
/* B5F730 80241480 A480008E */ sh $zero, 0x8e($a0)
/* B5F734 80241484 24020003 */ addiu $v0, $zero, 3
/* B5F738 80241488 AE00006C */ sw $zero, 0x6c($s0)
/* B5F73C 8024148C AE220070 */ sw $v0, 0x70($s1)
/* B5F740 80241490 8FBF0018 */ lw $ra, 0x18($sp)
/* B5F744 80241494 8FB10014 */ lw $s1, 0x14($sp)
/* B5F748 80241498 8FB00010 */ lw $s0, 0x10($sp)
/* B5F74C 8024149C 03E00008 */ jr $ra
/* B5F750 802414A0 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
View File

@ -117,7 +117,7 @@ glabel func_80241F38_B601E8
/* B60390 802420E0 00000000 */ nop
/* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero
/* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero
/* B6039C 802420EC 0C090515 */ jal func_80241454_B5F704
/* B6039C 802420EC 0C090515 */ jal UnkNpcAIFunc4
/* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero
/* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero
/* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero

24
asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240940_B663F0.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240940_B663F0
/* B663F0 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B663F4 80240944 AFB10014 */ sw $s1, 0x14($sp)
/* B663F8 80240948 0080882D */ daddu $s1, $a0, $zero
/* B663FC 8024094C AFBF0018 */ sw $ra, 0x18($sp)
/* B66400 80240950 AFB00010 */ sw $s0, 0x10($sp)
/* B66404 80240954 8E300148 */ lw $s0, 0x148($s1)
/* B66408 80240958 0C00EABB */ jal get_npc_unsafe
/* B6640C 8024095C 86040008 */ lh $a0, 8($s0)
/* B66410 80240960 3C054387 */ lui $a1, 0x4387
/* B66414 80240964 0040202D */ daddu $a0, $v0, $zero
/* B66418 80240968 0C00ECD0 */ jal set_npc_yaw
/* B6641C 8024096C A480008E */ sh $zero, 0x8e($a0)
/* B66420 80240970 24020003 */ addiu $v0, $zero, 3
/* B66424 80240974 AE00006C */ sw $zero, 0x6c($s0)
/* B66428 80240978 AE220070 */ sw $v0, 0x70($s1)
/* B6642C 8024097C 8FBF0018 */ lw $ra, 0x18($sp)
/* B66430 80240980 8FB10014 */ lw $s1, 0x14($sp)
/* B66434 80240984 8FB00010 */ lw $s0, 0x10($sp)
/* B66438 80240988 03E00008 */ jr $ra
/* B6643C 8024098C 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
View File

@ -117,7 +117,7 @@ glabel func_80241424_B66ED4
/* B6707C 802415CC 00000000 */ nop
/* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero
/* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero
/* B67088 802415D8 0C090250 */ jal func_80240940_B663F0
/* B67088 802415D8 0C090250 */ jal UnkNpcAIFunc4
/* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero
/* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero
/* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero

24
asm/nonmatchings/world/area_jan/jan_12/B73570/func_802404C0_B73570.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802404C0_B73570
/* B73570 802404C0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B73574 802404C4 AFB10014 */ sw $s1, 0x14($sp)
/* B73578 802404C8 0080882D */ daddu $s1, $a0, $zero
/* B7357C 802404CC AFBF0018 */ sw $ra, 0x18($sp)
/* B73580 802404D0 AFB00010 */ sw $s0, 0x10($sp)
/* B73584 802404D4 8E300148 */ lw $s0, 0x148($s1)
/* B73588 802404D8 0C00EABB */ jal get_npc_unsafe
/* B7358C 802404DC 86040008 */ lh $a0, 8($s0)
/* B73590 802404E0 3C054387 */ lui $a1, 0x4387
/* B73594 802404E4 0040202D */ daddu $a0, $v0, $zero
/* B73598 802404E8 0C00ECD0 */ jal set_npc_yaw
/* B7359C 802404EC A480008E */ sh $zero, 0x8e($a0)
/* B735A0 802404F0 24020003 */ addiu $v0, $zero, 3
/* B735A4 802404F4 AE00006C */ sw $zero, 0x6c($s0)
/* B735A8 802404F8 AE220070 */ sw $v0, 0x70($s1)
/* B735AC 802404FC 8FBF0018 */ lw $ra, 0x18($sp)
/* B735B0 80240500 8FB10014 */ lw $s1, 0x14($sp)
/* B735B4 80240504 8FB00010 */ lw $s0, 0x10($sp)
/* B735B8 80240508 03E00008 */ jr $ra
/* B735BC 8024050C 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
View File

@ -117,7 +117,7 @@ glabel func_80240FA4_B74054
/* B741FC 8024114C 00000000 */ nop
/* B74200 80241150 0240202D */ daddu $a0, $s2, $zero
/* B74204 80241154 0260282D */ daddu $a1, $s3, $zero
/* B74208 80241158 0C090130 */ jal func_802404C0_B73570
/* B74208 80241158 0C090130 */ jal UnkNpcAIFunc4
/* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero
/* B74210 80241160 0240202D */ daddu $a0, $s2, $zero
/* B74214 80241164 0260282D */ daddu $a1, $s3, $zero

24
asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024056C_DB282C.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024056C_DB282C
/* DB282C 8024056C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* DB2830 80240570 AFB10014 */ sw $s1, 0x14($sp)
/* DB2834 80240574 0080882D */ daddu $s1, $a0, $zero
/* DB2838 80240578 AFBF0018 */ sw $ra, 0x18($sp)
/* DB283C 8024057C AFB00010 */ sw $s0, 0x10($sp)
/* DB2840 80240580 8E300148 */ lw $s0, 0x148($s1)
/* DB2844 80240584 0C00EABB */ jal get_npc_unsafe
/* DB2848 80240588 86040008 */ lh $a0, 8($s0)
/* DB284C 8024058C 3C054387 */ lui $a1, 0x4387
/* DB2850 80240590 0040202D */ daddu $a0, $v0, $zero
/* DB2854 80240594 0C00ECD0 */ jal set_npc_yaw
/* DB2858 80240598 A480008E */ sh $zero, 0x8e($a0)
/* DB285C 8024059C 24020003 */ addiu $v0, $zero, 3
/* DB2860 802405A0 AE00006C */ sw $zero, 0x6c($s0)
/* DB2864 802405A4 AE220070 */ sw $v0, 0x70($s1)
/* DB2868 802405A8 8FBF0018 */ lw $ra, 0x18($sp)
/* DB286C 802405AC 8FB10014 */ lw $s1, 0x14($sp)
/* DB2870 802405B0 8FB00010 */ lw $s0, 0x10($sp)
/* DB2874 802405B4 03E00008 */ jr $ra
/* DB2878 802405B8 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s
View File

@ -141,7 +141,7 @@ glabel func_80240780_DB2A40
/* DB2C48 80240988 00000000 */ nop
/* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero
/* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero
/* DB2C54 80240994 0C09015B */ jal func_8024056C_DB282C
/* DB2C54 80240994 0C09015B */ jal UnkNpcAIFunc4
/* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero
/* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero
/* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero

24
asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802407EC_DE2C7C
/* DE2C7C 802407EC 27BDFFE0 */ addiu $sp, $sp, -0x20
/* DE2C80 802407F0 AFB10014 */ sw $s1, 0x14($sp)
/* DE2C84 802407F4 0080882D */ daddu $s1, $a0, $zero
/* DE2C88 802407F8 AFBF0018 */ sw $ra, 0x18($sp)
/* DE2C8C 802407FC AFB00010 */ sw $s0, 0x10($sp)
/* DE2C90 80240800 8E300148 */ lw $s0, 0x148($s1)
/* DE2C94 80240804 0C00EABB */ jal get_npc_unsafe
/* DE2C98 80240808 86040008 */ lh $a0, 8($s0)
/* DE2C9C 8024080C 3C054387 */ lui $a1, 0x4387
/* DE2CA0 80240810 0040202D */ daddu $a0, $v0, $zero
/* DE2CA4 80240814 0C00ECD0 */ jal set_npc_yaw
/* DE2CA8 80240818 A480008E */ sh $zero, 0x8e($a0)
/* DE2CAC 8024081C 24020003 */ addiu $v0, $zero, 3
/* DE2CB0 80240820 AE00006C */ sw $zero, 0x6c($s0)
/* DE2CB4 80240824 AE220070 */ sw $v0, 0x70($s1)
/* DE2CB8 80240828 8FBF0018 */ lw $ra, 0x18($sp)
/* DE2CBC 8024082C 8FB10014 */ lw $s1, 0x14($sp)
/* DE2CC0 80240830 8FB00010 */ lw $s0, 0x10($sp)
/* DE2CC4 80240834 03E00008 */ jr $ra
/* DE2CC8 80240838 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s
View File

@ -141,7 +141,7 @@ glabel func_80240A00_DE2E90
/* DE3098 80240C08 00000000 */ nop
/* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero
/* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero
/* DE30A4 80240C14 0C0901FB */ jal func_802407EC_DE2C7C
/* DE30A4 80240C14 0C0901FB */ jal UnkNpcAIFunc4
/* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero
/* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero
/* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero

24
asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240ACC_DEF96C.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240ACC_DEF96C
/* DEF96C 80240ACC 27BDFFE0 */ addiu $sp, $sp, -0x20
/* DEF970 80240AD0 AFB10014 */ sw $s1, 0x14($sp)
/* DEF974 80240AD4 0080882D */ daddu $s1, $a0, $zero
/* DEF978 80240AD8 AFBF0018 */ sw $ra, 0x18($sp)
/* DEF97C 80240ADC AFB00010 */ sw $s0, 0x10($sp)
/* DEF980 80240AE0 8E300148 */ lw $s0, 0x148($s1)
/* DEF984 80240AE4 0C00EABB */ jal get_npc_unsafe
/* DEF988 80240AE8 86040008 */ lh $a0, 8($s0)
/* DEF98C 80240AEC 3C054387 */ lui $a1, 0x4387
/* DEF990 80240AF0 0040202D */ daddu $a0, $v0, $zero
/* DEF994 80240AF4 0C00ECD0 */ jal set_npc_yaw
/* DEF998 80240AF8 A480008E */ sh $zero, 0x8e($a0)
/* DEF99C 80240AFC 24020003 */ addiu $v0, $zero, 3
/* DEF9A0 80240B00 AE00006C */ sw $zero, 0x6c($s0)
/* DEF9A4 80240B04 AE220070 */ sw $v0, 0x70($s1)
/* DEF9A8 80240B08 8FBF0018 */ lw $ra, 0x18($sp)
/* DEF9AC 80240B0C 8FB10014 */ lw $s1, 0x14($sp)
/* DEF9B0 80240B10 8FB00010 */ lw $s0, 0x10($sp)
/* DEF9B4 80240B14 03E00008 */ jr $ra
/* DEF9B8 80240B18 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s
View File

@ -141,7 +141,7 @@ glabel func_80240CE0_DEFB80
/* DEFD88 80240EE8 00000000 */ nop
/* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero
/* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero
/* DEFD94 80240EF4 0C0902B3 */ jal func_80240ACC_DEF96C
/* DEFD94 80240EF4 0C0902B3 */ jal UnkNpcAIFunc4
/* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero
/* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero
/* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero

12
src/world/area_jan/jan_05/B4B260.c
View File

@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150_B4BBC0);
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241494_B4BF04);
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802416B8_B4C128);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178);
@ -40,5 +40,11 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C_B4CC0C);
#include "world/common/SomeMatrixOperations.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024268C_B4D0FC);
ApiStatus func_8024268C_B4D0FC(ScriptInstance* script) {
if (get_enemy_safe(0) == NULL) {
script->varTable[0] = FALSE;
} else {
script->varTable[0] = TRUE;
}
return ApiStatus_DONE2;
}

2
src/world/area_jan/jan_06/B52F70.c
View File

@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241330_B53B60);
INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241554_B53D84);
INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241608_B53E38);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88);

2
src/world/area_jan/jan_07/B59870.c
View File

@ -1,6 +1,6 @@
#include "jan_07.h"
INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240000_B59870);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0);

2
src/world/area_jan/jan_08/B5F650.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802413A0_B5F650);
INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241454_B5F704);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754);

2
src/world/area_jan/jan_09/B663F0.c
View File

@ -1,6 +1,6 @@
#include "jan_09.h"
INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240940_B663F0);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440);

2
src/world/area_jan/jan_12/B73570.c
View File

@ -1,6 +1,6 @@
#include "jan_12.h"
INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802404C0_B73570);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0);

2
src/world/area_omo/omo_05/DB22C0.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802401D8_DB2498);
INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240238_DB24F8);
INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_8024056C_DB282C);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802405BC_DB287C);

2
src/world/area_omo/omo_13/DE2710.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240458_DE28E8);
INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802404B8_DE2948);
INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802407EC_DE2C7C);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_8024083C_DE2CCC);

2
src/world/area_omo/omo_17/DEF400.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240738_DEF5D8);
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240798_DEF638);
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240ACC_DEF96C);
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240B1C_DEF9BC);

12
src/world/common/UnkNpcAIFunc4.inc.c Normal file
View File

@ -0,0 +1,12 @@
#include "common.h"
#include "map.h"
static void UnkNpcAIFunc4(ScriptInstance* script) {
Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID);
npc->duration = 0;
set_npc_yaw(npc, 270.0f);
enemy->varTable[0] = 0;
script->functionTemp[0].s = 3;
}

2
tools/assist.py
View File

@ -192,7 +192,7 @@ def do_cross_query():
for sym_name in map_syms:
if not sym_name.startswith("_binary"):
sym = map_syms[sym_name]
if get_symbol_length(sym_name) > 8:
if get_symbol_length(sym_name) > 16:
query_bytes = get_symbol_bytes(map_offsets, sym_name)
cluster_match = False
for cluster in clusters: