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

fixing format

This commit is contained in:
Ethan Roseman 2020-10-10 13:42:15 -04:00
parent 5a013f5579
commit 8490965da5
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common_structs.h
View File

@ -9,7 +9,6 @@ struct ScriptInstance;
typedef ApiStatus(*ApiFunc)(struct ScriptInstance*, s32); typedef ApiStatus(*ApiFunc)(struct ScriptInstance*, s32);
typedef struct Vec3f { typedef struct Vec3f {
/* 0x00 */ f32 x; /* 0x00 */ f32 x;
/* 0x04 */ f32 y; /* 0x04 */ f32 y;

3
include/si.h
View File

@ -2,9 +2,6 @@
#define _SI_H_ #define _SI_H_
#include "ultra64.h" #include "ultra64.h"
#include "types.h"
#include "macros.h"
#include "common_structs.h"
#define SI_VAR_0 0xFE363C80 #define SI_VAR_0 0xFE363C80

6
src/code_dbd70_len_700.c
View File

@ -51,9 +51,9 @@ s32 func_80145CE8(s32 arg0) {
for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) { for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) {
Trigger* trigger = (*gCurrentTriggerListPtr)[i]; Trigger* trigger = (*gCurrentTriggerListPtr)[i];
if ((trigger != NULL) && if ((trigger != NULL) &&
(trigger->unk_30 != 0) && (trigger->unk_30 != 0) &&
(trigger->params2 == arg0) && (trigger->params2 == arg0) &&
(trigger->flags.flags & 0x100)) { (trigger->flags.flags & 0x100)) {
return 1; return 1;
} }