pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

PR comments

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-25 18:50:22 -05:00
parent 32885019c7
commit 36113303d9
10 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/common/UnkDurationCheck.inc.c
View File

@ -5,7 +5,7 @@ static void UnkDurationCheck(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) <= 0) {
if (npc->duration <= 0) {
script->functionTemp[0].s = 0;
}
}

2
src/world/common/UnkNpcAIFunc10.inc.c
View File

@ -5,7 +5,7 @@ static void UnkNpcAIFunc10(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) == 0) {
if (npc->duration == 0) {
script->functionTemp[0].s = 15;
}
}

2
src/world/common/UnkNpcAIFunc11.inc.c
View File

@ -16,7 +16,7 @@ static void UnkNpcAIFunc11(ScriptInstance* script, NpcAISettings* aiSettings, s3
npc_move_heading(npc, npc->moveSpeed, npc->yaw);
func_8003D660(npc, 1);
npc->duration--;
if ((npc->duration << 0x10) == 0) {
if (npc->duration == 0) {
script->functionTemp[0].s = 12;
}
}

2
src/world/common/UnkNpcAIFunc3.inc.c
View File

@ -4,7 +4,7 @@
static void UnkNpcAIFunc3(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
if ((npc->duration <= 0) || ((--npc->duration << 0x10) <= 0)) {
if ((npc->duration <= 0) || (--npc->duration <= 0)) {
if (npc->unk_8C == 0) {
npc->duration = 0;
script->functionTemp[0].s = 14;

2
src/world/common/UnkNpcAIFunc5.inc.c
View File

@ -6,7 +6,7 @@ static void UnkNpcAIFunc5(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) <= 0) {
if (npc->duration <= 0) {
enemy->varTable[0] = 0;
script->functionTemp[0].s = 12;
}

2
src/world/common/UnkNpcAIFunc7.inc.c
View File

@ -6,7 +6,7 @@ static void UnkNpcAIFunc7(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) <= 0) {
if (npc->duration <= 0) {
enemy->varTable[0] = 3;
npc->duration = enemy->varTable[2];
npc->currentAnim = enemy->animList[9];

2
src/world/common/UnkNpcAIFunc8.inc.c
View File

@ -6,7 +6,7 @@ static void UnkNpcAIFunc8(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) <= 0) {
if (npc->duration <= 0) {
enemy->varTable[0] = 4;
npc->currentAnim = enemy->animList[0];
npc->duration = enemy->varTable[3];

2
src/world/common/UnkNpcDurationFlagFunc.inc.c
View File

@ -6,7 +6,7 @@ static void UnkNpcDurationFlagFunc(ScriptInstance* script) {
Npc* npc = get_npc_unsafe(enemy->npcID);
npc->duration--;
if ((npc->duration << 0x10) == 0) {
if (npc->duration == 0) {
if (enemy->unk_B0 & 0x80) {
script->functionTemp[0].s = 15;
} else {

1
src/world/common/set_script_owner_npc_anim.inc.c
View File

@ -1,4 +1,5 @@
#include "common.h"
#include "map.h"
static void set_script_owner_npc_anim(ScriptInstance* script) {
Enemy* enemy = script->owner1.enemy;

1
src/world/common/set_script_owner_npc_col_height.inc.c
View File

@ -1,4 +1,5 @@
#include "common.h"
#include "map.h"
static void set_script_owner_npc_col_height(ScriptInstance* script) {
Enemy* enemy = script->owner1.enemy;