falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

format

This commit is contained in:
Ethan Roseman 2020-11-22 11:41:22 -05:00
parent ccde4308bc
commit 9a9cc74ebb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/os/code_4ac90_len_3910.c
View File

@ -32,7 +32,8 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FDD0);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30);
INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32* arg8);
INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5,
f32 arg6, s32 arg7, s32* arg8);
INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4);

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

@ -1,7 +1,7 @@
#include "common.h"
#include "map.h"
static void UnkNpcAIFunc9(ScriptInstance *script) {
static void UnkNpcAIFunc9(ScriptInstance* script) {
Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);