diff --git a/src/REL/m403Dll/main.c b/src/REL/m403Dll/main.c index af675a31..1a6faa0c 100755 --- a/src/REL/m403Dll/main.c +++ b/src/REL/m403Dll/main.c @@ -18,6 +18,10 @@ #include "ext_math.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + typedef struct { /* 0x000 */ u8 unk00; /* 0x001 */ char unk01[3]; diff --git a/src/REL/m404Dll/main.c b/src/REL/m404Dll/main.c index e331d72f..ba9e9ca0 100644 --- a/src/REL/m404Dll/main.c +++ b/src/REL/m404Dll/main.c @@ -14,6 +14,11 @@ #include "string.h" #include "version.h" +#ifndef __MWERKS__ +#include "game/audio.h" +#include "game/esprite.h" +#endif + typedef struct UnkM404Struct { s16 unk_00; s16 unk_02[6]; diff --git a/src/REL/m408Dll/main.c b/src/REL/m408Dll/main.c index 7494d1eb..fa04e61a 100644 --- a/src/REL/m408Dll/main.c +++ b/src/REL/m408Dll/main.c @@ -19,6 +19,10 @@ #include "ext_math.h" #include "math.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + s32 lbl_1_data_0[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), DATA_MAKE_NUM(DATADIR_MGCONST, 0x01), diff --git a/src/REL/m409Dll/player.c b/src/REL/m409Dll/player.c index 26330990..9157deeb 100644 --- a/src/REL/m409Dll/player.c +++ b/src/REL/m409Dll/player.c @@ -9,6 +9,10 @@ #include "game/sprite.h" #include "ext_math.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + // bss omObjData *lbl_1_bss_3A0[4]; omObjData *lbl_1_bss_39C; diff --git a/src/REL/m410Dll/player.c b/src/REL/m410Dll/player.c index d4566bca..3286d2c0 100644 --- a/src/REL/m410Dll/player.c +++ b/src/REL/m410Dll/player.c @@ -11,6 +11,10 @@ #include "REL/m410Dll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + omObjData *lbl_1_bss_74; AnimData *lbl_1_bss_70; s32 lbl_1_bss_60[4]; @@ -141,8 +145,6 @@ void fn_1_7E30(Process *objman) void fn_1_806C(void) { - s32 var_lr; - HuSprAnimKill(lbl_1_bss_70); CharModelKill(-1); } diff --git a/src/REL/m427Dll/main.c b/src/REL/m427Dll/main.c index fdf0de2d..7031739f 100644 --- a/src/REL/m427Dll/main.c +++ b/src/REL/m427Dll/main.c @@ -10,6 +10,10 @@ #include "game/objsub.h" #include "game/wipe.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + typedef struct M427DllStruct2 { s32 unk0[3]; s32 unkC; diff --git a/src/REL/m434Dll/main.c b/src/REL/m434Dll/main.c index e13e8578..bfe8d0df 100644 --- a/src/REL/m434Dll/main.c +++ b/src/REL/m434Dll/main.c @@ -13,6 +13,10 @@ #include "math.h" #include "version.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + typedef struct camera_view { float zoom; Vec pos; diff --git a/src/REL/m444dll/datalist.c b/src/REL/m444dll/datalist.c index 3b4fbbaf..6d2e69f2 100644 --- a/src/REL/m444dll/datalist.c +++ b/src/REL/m444dll/datalist.c @@ -1,5 +1,9 @@ #include "REL/m444dll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + s16 lbl_1_bss_199C2[90]; s16 lbl_1_bss_1990E[90]; s16 lbl_1_bss_1990A[2]; @@ -177,4 +181,4 @@ void fn_1_D950(void) espKill(lbl_1_bss_1990A[i]); } } -} \ No newline at end of file +} diff --git a/src/REL/m455Dll/main.c b/src/REL/m455Dll/main.c index 667d1084..36c27f42 100644 --- a/src/REL/m455Dll/main.c +++ b/src/REL/m455Dll/main.c @@ -17,6 +17,10 @@ #include "ext_math.h" #include "math.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + typedef struct camera_view_params { float zoom; Vec pos; diff --git a/src/REL/modeseldll/filesel.c b/src/REL/modeseldll/filesel.c index 16712e88..1ddd44cf 100644 --- a/src/REL/modeseldll/filesel.c +++ b/src/REL/modeseldll/filesel.c @@ -14,6 +14,10 @@ #include "REL/modeseldll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + 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, 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, diff --git a/src/REL/resultDll/battle.c b/src/REL/resultDll/battle.c index 8baf9450..f9a58cba 100644 --- a/src/REL/resultDll/battle.c +++ b/src/REL/resultDll/battle.c @@ -19,6 +19,10 @@ #include "REL/resultdll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + #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 } }, diff --git a/src/REL/resultDll/datalist.c b/src/REL/resultDll/datalist.c index 1a37f8a0..5d747f30 100644 --- a/src/REL/resultDll/datalist.c +++ b/src/REL/resultDll/datalist.c @@ -1,5 +1,9 @@ #include "REL/resultdll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + s16 stageMdlId[32]; s16 stageMotId[32]; s16 stageSprId[33]; @@ -83,4 +87,4 @@ void StageSpriteKill(void) espKill(stageSprId[i]); } } -} \ No newline at end of file +} diff --git a/src/REL/resultDll/main.c b/src/REL/resultDll/main.c index 57433d33..84d801c9 100644 --- a/src/REL/resultDll/main.c +++ b/src/REL/resultDll/main.c @@ -18,6 +18,10 @@ #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 } }, { 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 } },