Add missing esprite include with guard

This commit is contained in:
dbalatoni13 2025-04-01 06:53:16 +02:00
parent eb35233505
commit 6b41c9aa17
13 changed files with 55 additions and 4 deletions

View file

@ -18,6 +18,10 @@
#include "ext_math.h" #include "ext_math.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
typedef struct { typedef struct {
/* 0x000 */ u8 unk00; /* 0x000 */ u8 unk00;
/* 0x001 */ char unk01[3]; /* 0x001 */ char unk01[3];

View file

@ -14,6 +14,11 @@
#include "string.h" #include "string.h"
#include "version.h" #include "version.h"
#ifndef __MWERKS__
#include "game/audio.h"
#include "game/esprite.h"
#endif
typedef struct UnkM404Struct { typedef struct UnkM404Struct {
s16 unk_00; s16 unk_00;
s16 unk_02[6]; s16 unk_02[6];

View file

@ -19,6 +19,10 @@
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
s32 lbl_1_data_0[] = { s32 lbl_1_data_0[] = {
DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), DATA_MAKE_NUM(DATADIR_MGCONST, 0x00),
DATA_MAKE_NUM(DATADIR_MGCONST, 0x01), DATA_MAKE_NUM(DATADIR_MGCONST, 0x01),

View file

@ -9,6 +9,10 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "ext_math.h" #include "ext_math.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
// bss // bss
omObjData *lbl_1_bss_3A0[4]; omObjData *lbl_1_bss_3A0[4];
omObjData *lbl_1_bss_39C; omObjData *lbl_1_bss_39C;

View file

@ -11,6 +11,10 @@
#include "REL/m410Dll.h" #include "REL/m410Dll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
omObjData *lbl_1_bss_74; omObjData *lbl_1_bss_74;
AnimData *lbl_1_bss_70; AnimData *lbl_1_bss_70;
s32 lbl_1_bss_60[4]; s32 lbl_1_bss_60[4];
@ -141,8 +145,6 @@ void fn_1_7E30(Process *objman)
void fn_1_806C(void) void fn_1_806C(void)
{ {
s32 var_lr;
HuSprAnimKill(lbl_1_bss_70); HuSprAnimKill(lbl_1_bss_70);
CharModelKill(-1); CharModelKill(-1);
} }

View file

@ -10,6 +10,10 @@
#include "game/objsub.h" #include "game/objsub.h"
#include "game/wipe.h" #include "game/wipe.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
typedef struct M427DllStruct2 { typedef struct M427DllStruct2 {
s32 unk0[3]; s32 unk0[3];
s32 unkC; s32 unkC;

View file

@ -13,6 +13,10 @@
#include "math.h" #include "math.h"
#include "version.h" #include "version.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
typedef struct camera_view { typedef struct camera_view {
float zoom; float zoom;
Vec pos; Vec pos;

View file

@ -1,5 +1,9 @@
#include "REL/m444dll.h" #include "REL/m444dll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
s16 lbl_1_bss_199C2[90]; s16 lbl_1_bss_199C2[90];
s16 lbl_1_bss_1990E[90]; s16 lbl_1_bss_1990E[90];
s16 lbl_1_bss_1990A[2]; s16 lbl_1_bss_1990A[2];
@ -177,4 +181,4 @@ void fn_1_D950(void)
espKill(lbl_1_bss_1990A[i]); espKill(lbl_1_bss_1990A[i]);
} }
} }
} }

View file

@ -17,6 +17,10 @@
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
typedef struct camera_view_params { typedef struct camera_view_params {
float zoom; float zoom;
Vec pos; Vec pos;

View file

@ -14,6 +14,10 @@
#include "REL/modeseldll.h" #include "REL/modeseldll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
s16 lbl_1_data_100 = -1; s16 lbl_1_data_100 = -1;
float lbl_1_data_104[] = { -55, 0, 0, 0, 60, -57, 806, -71, 0, 0, 0, 100, -131, 900, -87, 0, 0, 0, 46, -117, 566, -87, 0, 0, 0, 46, -117, 566, -90, 0, float lbl_1_data_104[] = { -55, 0, 0, 0, 60, -57, 806, -71, 0, 0, 0, 100, -131, 900, -87, 0, 0, 0, 46, -117, 566, -87, 0, 0, 0, 46, -117, 566, -90, 0,
0, -22, 39, -153, 432, -40, 0, 0, 0, 130, -186, 6530, -23, 0, 0, -9, 1, -70, 1318, -25, 0, 0, 0, 242, 90, 343, -30, 0, 0, 0, 223, -60, 505, -23, 0, -22, 39, -153, 432, -40, 0, 0, 0, 130, -186, 6530, -23, 0, 0, -9, 1, -70, 1318, -25, 0, 0, 0, 242, 90, 343, -30, 0, 0, 0, 223, -60, 505, -23,

View file

@ -19,6 +19,10 @@
#include "REL/resultdll.h" #include "REL/resultdll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
#define COIN_EFFECT_MAX 180 #define COIN_EFFECT_MAX 180
static StageModel resultBattleModel[] = { { DATA_MAKE_NUM(DATADIR_RESULT, 0x08), 0, 0, -1, -1, { -300, 0, 0 }, { 0, 0, 0 }, { 0.9f, 0.9f, 0.9f } }, static StageModel resultBattleModel[] = { { DATA_MAKE_NUM(DATADIR_RESULT, 0x08), 0, 0, -1, -1, { -300, 0, 0 }, { 0, 0, 0 }, { 0.9f, 0.9f, 0.9f } },

View file

@ -1,5 +1,9 @@
#include "REL/resultdll.h" #include "REL/resultdll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
s16 stageMdlId[32]; s16 stageMdlId[32];
s16 stageMotId[32]; s16 stageMotId[32];
s16 stageSprId[33]; s16 stageSprId[33];
@ -83,4 +87,4 @@ void StageSpriteKill(void)
espKill(stageSprId[i]); espKill(stageSprId[i]);
} }
} }
} }

View file

@ -18,6 +18,10 @@
#include "REL/resultdll.h" #include "REL/resultdll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
static StageModel resultModel[] = { { DATA_MAKE_NUM(DATADIR_RESULT, 0x00), 1, 0, -1, -1, { 148, 132, 500 }, { 0, 0, 0 }, { 1, 1, 1 } }, static StageModel resultModel[] = { { DATA_MAKE_NUM(DATADIR_RESULT, 0x00), 1, 0, -1, -1, { 148, 132, 500 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ DATA_MAKE_NUM(DATADIR_RESULT, 0x01), 1, 0, -1, -1, { 148, 217, 500 }, { 0, 0, 0 }, { 1, 1, 1 } }, { DATA_MAKE_NUM(DATADIR_RESULT, 0x01), 1, 0, -1, -1, { 148, 217, 500 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ DATA_MAKE_NUM(DATADIR_RESULT, 0x02), 1, 0, -1, -1, { 148, 302, 500 }, { 0, 0, 0 }, { 1, 1, 1 } }, { DATA_MAKE_NUM(DATADIR_RESULT, 0x02), 1, 0, -1, -1, { 148, 302, 500 }, { 0, 0, 0 }, { 1, 1, 1 } },