diff --git a/configure.py b/configure.py index 1f409a3..eaeb3a7 100755 --- a/configure.py +++ b/configure.py @@ -44,7 +44,7 @@ TOOLS_DIR = ROOT / "tools" CROSS = "mips-ps2-decompals-" COMPILER = "mwcps2-3.0b52-030722" -COMPILER_FLAGS = "-O3,p -sym on -str readonly -cwd source" +COMPILER_FLAGS = "-O4,p -sym on -str readonly -cwd source -inline deferred" PLATFORM = sys.platform == "darwin" and "macos" or "x86_64" WIBO = f"{TOOLS_DIR}/wibo-{PLATFORM}" diff --git a/src/cs4/Seimei/fslib/lib/FsFont.h b/src/cs4/Seimei/fslib/lib/FsFont.h index 30a3cf9..0dae1cd 100644 --- a/src/cs4/Seimei/fslib/lib/FsFont.h +++ b/src/cs4/Seimei/fslib/lib/FsFont.h @@ -2,5 +2,6 @@ #define FSFONT_H signed int FsFontSetTexBuf(signed int id /* r2 */, void * pTexFileBuf /* r2 */); +signed int FsFontSetScale(float x /* r29 */, float y /* r29 */); #endif // FSFONT_H diff --git a/src/cs4/Seimei/src/FrontEnd/FrontEnd_Card.h b/src/cs4/Seimei/src/FrontEnd/FrontEnd_Card.h new file mode 100644 index 0000000..df1743b --- /dev/null +++ b/src/cs4/Seimei/src/FrontEnd/FrontEnd_Card.h @@ -0,0 +1,6 @@ +#ifndef FRONTEND_CARD_H +#define FRONTEND_CARD_H + +void FECard_Action(float dt_ /* r20 */); + +#endif // FRONTEND_CARD_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/Game.c b/src/cs4/Seimei/src/Game.c index 278ab00..0dc4004 100644 --- a/src/cs4/Seimei/src/Game.c +++ b/src/cs4/Seimei/src/Game.c @@ -1,4 +1,8 @@ #include "Game.h" +#include "lib/FsFont.h" +#include "sfx/Sfx.h" +#include "sfx/SfxPostEffect.h" +#include "FrontEnd/FrontEnd_Card.h" #include "Camera.h" #include "Drama.h" #include "DrawOT.h" @@ -347,7 +351,7 @@ int GameLoop() { void *GetGameTexList() { return lpGameTexList; } -COLOR g_col = {127, 127, 127, 127}; +// COLOR g_col = {127, 127, 127, 127}; static void DrawGamePause(void) { u_short *lpMsg; @@ -370,7 +374,7 @@ static void DrawGamePause(void) { lpMdlPacketMem = MakeSpritePacketUseSpr((LPSP *)&SpData, lpMdlPacketMem); FontDrawBegin(0); - SetFontColor(g_col); + SetFontColor((COLOR){127, 127, 127, 127}); FsFontSetScale(1.5f, 1.5f); if ((lpMsg = (u_short *)KnMsgMng_GetMapNameMsg()) != NULL) { diff --git a/src/cs4/Seimei/src/sfx/Sfx.h b/src/cs4/Seimei/src/sfx/Sfx.h new file mode 100644 index 0000000..ad152d0 --- /dev/null +++ b/src/cs4/Seimei/src/sfx/Sfx.h @@ -0,0 +1,6 @@ +#ifndef SFX_H +#define SFX_H + +void SFX_Action(float sec_ /* r20 */); + +#endif // SFX_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/sfx/SfxPostEffect.h b/src/cs4/Seimei/src/sfx/SfxPostEffect.h new file mode 100644 index 0000000..e771c95 --- /dev/null +++ b/src/cs4/Seimei/src/sfx/SfxPostEffect.h @@ -0,0 +1,6 @@ +#ifndef SFXPOSTEFFECT_H +#define SFXPOSTEFFECT_H + +signed int SfxPostEffect_Action(float sec_ /* r29 */); + +#endif // SFXPOSTEFFECT_H \ No newline at end of file