diff --git a/src/cs4/Seimei/fslib/lib/FsFont.h b/src/cs4/Seimei/fslib/lib/FsFont.h index 0dae1cd..cfdeb5e 100644 --- a/src/cs4/Seimei/fslib/lib/FsFont.h +++ b/src/cs4/Seimei/fslib/lib/FsFont.h @@ -1,7 +1,8 @@ #ifndef FSFONT_H #define FSFONT_H -signed int FsFontSetTexBuf(signed int id /* r2 */, void * pTexFileBuf /* r2 */); -signed int FsFontSetScale(float x /* r29 */, float y /* r29 */); +int FsFontSetTexBuf(signed int id /* r2 */, void * pTexFileBuf /* r2 */); +int FsFontSetScale(float x /* r29 */, float y /* r29 */); +int FsFontGetSize(float * pWidth /* r2 */, float * pHeight /* r2 */, u_short * str /* r2 */, u_short lastCode /* r2 */); #endif // FSFONT_H diff --git a/src/cs4/Seimei/src/Anim.h b/src/cs4/Seimei/src/Anim.h new file mode 100644 index 0000000..122009f --- /dev/null +++ b/src/cs4/Seimei/src/Anim.h @@ -0,0 +1,7 @@ +#ifndef ANIM_H +#define ANIM_H +#include "common.h" +#include "Model.h" + +void PlayMi3(MDLMNG * lpMdlMng /* r16 */); +#endif // ANIM_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/Blast.h b/src/cs4/Seimei/src/Blast.h new file mode 100644 index 0000000..0708952 --- /dev/null +++ b/src/cs4/Seimei/src/Blast.h @@ -0,0 +1,8 @@ +#ifndef BLAST_H +#define BLAST_H +#include "common.h" + +void DrawPhantomFilter(); +void UpdateBlast(); +void InitBlast(); +#endif // BLAST_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/ClothSimulator.h b/src/cs4/Seimei/src/ClothSimulator.h index edb5a7f..bce6f6a 100644 --- a/src/cs4/Seimei/src/ClothSimulator.h +++ b/src/cs4/Seimei/src/ClothSimulator.h @@ -3,5 +3,7 @@ int CsMngInit(); int CsMngInitialize(); +int CsMngUpdate(); +int CsMngDraw(); #endif // CLOTH_SIMULATOR_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/Dizzy.h b/src/cs4/Seimei/src/Dizzy.h new file mode 100644 index 0000000..d118f25 --- /dev/null +++ b/src/cs4/Seimei/src/Dizzy.h @@ -0,0 +1,7 @@ +#ifndef DIZZY_H +#define DIZZY_H +void DrawDizzyFilter(); +void DrawDizzyMask(); +void DrawGameOver(); +void InitDizzyFilter(); +#endif // DIZZY_H diff --git a/src/cs4/Seimei/src/Fade.h b/src/cs4/Seimei/src/Fade.h index 0bf255a..9ef0eb4 100644 --- a/src/cs4/Seimei/src/Fade.h +++ b/src/cs4/Seimei/src/Fade.h @@ -1,9 +1,9 @@ #ifndef FADE_H #define FADE_H +#include "common.h" void InitFadeControl(); - void SetFadeMng(unsigned char Type, signed int * Col, signed int Timer, void (* lpMidFunc)(), void (* lpEndFunc)(), signed int OutEnd, signed int StartIn); +void UpdateFadeMng(); - -#endif // FADE_H \ No newline at end of file +#endif // FADE_H diff --git a/src/cs4/Seimei/src/File.h b/src/cs4/Seimei/src/File.h index e08a347..82acab5 100644 --- a/src/cs4/Seimei/src/File.h +++ b/src/cs4/Seimei/src/File.h @@ -10,5 +10,12 @@ void InitFileSystem(); void ReadRootPath(); unsigned char * GetRootPath(); void AfterFileReadFunc(u8 *lpAddr, s32 index, s32 fileType, s32 size); +int FileCheckAsyncBusy(void); +void FileBackReadControl(); +void FileReadControl(int bDraw); +int FileRead(char *filename /* r2 */, signed int size /* r2 */, + u_char **lpBuf /* r2 */, + u_char bSynch /* r2 */, int index /* r2 */, + int filetype /* r2 */, u_int align /* r2 */); #endif // FILE_H diff --git a/src/cs4/Seimei/src/Game.c b/src/cs4/Seimei/src/Game.c index 3c51a48..7ca5253 100644 --- a/src/cs4/Seimei/src/Game.c +++ b/src/cs4/Seimei/src/Game.c @@ -1,11 +1,11 @@ #include "Game.h" -#include "lib/FsFont.h" -#include "sfx/Sfx.h" -#include "sfx/SfxPostEffect.h" -#include "FrontEnd/FrontEnd_Card.h" +#include "Anim.h" +#include "Blast.h" #include "Camera.h" +#include "ClothSimulator.h" #include "Damage.h" #include "Debug.h" +#include "Dizzy.h" #include "Drama.h" #include "Draw.h" #include "DrawOT.h" @@ -13,23 +13,40 @@ #include "Ene.h" #include "EtcEvent.h" #include "Event.h" +#include "Fade.h" +#include "File.h" #include "Filter.h" #include "Font.h" #include "FrontEnd/FrontEnd_Card.h" #include "Hmd.h" #include "KuonMsg.h" #include "Main.h" +#include "Map.h" +#include "Mirror.h" #include "Model.h" #include "MovePath.h" +#include "My.h" #include "Object.h" #include "Pad.h" +#include "Peep.h" #include "PointLight.h" +#include "Riddle.h" +#include "SandEffect.h" +#include "Scene.h" +#include "Script.h" +#include "Sound/Snd.h" +#include "Sound/SndSq.h" #include "Spirit.h" #include "Sprite.h" #include "TexEffect.h" +#include "TmpMenu.h" #include "Unk.h" #include "common.h" #include "ee/eeregs.h" +#include "lib/FsFont.h" +#include "menu/KuonMenu.h" +#include "menu/MenuTD.h" +#include "sfx/Sfx.h" #include "sfx/SfxPostEffect.h" void *lpGameTexList; diff --git a/src/cs4/Seimei/src/Main.c b/src/cs4/Seimei/src/Main.c index 214138a..e2dc564 100644 --- a/src/cs4/Seimei/src/Main.c +++ b/src/cs4/Seimei/src/Main.c @@ -14,6 +14,7 @@ #include "String.h" #include "TexEffect.h" #include "Title.h" +#include "TmpMenu.h" #include "Unk.h" #include "common.h" #include "ee/eekernel.h" @@ -28,8 +29,6 @@ int GoToTitleFlag; sceVu0FVECTOR V0; GameState GameSt; -extern TMP_MENU_MNG_ST g_TmpMenuMng; - void SetGoToEndingFade(void) { SetFadeMng(1, (sceVu0IVECTOR){0}, 30, NULL, SetGoToEndingFlag, 0, 0); SND_RemoveSound(); diff --git a/src/cs4/Seimei/src/Model.h b/src/cs4/Seimei/src/Model.h index bea4f15..a2b43d3 100644 --- a/src/cs4/Seimei/src/Model.h +++ b/src/cs4/Seimei/src/Model.h @@ -1,7 +1,7 @@ #ifndef MODEL_H #define MODEL_H -#include "typedefs.h" +#include "common.h" typedef struct /* @anon17 */ { diff --git a/src/cs4/Seimei/src/Peep.h b/src/cs4/Seimei/src/Peep.h new file mode 100644 index 0000000..f1988d2 --- /dev/null +++ b/src/cs4/Seimei/src/Peep.h @@ -0,0 +1,6 @@ +#ifndef PEEP_H +#define PEEP_H +#include "common.h" + +void DrawPeepHole(); +#endif // PEEP_H diff --git a/src/cs4/Seimei/src/Riddle.h b/src/cs4/Seimei/src/Riddle.h new file mode 100644 index 0000000..08ea011 --- /dev/null +++ b/src/cs4/Seimei/src/Riddle.h @@ -0,0 +1,8 @@ +#ifndef RIDDLE_H +#define RIDDLE_H +#include "common.h" + + void CheckFreeRiddleData(); + void CheckRiddleFree(); + void PlayRiddle(); +#endif // RIDDLE_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/SandEffect.h b/src/cs4/Seimei/src/SandEffect.h new file mode 100644 index 0000000..1f8135d --- /dev/null +++ b/src/cs4/Seimei/src/SandEffect.h @@ -0,0 +1,7 @@ +#ifndef SAND_EFFECT_H +#define SAND_EFFECT_H +#include "common.h" + +void FreeSandEffect(); +void InitSandEffect(); +#endif // SAND_EFFECT_H diff --git a/src/cs4/Seimei/src/Scene.h b/src/cs4/Seimei/src/Scene.h index 4816075..7331d16 100644 --- a/src/cs4/Seimei/src/Scene.h +++ b/src/cs4/Seimei/src/Scene.h @@ -1,9 +1,12 @@ #ifndef SCENE_H #define SCENE_H +#include "common.h" unsigned char GetLoadMovieId(); void ClearLoadMovieId(); void FreeSceneData(); +u_int CheckSceneLoad(); +void SetLoadCamReserve(u_short CamId /* r2 */); #endif // SCENE_H diff --git a/src/cs4/Seimei/src/Script.h b/src/cs4/Seimei/src/Script.h index c8d97de..1c33e85 100644 --- a/src/cs4/Seimei/src/Script.h +++ b/src/cs4/Seimei/src/Script.h @@ -2,8 +2,8 @@ #define SCRIPT_H void ClearEventFlag(); - - - +void ScriptProc(); +int CheckEventFlag(int EventFlag /* r2 */); +void SetEventFlag(int EventFlag /* r2 */); #endif // SCRIPT_H diff --git a/src/cs4/Seimei/src/Sound/Snd.h b/src/cs4/Seimei/src/Sound/Snd.h index 3f5f02a..bac3f69 100644 --- a/src/cs4/Seimei/src/Sound/Snd.h +++ b/src/cs4/Seimei/src/Sound/Snd.h @@ -1,6 +1,7 @@ #ifndef SND_H #define SND_H +int SND_Update(); void SND_RemoveSound(); #endif //SND_H diff --git a/src/cs4/Seimei/src/Sound/SndSq.h b/src/cs4/Seimei/src/Sound/SndSq.h new file mode 100644 index 0000000..21de9e4 --- /dev/null +++ b/src/cs4/Seimei/src/Sound/SndSq.h @@ -0,0 +1,7 @@ +#ifndef SND_SQ_H +#define SND_SQ_H +#include "common.h" + +void SND_SqFadeStart(PORT port, FADE fade); +int SND_SqPlay(PORT port, int iBlockNum); +#endif // SND_SQ_H diff --git a/src/cs4/Seimei/src/Tex.h b/src/cs4/Seimei/src/Tex.h index 832c4c1..4d88758 100644 --- a/src/cs4/Seimei/src/Tex.h +++ b/src/cs4/Seimei/src/Tex.h @@ -52,7 +52,7 @@ typedef struct /* @anon25 */ } TEX1; // offset 0xD8, size 0x8 -// * GetTexMngByName(void * lpTexList /* r18 */, char * texname /* r17 */); +void ReadTexList(char * filename /* r2 */, void * * lplpBuf /* r2 */, signed int filetype /* r2 */, signed int index /* r2 */); #endif // TEX_H diff --git a/src/cs4/Seimei/src/TmpMenu.h b/src/cs4/Seimei/src/TmpMenu.h new file mode 100644 index 0000000..c56b9d4 --- /dev/null +++ b/src/cs4/Seimei/src/TmpMenu.h @@ -0,0 +1,27 @@ +#ifndef TMP_MENU_H +#define TMP_MENU_H +#include "common.h" +#include "Model.h" + +typedef enum { + TMP_MENU__UDDRAW_ORDER__ON = 0, + TMP_MENU__UDDRAW_ORDER__OFF = 1, + TMP_MENU__UDDRAW_ORDER__OFF_FORCE = 2, +} _TMP_MENU__UDDRAW_ORDER_EN; + +typedef struct _TMP_MENU_MNG_ST { + // Members + _MNG_STATE_ST mng_state; // offset 0x0, size 0x20 + int DrawState; // offset 0x20, size 0x4 + u_char** pTmpMenuFileBuf; // offset 0x24, size 0x4 + float draw_up_rate; // offset 0x28, size 0x4 + u_char dmy[12]; // offset 0x2C, size 0xC +} TMP_MENU_MNG_ST; + +extern TMP_MENU_MNG_ST g_TmpMenuMng; // size: 0x38, address: 0xA00C70 + +int TmpMenuMng_Update(TMP_MENU_MNG_ST * pTmpMenuMng /* r2 */); +int TmpMenuMng_Draw(TMP_MENU_MNG_ST * pTmpMenuMng /* r16 */); +int TmpMenuMng_SetUDBlackDraw(TMP_MENU_MNG_ST * pTmpMenuMng /* r16 */, _TMP_MENU__UDDRAW_ORDER_EN order /* r17 */); + +#endif // TMP_MENU_H \ No newline at end of file diff --git a/src/cs4/Seimei/src/Unk.h b/src/cs4/Seimei/src/Unk.h index 6d0fe6c..a4b621b 100644 --- a/src/cs4/Seimei/src/Unk.h +++ b/src/cs4/Seimei/src/Unk.h @@ -3,14 +3,6 @@ #include "Model.h" -typedef struct _TMP_MENU_MNG_ST { - // Members - _MNG_STATE_ST mng_state; // offset 0x0, size 0x20 - int DrawState; // offset 0x20, size 0x4 - u_char** pTmpMenuFileBuf; // offset 0x24, size 0x4 - float draw_up_rate; // offset 0x28, size 0x4 - u_char dmy[12]; // offset 0x2C, size 0xC -} TMP_MENU_MNG_ST; extern struct /* @anon0 */ { @@ -52,12 +44,6 @@ typedef enum /* @enum */ { SND_SQSONG_FADE_STATE_QUO = 3, } FADE; -typedef enum { - TMP_MENU__UDDRAW_ORDER__ON = 0, - TMP_MENU__UDDRAW_ORDER__OFF = 1, - TMP_MENU__UDDRAW_ORDER__OFF_FORCE = 2, -} _TMP_MENU__UDDRAW_ORDER_EN; - // Members // total size: 0x1A0 typedef struct /* @anon10 */ @@ -599,7 +585,6 @@ typedef struct /* @anon0 */ u_char a; // offset 0x3, size 0x1 } COLOR; -extern TMP_MENU_MNG_ST g_TmpMenuMng; // size: 0x38, address: 0xA00C70 extern u_int * lpMdlPacketMem; // size: 0x4, address: 0x2578B0 extern DRAW_MNG *lpDrawMng; diff --git a/src/cs4/Seimei/src/menu/KuonMenu.h b/src/cs4/Seimei/src/menu/KuonMenu.h index 64670e8..c456cc5 100644 --- a/src/cs4/Seimei/src/menu/KuonMenu.h +++ b/src/cs4/Seimei/src/menu/KuonMenu.h @@ -21,4 +21,8 @@ enum _KUON_MENU__RELOAD_FLAG_EN { KUON_MENU_RELOAD_FLAG_TITLE = -32768, }; +int KnMenuMng_Update(int call_check /* r16 */); +int KnMenuMng_Draw(); +int KnMenuMng_Crean(); + #endif // KUONMENU_H diff --git a/src/cs4/Seimei/src/menu/MenuTD.h b/src/cs4/Seimei/src/menu/MenuTD.h index 04419f0..11988d4 100644 --- a/src/cs4/Seimei/src/menu/MenuTD.h +++ b/src/cs4/Seimei/src/menu/MenuTD.h @@ -3,6 +3,9 @@ #include "typedefs.h" -int Menu_TD_IsPlay(void); +int Menu_TD_Update(); +int Menu_TD_IsPlay(); +int Menu_TD_Draw(); +int Menu_TD_Init(); #endif // MENUTD_H diff --git a/src/cs4/Seimei/src/sfx/Sfx.h b/src/cs4/Seimei/src/sfx/Sfx.h index ad152d0..41ab982 100644 --- a/src/cs4/Seimei/src/sfx/Sfx.h +++ b/src/cs4/Seimei/src/sfx/Sfx.h @@ -2,5 +2,7 @@ #define SFX_H void SFX_Action(float sec_ /* r20 */); +void SFX_Draw(); +void SFX_DrawAfterOT(); #endif // SFX_H \ No newline at end of file