diff --git a/include/REL/modeseldll.h b/include/REL/modeseldll.h index 4100ea20..8e2f16e5 100644 --- a/include/REL/modeseldll.h +++ b/include/REL/modeseldll.h @@ -27,7 +27,9 @@ typedef struct datalist_sprite { GXColor color; } DataListSprite; -// void fn_1_1EC0(s16 view); +#ifndef __MWERKS__ +void fn_1_1EC0(s16 view); +#endif s32 fn_1_2490(void); s32 fn_1_37DC(void); diff --git a/include/game/gamework_data.h b/include/game/gamework_data.h index 87033ede..5cfb1bbd 100644 --- a/include/game/gamework_data.h +++ b/include/game/gamework_data.h @@ -197,7 +197,6 @@ static inline void GWRumbleSet(s32 value) { GWGameStat.rumble = value; if (value == 0) { - // TODO PC: get rumble working HuPadRumbleAllStop(); } } diff --git a/src/REL/modeseldll/datalist.c b/src/REL/modeseldll/datalist.c index 87287bed..afd55ec3 100644 --- a/src/REL/modeseldll/datalist.c +++ b/src/REL/modeseldll/datalist.c @@ -1,5 +1,9 @@ #include "REL/modeseldll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + s16 lbl_1_bss_19A[24]; s16 lbl_1_bss_16A[24]; s16 lbl_1_bss_152[12]; diff --git a/src/REL/modeseldll/filesel.c b/src/REL/modeseldll/filesel.c index 1ddd44cf..43781e7e 100644 --- a/src/REL/modeseldll/filesel.c +++ b/src/REL/modeseldll/filesel.c @@ -14,8 +14,11 @@ #include "REL/modeseldll.h" +s32 msmSysGetOutputMode(void); + #ifndef __MWERKS__ #include "game/esprite.h" +#include "game/hsfex.h" #endif s16 lbl_1_data_100 = -1; diff --git a/src/REL/modeseldll/main.c b/src/REL/modeseldll/main.c index 90c2684d..343293c3 100644 --- a/src/REL/modeseldll/main.c +++ b/src/REL/modeseldll/main.c @@ -1,6 +1,7 @@ #include "REL/modeseldll.h" #include "ext_math.h" #include "game/audio.h" +#include "game/board/ui.h" #include "game/esprite.h" #include "game/gamework_data.h" #include "game/hsfman.h" @@ -106,6 +107,7 @@ void fn_1_414(void) HuWinAllKill(); HuWinInit(1); #endif +#ifdef __MWERKS__ grpId = HuSprGrpCreate(1); sprId = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0); HuSprGrpMemberSet(grpId, 0, sprId); @@ -119,6 +121,7 @@ void fn_1_414(void) } HuTHPClose(); HuSprGrpKill(grpId); +#endif } } espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF); diff --git a/src/game/objdll.c b/src/game/objdll.c index 467032ef..4ba3a938 100644 --- a/src/game/objdll.c +++ b/src/game/objdll.c @@ -36,7 +36,6 @@ s32 omDLLStart(s16 overlay, s16 flag) if(dllno >= 0 && !flag) { omDllData *dll = omDLLinfoTbl[dllno]; #ifdef TARGET_PC - // TODO PC OSReport("objdll>Already Loaded %s\n", dll->name); #else OSReport("objdll>Already Loaded %s(%08x %08x)\n", dll->name, dll->module, dll->bss); diff --git a/src/game/window.c b/src/game/window.c index 8846f8f5..5d5cd0b0 100644 --- a/src/game/window.c +++ b/src/game/window.c @@ -1313,8 +1313,6 @@ void HuWinMesRead(s32 mess_data_no) void HuWinMesSet(s16 window, u32 mess) { -#ifdef __MWERKS__ - // TODO PC WindowData *window_ptr = &winData[window]; window_ptr->stat = 1; @@ -1341,13 +1339,10 @@ void HuWinMesSet(s16 window, u32 mess) window_ptr->mess_time = 0; #endif } -#endif } void HuWinInsertMesSet(s16 window, u32 mess, s16 index) { -#ifdef __MWERKS__ - // TODO PC WindowData *window_ptr = &winData[window]; if (!(mess & 0x80000000)) { @@ -1363,7 +1358,6 @@ void HuWinInsertMesSet(s16 window, u32 mess, s16 index) else { window_ptr->insert_mess[index] = (u8 *)mess; } -#endif } s16 HuWinChoiceGet(s16 window, s16 start_choice) @@ -1668,8 +1662,6 @@ void HuWinMesMaxSizeBetGet(float *size, u32 start, u32 end) static void GetMesMaxSizeSub(u32 mess) { -#ifdef __MWERKS__ - // TODO PC s16 line_h; s16 char_w; s16 line_w; @@ -1773,7 +1765,6 @@ static void GetMesMaxSizeSub(u32 mess) if (winMaxHeight < line_h) { winMaxHeight = line_h; } -#endif } static s32 GetMesMaxSizeSub2(WindowData *window, u8 *mess_data) diff --git a/src/game/wipe.c b/src/game/wipe.c index 919ff550..9ed4ffa3 100644 --- a/src/game/wipe.c +++ b/src/game/wipe.c @@ -111,11 +111,9 @@ void WipeExecAlways(void) void WipeCreate(s16 mode, s16 type, s16 duration) { WipeState *wipe; -#ifdef __MWERKS__ // TODO PC if(_CheckFlag(FLAG_ID_MAKE(1, 11)) && boardTutorialF) { return; } -#endif wipe = &wipeData; if(wipe->stat) { return;