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

NpcJumpFunc3

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-22 15:26:38 -05:00
parent 8574e9b538
commit f96113fb7b
22 changed files with 26 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802415F8_8B1668
/* 8B1668 802415F8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8B166C 802415FC AFB00010 */ sw $s0, 0x10($sp)
/* 8B1670 80241600 0080802D */ daddu $s0, $a0, $zero
/* 8B1674 80241604 AFBF0014 */ sw $ra, 0x14($sp)
/* 8B1678 80241608 8E020148 */ lw $v0, 0x148($s0)
/* 8B167C 8024160C 0C00EABB */ jal get_npc_unsafe
/* 8B1680 80241610 84440008 */ lh $a0, 8($v0)
/* 8B1684 80241614 3C014120 */ lui $at, 0x4120
/* 8B1688 80241618 44810000 */ mtc1 $at, $f0
/* 8B168C 8024161C 3C014000 */ lui $at, 0x4000
/* 8B1690 80241620 44811000 */ mtc1 $at, $f2
/* 8B1694 80241624 8C430000 */ lw $v1, ($v0)
/* 8B1698 80241628 C444003C */ lwc1 $f4, 0x3c($v0)
/* 8B169C 8024162C 34630800 */ ori $v1, $v1, 0x800
/* 8B16A0 80241630 E440001C */ swc1 $f0, 0x1c($v0)
/* 8B16A4 80241634 E4420014 */ swc1 $f2, 0x14($v0)
/* 8B16A8 80241638 E4440064 */ swc1 $f4, 0x64($v0)
/* 8B16AC 8024163C AC430000 */ sw $v1, ($v0)
/* 8B16B0 80241640 2402000B */ addiu $v0, $zero, 0xb
/* 8B16B4 80241644 AE020070 */ sw $v0, 0x70($s0)
/* 8B16B8 80241648 8FBF0014 */ lw $ra, 0x14($sp)
/* 8B16BC 8024164C 8FB00010 */ lw $s0, 0x10($sp)
/* 8B16C0 80241650 03E00008 */ jr $ra
/* 8B16C4 80241654 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_80241C18_8B1C88
/* 8B1E3C 80241DCC 00000000 */ nop
/* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero
/* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero
/* 8B1E48 80241DD8 0C09057E */ jal func_802415F8_8B1668
/* 8B1E48 80241DD8 0C09057E */ jal NpcJumpFunc3
/* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero
/* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero
/* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero

28
asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802401D4_8D3F94
/* 8D3F94 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8D3F98 802401D8 AFB00010 */ sw $s0, 0x10($sp)
/* 8D3F9C 802401DC 0080802D */ daddu $s0, $a0, $zero
/* 8D3FA0 802401E0 AFBF0014 */ sw $ra, 0x14($sp)
/* 8D3FA4 802401E4 8E020148 */ lw $v0, 0x148($s0)
/* 8D3FA8 802401E8 0C00EABB */ jal get_npc_unsafe
/* 8D3FAC 802401EC 84440008 */ lh $a0, 8($v0)
/* 8D3FB0 802401F0 3C014120 */ lui $at, 0x4120
/* 8D3FB4 802401F4 44810000 */ mtc1 $at, $f0
/* 8D3FB8 802401F8 3C014000 */ lui $at, 0x4000
/* 8D3FBC 802401FC 44811000 */ mtc1 $at, $f2
/* 8D3FC0 80240200 8C430000 */ lw $v1, ($v0)
/* 8D3FC4 80240204 C444003C */ lwc1 $f4, 0x3c($v0)
/* 8D3FC8 80240208 34630800 */ ori $v1, $v1, 0x800
/* 8D3FCC 8024020C E440001C */ swc1 $f0, 0x1c($v0)
/* 8D3FD0 80240210 E4420014 */ swc1 $f2, 0x14($v0)
/* 8D3FD4 80240214 E4440064 */ swc1 $f4, 0x64($v0)
/* 8D3FD8 80240218 AC430000 */ sw $v1, ($v0)
/* 8D3FDC 8024021C 2402000B */ addiu $v0, $zero, 0xb
/* 8D3FE0 80240220 AE020070 */ sw $v0, 0x70($s0)
/* 8D3FE4 80240224 8FBF0014 */ lw $ra, 0x14($sp)
/* 8D3FE8 80240228 8FB00010 */ lw $s0, 0x10($sp)
/* 8D3FEC 8024022C 03E00008 */ jr $ra
/* 8D3FF0 80240230 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_802407F4_8D45B4
/* 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
/* 8D4774 802409B4 0C090075 */ jal NpcJumpFunc3
/* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero
/* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero
/* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero

28
asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240544_8DA644
/* 8DA644 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8DA648 80240548 AFB00010 */ sw $s0, 0x10($sp)
/* 8DA64C 8024054C 0080802D */ daddu $s0, $a0, $zero
/* 8DA650 80240550 AFBF0014 */ sw $ra, 0x14($sp)
/* 8DA654 80240554 8E020148 */ lw $v0, 0x148($s0)
/* 8DA658 80240558 0C00EABB */ jal get_npc_unsafe
/* 8DA65C 8024055C 84440008 */ lh $a0, 8($v0)
/* 8DA660 80240560 3C014120 */ lui $at, 0x4120
/* 8DA664 80240564 44810000 */ mtc1 $at, $f0
/* 8DA668 80240568 3C014000 */ lui $at, 0x4000
/* 8DA66C 8024056C 44811000 */ mtc1 $at, $f2
/* 8DA670 80240570 8C430000 */ lw $v1, ($v0)
/* 8DA674 80240574 C444003C */ lwc1 $f4, 0x3c($v0)
/* 8DA678 80240578 34630800 */ ori $v1, $v1, 0x800
/* 8DA67C 8024057C E440001C */ swc1 $f0, 0x1c($v0)
/* 8DA680 80240580 E4420014 */ swc1 $f2, 0x14($v0)
/* 8DA684 80240584 E4440064 */ swc1 $f4, 0x64($v0)
/* 8DA688 80240588 AC430000 */ sw $v1, ($v0)
/* 8DA68C 8024058C 2402000B */ addiu $v0, $zero, 0xb
/* 8DA690 80240590 AE020070 */ sw $v0, 0x70($s0)
/* 8DA694 80240594 8FBF0014 */ lw $ra, 0x14($sp)
/* 8DA698 80240598 8FB00010 */ lw $s0, 0x10($sp)
/* 8DA69C 8024059C 03E00008 */ jr $ra
/* 8DA6A0 802405A0 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_80240B64_8DAC64
/* 8DAE18 80240D18 00000000 */ nop
/* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero
/* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero
/* 8DAE24 80240D24 0C090151 */ jal func_80240544_8DA644
/* 8DAE24 80240D24 0C090151 */ jal NpcJumpFunc3
/* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero
/* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero
/* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero

28
asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802401D4_9C55B4.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802401D4_9C55B4
/* 9C55B4 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 9C55B8 802401D8 AFB00010 */ sw $s0, 0x10($sp)
/* 9C55BC 802401DC 0080802D */ daddu $s0, $a0, $zero
/* 9C55C0 802401E0 AFBF0014 */ sw $ra, 0x14($sp)
/* 9C55C4 802401E4 8E020148 */ lw $v0, 0x148($s0)
/* 9C55C8 802401E8 0C00EABB */ jal get_npc_unsafe
/* 9C55CC 802401EC 84440008 */ lh $a0, 8($v0)
/* 9C55D0 802401F0 3C014120 */ lui $at, 0x4120
/* 9C55D4 802401F4 44810000 */ mtc1 $at, $f0
/* 9C55D8 802401F8 3C014000 */ lui $at, 0x4000
/* 9C55DC 802401FC 44811000 */ mtc1 $at, $f2
/* 9C55E0 80240200 8C430000 */ lw $v1, ($v0)
/* 9C55E4 80240204 C444003C */ lwc1 $f4, 0x3c($v0)
/* 9C55E8 80240208 34630800 */ ori $v1, $v1, 0x800
/* 9C55EC 8024020C E440001C */ swc1 $f0, 0x1c($v0)
/* 9C55F0 80240210 E4420014 */ swc1 $f2, 0x14($v0)
/* 9C55F4 80240214 E4440064 */ swc1 $f4, 0x64($v0)
/* 9C55F8 80240218 AC430000 */ sw $v1, ($v0)
/* 9C55FC 8024021C 2402000B */ addiu $v0, $zero, 0xb
/* 9C5600 80240220 AE020070 */ sw $v0, 0x70($s0)
/* 9C5604 80240224 8FBF0014 */ lw $ra, 0x14($sp)
/* 9C5608 80240228 8FB00010 */ lw $s0, 0x10($sp)
/* 9C560C 8024022C 03E00008 */ jr $ra
/* 9C5610 80240230 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_802407F4_9C5BD4
/* 9C5D88 802409A8 00000000 */ nop
/* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero
/* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero
/* 9C5D94 802409B4 0C090075 */ jal func_802401D4_9C55B4
/* 9C5D94 802409B4 0C090075 */ jal NpcJumpFunc3
/* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero
/* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero
/* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero

28
asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802410B0_D9E580.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802410B0_D9E580
/* D9E580 802410B0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D9E584 802410B4 AFB00010 */ sw $s0, 0x10($sp)
/* D9E588 802410B8 0080802D */ daddu $s0, $a0, $zero
/* D9E58C 802410BC AFBF0014 */ sw $ra, 0x14($sp)
/* D9E590 802410C0 8E020148 */ lw $v0, 0x148($s0)
/* D9E594 802410C4 0C00EABB */ jal get_npc_unsafe
/* D9E598 802410C8 84440008 */ lh $a0, 8($v0)
/* D9E59C 802410CC 3C014120 */ lui $at, 0x4120
/* D9E5A0 802410D0 44810000 */ mtc1 $at, $f0
/* D9E5A4 802410D4 3C014000 */ lui $at, 0x4000
/* D9E5A8 802410D8 44811000 */ mtc1 $at, $f2
/* D9E5AC 802410DC 8C430000 */ lw $v1, ($v0)
/* D9E5B0 802410E0 C444003C */ lwc1 $f4, 0x3c($v0)
/* D9E5B4 802410E4 34630800 */ ori $v1, $v1, 0x800
/* D9E5B8 802410E8 E440001C */ swc1 $f0, 0x1c($v0)
/* D9E5BC 802410EC E4420014 */ swc1 $f2, 0x14($v0)
/* D9E5C0 802410F0 E4440064 */ swc1 $f4, 0x64($v0)
/* D9E5C4 802410F4 AC430000 */ sw $v1, ($v0)
/* D9E5C8 802410F8 2402000B */ addiu $v0, $zero, 0xb
/* D9E5CC 802410FC AE020070 */ sw $v0, 0x70($s0)
/* D9E5D0 80241100 8FBF0014 */ lw $ra, 0x14($sp)
/* D9E5D4 80241104 8FB00010 */ lw $s0, 0x10($sp)
/* D9E5D8 80241108 03E00008 */ jr $ra
/* D9E5DC 8024110C 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_802416D0_D9EBA0
/* D9ED54 80241884 00000000 */ nop
/* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero
/* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero
/* D9ED60 80241890 0C09042C */ jal func_802410B0_D9E580
/* D9ED60 80241890 0C09042C */ jal NpcJumpFunc3
/* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero
/* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero
/* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero

28
asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240544_93FAF4.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240544_93FAF4
/* 93FAF4 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 93FAF8 80240548 AFB00010 */ sw $s0, 0x10($sp)
/* 93FAFC 8024054C 0080802D */ daddu $s0, $a0, $zero
/* 93FB00 80240550 AFBF0014 */ sw $ra, 0x14($sp)
/* 93FB04 80240554 8E020148 */ lw $v0, 0x148($s0)
/* 93FB08 80240558 0C00EABB */ jal get_npc_unsafe
/* 93FB0C 8024055C 84440008 */ lh $a0, 8($v0)
/* 93FB10 80240560 3C014120 */ lui $at, 0x4120
/* 93FB14 80240564 44810000 */ mtc1 $at, $f0
/* 93FB18 80240568 3C014000 */ lui $at, 0x4000
/* 93FB1C 8024056C 44811000 */ mtc1 $at, $f2
/* 93FB20 80240570 8C430000 */ lw $v1, ($v0)
/* 93FB24 80240574 C444003C */ lwc1 $f4, 0x3c($v0)
/* 93FB28 80240578 34630800 */ ori $v1, $v1, 0x800
/* 93FB2C 8024057C E440001C */ swc1 $f0, 0x1c($v0)
/* 93FB30 80240580 E4420014 */ swc1 $f2, 0x14($v0)
/* 93FB34 80240584 E4440064 */ swc1 $f4, 0x64($v0)
/* 93FB38 80240588 AC430000 */ sw $v1, ($v0)
/* 93FB3C 8024058C 2402000B */ addiu $v0, $zero, 0xb
/* 93FB40 80240590 AE020070 */ sw $v0, 0x70($s0)
/* 93FB44 80240594 8FBF0014 */ lw $ra, 0x14($sp)
/* 93FB48 80240598 8FB00010 */ lw $s0, 0x10($sp)
/* 93FB4C 8024059C 03E00008 */ jr $ra
/* 93FB50 802405A0 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_80240B64_940114
/* 9402C8 80240D18 00000000 */ nop
/* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero
/* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero
/* 9402D4 80240D24 0C090151 */ jal func_80240544_93FAF4
/* 9402D4 80240D24 0C090151 */ jal NpcJumpFunc3
/* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero
/* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero
/* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero

28
asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s
View File

@ -1,28 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240D98_99D728
/* 99D728 80240D98 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 99D72C 80240D9C AFB00010 */ sw $s0, 0x10($sp)
/* 99D730 80240DA0 0080802D */ daddu $s0, $a0, $zero
/* 99D734 80240DA4 AFBF0014 */ sw $ra, 0x14($sp)
/* 99D738 80240DA8 8E020148 */ lw $v0, 0x148($s0)
/* 99D73C 80240DAC 0C00EABB */ jal get_npc_unsafe
/* 99D740 80240DB0 84440008 */ lh $a0, 8($v0)
/* 99D744 80240DB4 3C014120 */ lui $at, 0x4120
/* 99D748 80240DB8 44810000 */ mtc1 $at, $f0
/* 99D74C 80240DBC 3C014000 */ lui $at, 0x4000
/* 99D750 80240DC0 44811000 */ mtc1 $at, $f2
/* 99D754 80240DC4 8C430000 */ lw $v1, ($v0)
/* 99D758 80240DC8 C444003C */ lwc1 $f4, 0x3c($v0)
/* 99D75C 80240DCC 34630800 */ ori $v1, $v1, 0x800
/* 99D760 80240DD0 E440001C */ swc1 $f0, 0x1c($v0)
/* 99D764 80240DD4 E4420014 */ swc1 $f2, 0x14($v0)
/* 99D768 80240DD8 E4440064 */ swc1 $f4, 0x64($v0)
/* 99D76C 80240DDC AC430000 */ sw $v1, ($v0)
/* 99D770 80240DE0 2402000B */ addiu $v0, $zero, 0xb
/* 99D774 80240DE4 AE020070 */ sw $v0, 0x70($s0)
/* 99D778 80240DE8 8FBF0014 */ lw $ra, 0x14($sp)
/* 99D77C 80240DEC 8FB00010 */ lw $s0, 0x10($sp)
/* 99D780 80240DF0 03E00008 */ jr $ra
/* 99D784 80240DF4 27BD0018 */ addiu $sp, $sp, 0x18

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

@ -119,7 +119,7 @@ glabel func_802413B8_99DD48
/* 99DEFC 8024156C 00000000 */ nop
/* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero
/* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero
/* 99DF08 80241578 0C090366 */ jal func_80240D98_99D728
/* 99DF08 80241578 0C090366 */ jal NpcJumpFunc3
/* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero
/* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero
/* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero

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

@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424_8B1494);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802415F8_8B1668);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240000_8D3DC0);
INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74);
INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802401D4_8D3F94);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240370_8DA470);
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524);
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240544_8DA644);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240000_9C53E0);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802401D4_9C55B4);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240EDC_D9E3AC);
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460);
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802410B0_D9E580);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240370_93F920);
INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4);
INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240544_93FAF4);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240BC4_99D554);
INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608);
INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240D98_99D728);
# include "world/common/NpcJumpFunc3.inc.c"
# include "world/common/NpcJumpFunc.inc.c"

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

@ -0,0 +1,12 @@
#include "common.h"
#include "map.h"
static void NpcJumpFunc3(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
npc->jumpVelocity = 10.0f;
npc->jumpScale = 2.0f;
npc->moveToPos.y = npc->pos.y;
npc->flags |= 0x800;
script->functionTemp[0].s = 11;
}