From ba0d7ef58c2f110a87c04df08154272fbf565c72 Mon Sep 17 00:00:00 2001 From: dbalatoni13 <40299962+dbalatoni13@users.noreply.github.com> Date: Wed, 2 Apr 2025 00:41:07 +0200 Subject: [PATCH] Prototype fixes --- include/dolphin/demo/DEMOStats.h | 4 ++-- include/dolphin/vi.h | 1 + include/game/msm.h | 1 + include/game/sreset.h | 9 +++++++++ src/game/init.c | 5 ++++- src/game/main.c | 3 +++ 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 include/game/sreset.h diff --git a/include/dolphin/demo/DEMOStats.h b/include/dolphin/demo/DEMOStats.h index 92a61bf6..d9c29c93 100644 --- a/include/dolphin/demo/DEMOStats.h +++ b/include/dolphin/demo/DEMOStats.h @@ -29,10 +29,10 @@ typedef enum { DEMO_STAT_IO = 4 } DEMO_STAT_DISP; -extern unsigned char DemoStatEnable; - void DEMOSetStats(DemoStatData * stat, unsigned long nstats, DEMO_STAT_DISP disp); void DEMOUpdateStats(unsigned char inc); void DEMOPrintStats(void); +void DEMOUpdateStats(unsigned char inc); +void DEMOPrintStats(void); #endif diff --git a/include/dolphin/vi.h b/include/dolphin/vi.h index f503f4b5..da232cb2 100644 --- a/include/dolphin/vi.h +++ b/include/dolphin/vi.h @@ -15,6 +15,7 @@ u32 VIGetTvFormat(void); void VISetNextFrameBuffer(void* fb); void VIWaitForRetrace(void); void VISetBlack(BOOL black); +void VIConfigurePan(u16 xOrg, u16 yOrg, u16 width, u16 height); #ifdef TARGET_PC void VISetWindowTitle(const char* title); diff --git a/include/game/msm.h b/include/game/msm.h index e5106677..032b876c 100644 --- a/include/game/msm.h +++ b/include/game/msm.h @@ -185,6 +185,7 @@ int msmMusPlay(int musId, MSM_MUSPARAM *musParam); s32 msmMusStop(int musNo, s32 speed); void msmMusPauseAll(BOOL pause, s32 speed); s32 msmMusPause(int musNo, BOOL pause, s32 speed); +void msmMusFdoutEnd(void); s32 msmMusGetMidiCtrl(int musNo, s32 channel, s32 ctrl); void msmMusStopAll(BOOL checkGrp, s32 speed); s32 msmMusGetStatus(int musNo); diff --git a/include/game/sreset.h b/include/game/sreset.h new file mode 100644 index 00000000..caf8b15b --- /dev/null +++ b/include/game/sreset.h @@ -0,0 +1,9 @@ +#ifndef _GAME_SRESET_H +#define _GAME_SRESET_H + +#include "dolphin.h" + +s32 HuSoftResetButtonCheck(void); +void HuDvdErrDispInit(GXRenderModeObj *rmode, void *xfb1, void *xfb2); + +#endif diff --git a/src/game/init.c b/src/game/init.c index 61315c66..39e190f2 100644 --- a/src/game/init.c +++ b/src/game/init.c @@ -1,5 +1,8 @@ #include "game/init.h" +#include "game/memory.h" #include "game/fault.h" +#include "game/sreset.h" +#include "dolphin/demo/DEMOStats.h" #include "dolphin/os.h" #include "dolphin/gx.h" #include "dolphin/dvd.h" @@ -295,4 +298,4 @@ static void LoadMemInfo() DVDClose(&file); OSDumpHeap(__OSCurrHeap); } -} \ No newline at end of file +} diff --git a/src/game/main.c b/src/game/main.c index 59390f8b..4fc6c048 100644 --- a/src/game/main.c +++ b/src/game/main.c @@ -10,8 +10,11 @@ #include "game/sprite.h" #include "game/hsfformat.h" #include "game/hsfman.h" +#include "game/minigame_seq.h" +#include "game/msm.h" #include "game/perf.h" #include "game/gamework.h" +#include "game/sreset.h" extern FileListEntry _ovltbl[]; u32 GlobalCounter;