Fixes, clearing TODOs

This commit is contained in:
dbalatoni13 2025-04-12 22:43:29 +02:00
parent 176f6f9638
commit ada77fe830
8 changed files with 13 additions and 14 deletions

View file

@ -27,7 +27,9 @@ typedef struct datalist_sprite {
GXColor color; GXColor color;
} DataListSprite; } DataListSprite;
// void fn_1_1EC0(s16 view); #ifndef __MWERKS__
void fn_1_1EC0(s16 view);
#endif
s32 fn_1_2490(void); s32 fn_1_2490(void);
s32 fn_1_37DC(void); s32 fn_1_37DC(void);

View file

@ -197,7 +197,6 @@ static inline void GWRumbleSet(s32 value)
{ {
GWGameStat.rumble = value; GWGameStat.rumble = value;
if (value == 0) { if (value == 0) {
// TODO PC: get rumble working
HuPadRumbleAllStop(); HuPadRumbleAllStop();
} }
} }

View file

@ -1,5 +1,9 @@
#include "REL/modeseldll.h" #include "REL/modeseldll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
s16 lbl_1_bss_19A[24]; s16 lbl_1_bss_19A[24];
s16 lbl_1_bss_16A[24]; s16 lbl_1_bss_16A[24];
s16 lbl_1_bss_152[12]; s16 lbl_1_bss_152[12];

View file

@ -14,8 +14,11 @@
#include "REL/modeseldll.h" #include "REL/modeseldll.h"
s32 msmSysGetOutputMode(void);
#ifndef __MWERKS__ #ifndef __MWERKS__
#include "game/esprite.h" #include "game/esprite.h"
#include "game/hsfex.h"
#endif #endif
s16 lbl_1_data_100 = -1; s16 lbl_1_data_100 = -1;

View file

@ -1,6 +1,7 @@
#include "REL/modeseldll.h" #include "REL/modeseldll.h"
#include "ext_math.h" #include "ext_math.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/board/ui.h"
#include "game/esprite.h" #include "game/esprite.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfman.h" #include "game/hsfman.h"
@ -106,6 +107,7 @@ void fn_1_414(void)
HuWinAllKill(); HuWinAllKill();
HuWinInit(1); HuWinInit(1);
#endif #endif
#ifdef __MWERKS__
grpId = HuSprGrpCreate(1); grpId = HuSprGrpCreate(1);
sprId = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0); sprId = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0);
HuSprGrpMemberSet(grpId, 0, sprId); HuSprGrpMemberSet(grpId, 0, sprId);
@ -119,6 +121,7 @@ void fn_1_414(void)
} }
HuTHPClose(); HuTHPClose();
HuSprGrpKill(grpId); HuSprGrpKill(grpId);
#endif
} }
} }
espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF); espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF);

View file

@ -36,7 +36,6 @@ s32 omDLLStart(s16 overlay, s16 flag)
if(dllno >= 0 && !flag) { if(dllno >= 0 && !flag) {
omDllData *dll = omDLLinfoTbl[dllno]; omDllData *dll = omDLLinfoTbl[dllno];
#ifdef TARGET_PC #ifdef TARGET_PC
// TODO PC
OSReport("objdll>Already Loaded %s\n", dll->name); OSReport("objdll>Already Loaded %s\n", dll->name);
#else #else
OSReport("objdll>Already Loaded %s(%08x %08x)\n", dll->name, dll->module, dll->bss); OSReport("objdll>Already Loaded %s(%08x %08x)\n", dll->name, dll->module, dll->bss);

View file

@ -1313,8 +1313,6 @@ void HuWinMesRead(s32 mess_data_no)
void HuWinMesSet(s16 window, u32 mess) void HuWinMesSet(s16 window, u32 mess)
{ {
#ifdef __MWERKS__
// TODO PC
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
window_ptr->stat = 1; window_ptr->stat = 1;
@ -1341,13 +1339,10 @@ void HuWinMesSet(s16 window, u32 mess)
window_ptr->mess_time = 0; window_ptr->mess_time = 0;
#endif #endif
} }
#endif
} }
void HuWinInsertMesSet(s16 window, u32 mess, s16 index) void HuWinInsertMesSet(s16 window, u32 mess, s16 index)
{ {
#ifdef __MWERKS__
// TODO PC
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
if (!(mess & 0x80000000)) { if (!(mess & 0x80000000)) {
@ -1363,7 +1358,6 @@ void HuWinInsertMesSet(s16 window, u32 mess, s16 index)
else { else {
window_ptr->insert_mess[index] = (u8 *)mess; window_ptr->insert_mess[index] = (u8 *)mess;
} }
#endif
} }
s16 HuWinChoiceGet(s16 window, s16 start_choice) s16 HuWinChoiceGet(s16 window, s16 start_choice)
@ -1668,8 +1662,6 @@ void HuWinMesMaxSizeBetGet(float *size, u32 start, u32 end)
static void GetMesMaxSizeSub(u32 mess) static void GetMesMaxSizeSub(u32 mess)
{ {
#ifdef __MWERKS__
// TODO PC
s16 line_h; s16 line_h;
s16 char_w; s16 char_w;
s16 line_w; s16 line_w;
@ -1773,7 +1765,6 @@ static void GetMesMaxSizeSub(u32 mess)
if (winMaxHeight < line_h) { if (winMaxHeight < line_h) {
winMaxHeight = line_h; winMaxHeight = line_h;
} }
#endif
} }
static s32 GetMesMaxSizeSub2(WindowData *window, u8 *mess_data) static s32 GetMesMaxSizeSub2(WindowData *window, u8 *mess_data)

View file

@ -111,11 +111,9 @@ void WipeExecAlways(void)
void WipeCreate(s16 mode, s16 type, s16 duration) void WipeCreate(s16 mode, s16 type, s16 duration)
{ {
WipeState *wipe; WipeState *wipe;
#ifdef __MWERKS__ // TODO PC
if(_CheckFlag(FLAG_ID_MAKE(1, 11)) && boardTutorialF) { if(_CheckFlag(FLAG_ID_MAKE(1, 11)) && boardTutorialF) {
return; return;
} }
#endif
wipe = &wipeData; wipe = &wipeData;
if(wipe->stat) { if(wipe->stat) {
return; return;