From 57abb3c79ba2d14315d0ba840894854be049f9f0 Mon Sep 17 00:00:00 2001 From: Dean Southwood Date: Tue, 24 Sep 2024 22:26:40 +1000 Subject: [PATCH] Ogawa diffable --- include/P2D/Pane.h | 6 +- include/P2D/Util.h | 7 ++ include/zen/Number.h | 52 +++++++++ include/zen/TextColorCallBack.h | 26 +++++ include/zen/ogDiary.h | 68 ++++++++++++ .../zen/ogFileChkSel.h | 23 +++- include/zen/ogFileSelect.h | 85 +++++++++++++++ include/zen/ogGraph.h | 27 +++++ .../zen/ogMakeDefault.h | 20 +++- include/zen/ogMap.h | 27 +++++ include/zen/ogMemChk.h | 47 ++++++++ include/zen/ogMenu.h | 93 ++++++++++++++++ include/zen/ogMessage.h | 43 ++++++++ include/zen/ogNitaku.h | 35 ++++++ include/zen/ogRader.h | 54 ++++++++++ include/zen/ogResult.h | 41 +++++++ include/zen/ogSave.h | 29 +++++ .../ogScrStartMgr.h => include/zen/ogStart.h | 18 +++- include/zen/ogSub.h | 102 ++++++++++++++++++ include/zen/ogTotalScore.h | 39 +++++++ include/zen/ogTutorial.h | 40 +++++++ src/plugPikiOgawa/ogCallBack.cpp | 4 +- src/plugPikiOgawa/ogDiary.cpp | 2 +- src/plugPikiOgawa/ogFileChkSel.cpp | 2 +- src/plugPikiOgawa/ogFileCopy.cpp | 2 +- src/plugPikiOgawa/ogFileDelete.cpp | 2 +- src/plugPikiOgawa/ogFileSelect.cpp | 3 +- src/plugPikiOgawa/ogGraph.cpp | 15 +-- src/plugPikiOgawa/ogMakeDefault.cpp | 2 +- src/plugPikiOgawa/ogMap.cpp | 3 +- src/plugPikiOgawa/ogMemChk.cpp | 2 +- src/plugPikiOgawa/ogMenu.cpp | 3 +- src/plugPikiOgawa/ogMessage.cpp | 2 +- src/plugPikiOgawa/ogNitaku.cpp | 2 +- src/plugPikiOgawa/ogRader.cpp | 4 +- src/plugPikiOgawa/ogResult.cpp | 2 +- src/plugPikiOgawa/ogSave.cpp | 2 +- src/plugPikiOgawa/ogStart.cpp | 2 +- src/plugPikiOgawa/ogSub.cpp | 5 +- src/plugPikiOgawa/ogTotalScore.cpp | 2 +- src/plugPikiOgawa/ogTutorial.cpp | 2 +- unsorted_include_todo/zen/PikaAlphaMgr.h | 17 --- unsorted_include_todo/zen/TextColorCallBack.h | 29 ----- unsorted_include_todo/zen/TypingTextMgr.h | 15 --- unsorted_include_todo/zen/ogDrawDiary.h | 15 --- unsorted_include_todo/zen/ogDrawScrMenu.h | 13 --- unsorted_include_todo/zen/ogDrawSelectDiary.h | 18 ---- unsorted_include_todo/zen/ogFadeMgr.h | 16 --- unsorted_include_todo/zen/ogGraphMgr.h | 13 --- unsorted_include_todo/zen/ogMsgCtrlTagMgr.h | 14 --- unsorted_include_todo/zen/ogNitakuMgr.h | 17 --- unsorted_include_todo/zen/ogRaderMgr.h | 13 --- unsorted_include_todo/zen/ogSaveMgr.h | 16 --- unsorted_include_todo/zen/ogScrDiaryMgr.h | 20 ---- .../zen/ogScrFileSelectMgr.h | 17 --- unsorted_include_todo/zen/ogScrMapMgr.h | 16 --- unsorted_include_todo/zen/ogScrMessageMgr.h | 13 --- unsorted_include_todo/zen/ogScrResultMgr.h | 13 --- .../zen/ogScrTotalScoreMgr.h | 18 ---- unsorted_include_todo/zen/ogScrTutorialMgr.h | 16 --- unsorted_include_todo/zen/ogTexAnimMgr.h | 14 --- unsorted_include_todo/zen/ogTexAnimSubMgr.h | 13 --- unsorted_include_todo/zen/setTenmetuAlpha.h | 19 ---- 63 files changed, 904 insertions(+), 396 deletions(-) create mode 100644 include/zen/Number.h create mode 100644 include/zen/TextColorCallBack.h create mode 100644 include/zen/ogDiary.h rename unsorted_include_todo/zen/ogScrFileChkSelMgr.h => include/zen/ogFileChkSel.h (50%) create mode 100644 include/zen/ogFileSelect.h create mode 100644 include/zen/ogGraph.h rename unsorted_include_todo/zen/ogScrMakeDefaultMgr.h => include/zen/ogMakeDefault.h (56%) create mode 100644 include/zen/ogMap.h create mode 100644 include/zen/ogMemChk.h create mode 100644 include/zen/ogMenu.h create mode 100644 include/zen/ogMessage.h create mode 100644 include/zen/ogNitaku.h create mode 100644 include/zen/ogRader.h create mode 100644 include/zen/ogResult.h create mode 100644 include/zen/ogSave.h rename unsorted_include_todo/zen/ogScrStartMgr.h => include/zen/ogStart.h (59%) create mode 100644 include/zen/ogTotalScore.h create mode 100644 include/zen/ogTutorial.h delete mode 100644 unsorted_include_todo/zen/PikaAlphaMgr.h delete mode 100644 unsorted_include_todo/zen/TextColorCallBack.h delete mode 100644 unsorted_include_todo/zen/TypingTextMgr.h delete mode 100644 unsorted_include_todo/zen/ogDrawDiary.h delete mode 100644 unsorted_include_todo/zen/ogDrawScrMenu.h delete mode 100644 unsorted_include_todo/zen/ogDrawSelectDiary.h delete mode 100644 unsorted_include_todo/zen/ogFadeMgr.h delete mode 100644 unsorted_include_todo/zen/ogGraphMgr.h delete mode 100644 unsorted_include_todo/zen/ogMsgCtrlTagMgr.h delete mode 100644 unsorted_include_todo/zen/ogNitakuMgr.h delete mode 100644 unsorted_include_todo/zen/ogRaderMgr.h delete mode 100644 unsorted_include_todo/zen/ogSaveMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrDiaryMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrFileSelectMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrMapMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrMessageMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrResultMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrTotalScoreMgr.h delete mode 100644 unsorted_include_todo/zen/ogScrTutorialMgr.h delete mode 100644 unsorted_include_todo/zen/ogTexAnimMgr.h delete mode 100644 unsorted_include_todo/zen/ogTexAnimSubMgr.h delete mode 100644 unsorted_include_todo/zen/setTenmetuAlpha.h diff --git a/include/P2D/Pane.h b/include/P2D/Pane.h index 24817e66..e0e241fa 100644 --- a/include/P2D/Pane.h +++ b/include/P2D/Pane.h @@ -3,6 +3,7 @@ #include "types.h" #include "zen/CallBack.h" +#include "P2D/Util.h" struct P2DGrafContext; struct P2DPane; @@ -38,7 +39,7 @@ struct P2DPaneCallBack : public zen::CallBack1, public P2DPaneCallBack inline P2DPaneCallBack(); // TODO: make this virtual bool invoke(P2DPane*) = 0; // _08 - virtual void draw(P2DPane*); // _0C (weak) + virtual bool draw(P2DPane*); // _0C (weak) // TODO: members }; @@ -73,6 +74,7 @@ struct P2DPane { void draw(int, int, const P2DGrafContext*, bool); void clip(const PUTRect&); void loadChildResource(); + void rotate(P2DRotateAxis, f32); // unused/inlined: void init(); @@ -80,7 +82,7 @@ struct P2DPane { // _00 = VTBL P2DPaneCallBack* mCallBack; // _04 - // TODO: members + // TODO: members }; #endif diff --git a/include/P2D/Util.h b/include/P2D/Util.h index e9516454..f01082bc 100644 --- a/include/P2D/Util.h +++ b/include/P2D/Util.h @@ -24,6 +24,13 @@ enum P2DWrapmode { }; +/** + * @brief TODO + */ +enum P2DRotateAxis { + +}; + /** * @brief TODO */ diff --git a/include/zen/Number.h b/include/zen/Number.h new file mode 100644 index 00000000..b173ff92 --- /dev/null +++ b/include/zen/Number.h @@ -0,0 +1,52 @@ +#ifndef _ZEN_NUMBER_H +#define _ZEN_NUMBER_H + +#include "types.h" +#include "P2D/Pane.h" + +namespace zen { + +/** + * @brief TODO + */ +struct NumberTex { + NumberTex(); + + static u32 texTable; // unknown type + static u32 shadowTexTable; // unknown type + + // TODO: members +}; + +/** + * @brief TODO + */ +template +struct FigureTex : public NumberTex { + + void getNumber(); + void getNumber(T&); + + // _00-_?? = NumberTex + // TODO: members +}; + +/** + * @brief TODO + */ +template +struct NumberPicCallBack : public P2DPaneCallBack, public FigureTex { + + virtual bool invoke(P2DPane*); // _08 + + void setTexture(P2DPane*); + + // _00 = VTBL? + // _00-_04 = P2DPaneCallBack + // _04-_?? = FigureTex + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/TextColorCallBack.h b/include/zen/TextColorCallBack.h new file mode 100644 index 00000000..b7c55ea7 --- /dev/null +++ b/include/zen/TextColorCallBack.h @@ -0,0 +1,26 @@ +#ifndef _ZEN_OGGRAPH_H +#define _ZEN_OGGRAPH_H + +#include "types.h" +#include "P2D/Pane.h" + +struct Colour; + +namespace zen { + +/** + * @brief TODO + */ +struct TextColorCallBack : public P2DPaneCallBack { + TextColorCallBack(P2DPane*); + + virtual bool invoke(P2DPane*); // _08 + + void setTargetColor(Colour&, Colour&, f32); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogDiary.h b/include/zen/ogDiary.h new file mode 100644 index 00000000..59da91af --- /dev/null +++ b/include/zen/ogDiary.h @@ -0,0 +1,68 @@ +#ifndef _ZEN_OGDIARY_H +#define _ZEN_OGDIARY_H + +#include "types.h" + +struct Controller; +struct Graphics; +struct P2DTextBox; + +namespace zen { + +/** + * @brief TODO + */ +struct ogScrDiaryMgr { + ogScrDiaryMgr(); + + void update(Controller*); + void draw(Graphics&); + void start(s16, s16); + void typePage(); + void nextPage(); + void backPage(); + void exit(); + + // unused/inlined: + void setDiarySpecialNumber(s16); + void setCursorXY(P2DTextBox*); + void updateDiary(Controller*); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogDrawDiary { + ogDrawDiary(); + + void open(f32, f32, s16); + void update(Controller*); + + // unused/inlined: + void start(); + void setOffset(); + void draw(Graphics&); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogDrawSelectDiary { + ogDrawSelectDiary(); + + void start(); + void setCursorAlpha(); + void MoveCursor(); + void update(Controller*); + void draw(Graphics&); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/unsorted_include_todo/zen/ogScrFileChkSelMgr.h b/include/zen/ogFileChkSel.h similarity index 50% rename from unsorted_include_todo/zen/ogScrFileChkSelMgr.h rename to include/zen/ogFileChkSel.h index 90d2fe52..0e7ca37b 100644 --- a/unsorted_include_todo/zen/ogScrFileChkSelMgr.h +++ b/include/zen/ogFileChkSel.h @@ -1,17 +1,32 @@ -#ifndef _ZEN_OGSCRFILECHKSELMGR_H -#define _ZEN_OGSCRFILECHKSELMGR_H +#ifndef _ZEN_OGFILECHKSEL_H +#define _ZEN_OGFILECHKSEL_H -/* +#include "types.h" + +struct Controller; +struct CardQuickInfo; +struct Graphics; + +namespace zen { + +/** * @brief TODO */ -namespace zen { struct ogScrFileChkSelMgr { ogScrFileChkSelMgr(); + void start(bool); void startSave(); void update(Controller*, CardQuickInfo&); void draw(Graphics&); + + // unused/inlined: + void init(); + void startSub(); + + // TODO: members }; + } // namespace zen #endif diff --git a/include/zen/ogFileSelect.h b/include/zen/ogFileSelect.h new file mode 100644 index 00000000..f91566aa --- /dev/null +++ b/include/zen/ogFileSelect.h @@ -0,0 +1,85 @@ +#ifndef _ZEN_OGFILESELECT_H +#define _ZEN_OGFILESELECT_H + +#include "types.h" + +struct Controller; +struct CardQuickInfo; +struct Graphics; + +namespace zen { + +/** + * @brief TODO + */ +struct ogScrFileSelectMgr { + + /** + * @brief TODO + */ + enum FileOperateMode { + // TODO: this + }; + + /** + * @brief TODO + */ + enum titleMessageFlag { + // TODO: this + }; + + ogScrFileSelectMgr(); + + void copyCardInfosSub(); + void getCardFileInfos(); + void paneOnOffXY(bool); + void MovePaneXY(); + void OpenYesNoWindow(); + void CloseYesNoWindow(); + void setOperateMode(FileOperateMode); + void getPane_FileTop1(); + void getPane_FileTop2(); + void setFileData(int); + void getPane_FileIcon(); + void OnOffKetaNissuu(int); + void getPane_CpyCurScreen(); + void SetTitleMsg(titleMessageFlag); + void setDataNumber(int); + void chaseDataScale(); + void OnOffNewPane(int); + void ChkOnyonOnOff(); + void ChkNewData(); + void start(bool, int); + void OperateSelect(Controller*); + void KetteiEffectStart(); + void TailEffectStart(); + void update(Controller*, CardQuickInfo&); + void draw(Graphics&); + + // unused/inlined: + void UpDateYesNoWindow(); + void setOperateMode_Normal(); + void set_SM_C(); + void ScaleAnimeTitle(); + void ScaleAnimeData(); + void init(); + void setDataScale(); + void setOperateMode_Copy(); + void CopyEffectStart(); + void OperateCopy(Controller*); + void setOperateMode_Delete(); + void OperateDelete(Controller*); + void BeginFadeOut(); + void CanToCopy(int); + void TailEffectMove(int, int); + void TailEffectMoveM(int, int); + void quit(); + void MoveCpyCursor(int, f32); + void DeleteEffectStart(); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogGraph.h b/include/zen/ogGraph.h new file mode 100644 index 00000000..161eaaa1 --- /dev/null +++ b/include/zen/ogGraph.h @@ -0,0 +1,27 @@ +#ifndef _ZEN_OGGRAPH_H +#define _ZEN_OGGRAPH_H + +#include "types.h" + +struct Controller; +struct Graphics; +struct P2DScreen; + +namespace zen { + +/** + * @brief TODO + */ +struct ogGraphMgr { + ogGraphMgr(P2DScreen*); + + void SetDummyLineData(); + void MakeData(); + void draw(u8); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/unsorted_include_todo/zen/ogScrMakeDefaultMgr.h b/include/zen/ogMakeDefault.h similarity index 56% rename from unsorted_include_todo/zen/ogScrMakeDefaultMgr.h rename to include/zen/ogMakeDefault.h index 33a3d2ee..2d3a18e2 100644 --- a/unsorted_include_todo/zen/ogScrMakeDefaultMgr.h +++ b/include/zen/ogMakeDefault.h @@ -1,17 +1,29 @@ -#ifndef _ZEN_OGSCRMAKEDEFAULTMGR_H -#define _ZEN_OGSCRMAKEDEFAULTMGR_H +#ifndef _ZEN_OGMAKEDEFAULT_H +#define _ZEN_OGMAKEDEFAULT_H -/* +#include "types.h" + +struct Controller; +struct Graphics; + +namespace zen { + +/** * @brief TODO */ -namespace zen { struct ogScrMakeDefaultMgr { ogScrMakeDefaultMgr(); + void start(); void update(Controller*); void draw(Graphics&); void checkTypingAll(); + + // unused/inlined: + + // TODO: members }; + } // namespace zen #endif diff --git a/include/zen/ogMap.h b/include/zen/ogMap.h new file mode 100644 index 00000000..42257ef3 --- /dev/null +++ b/include/zen/ogMap.h @@ -0,0 +1,27 @@ +#ifndef _ZEN_OGMAP_H +#define _ZEN_OGMAP_H + +#include "types.h" + +struct Controller; +struct Graphics; +struct P2DTextBox; + +namespace zen { + +/** + * @brief TODO + */ +struct ogScrMapMgr { + ogScrMapMgr(); + + void start(s16); + void update(Controller*); + void draw(Graphics&); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogMemChk.h b/include/zen/ogMemChk.h new file mode 100644 index 00000000..e13c7951 --- /dev/null +++ b/include/zen/ogMemChk.h @@ -0,0 +1,47 @@ +#ifndef _ZEN_OGMESSAGE_H +#define _ZEN_OGMESSAGE_H + +#include "types.h" + +struct Controller; +struct Graphics; + +namespace zen { + +struct ogNitakuMgr; +struct TypingTextMgr; + +/** + * @brief TODO + */ +struct ogScrMemChkMgr { + ogScrMemChkMgr(); + + void StatusCheck(); + void setPCtex(TypingTextMgr*); + void DispYesNo(bool); + void DispAcup(bool); + void start(); + void DebugStart(int); + void update(Controller*); + void draw(Graphics&); + void setErrorMessage(); + + // unused/inlined: + void SetNitaku_Y_N(); + void SetNitaku_W_R(); + void SetNitaku_F_N(); + void StartSub(); + void MakeDefFileStart(); + void RepairFileStart(); + void FormatEffectStart(); + void checkTypingAll(); + void checkErrNitaku(zen::ogNitakuMgr*, Controller*); + void setNoCard(); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogMenu.h b/include/zen/ogMenu.h new file mode 100644 index 00000000..610b6e48 --- /dev/null +++ b/include/zen/ogMenu.h @@ -0,0 +1,93 @@ +#ifndef _ZEN_OGMENU_H +#define _ZEN_OGMENU_H + +#include "types.h" + +struct Controller; +struct Graphics; + +namespace zen { + +/** + * @brief TODO + */ +struct ogDrawScrMenu { + ogDrawScrMenu(); + + void update(Controller*, bool, bool); + + // unused/inlined: + void setScreen(char*); + void calcAngleSpeed(f32); + void draw(Graphics&); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogDrawScrController { + ogDrawScrController(); + + void update(); + + // unused/inlined: + void setWinColor(); + void setOriginalColor(); + void setHantenColor(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogDrawScrInfo { + ogDrawScrInfo(); + + void start(); + + // unused/inlined: + void update(Controller*); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogDrawScrInfo2 { + ogDrawScrInfo2(); // unused/inlined + + // unused/inlined: + void start(); + void update(Controller*); + void drawHougaku(Graphics&); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogScrMenuMgr { + ogScrMenuMgr(); + + void start(); + void update(Controller*); + void draw(Graphics&); + + // unused/inlined: + void updateInfo(Controller*); + void updateCont(Controller*); + + // TODO: members +}; + +// unused global functions: +void ChkAngle(f32*); + +} // namespace zen + +#endif diff --git a/include/zen/ogMessage.h b/include/zen/ogMessage.h new file mode 100644 index 00000000..9ba8f9d0 --- /dev/null +++ b/include/zen/ogMessage.h @@ -0,0 +1,43 @@ +#ifndef _ZEN_OGMESSAGE_H +#define _ZEN_OGMESSAGE_H + +#include "types.h" + +struct Controller; +struct Graphics; + +namespace zen { + +/** + * @brief TODO + */ +struct ogScrMessageMgr { + ogScrMessageMgr(char*); + + void SearchTopPage(int); + void resetPage(); + void start(int); + void setPage(int); + void nextPage(); + void backPage(); + void makePageInfo(char***); + void cnvSingleMulti(char*); + void cnvButtonIcon(char*); + void setPageInfoSub(); + void MakeAndSetPageInfo(char***); + void dispAll(); + void fadeOut(); + void update(Controller*); + void draw(Graphics&); + + // unused/inlined: + void setMessagePage(int); + void ReadAllScreen(); + void setScreenAlpha(u8); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogNitaku.h b/include/zen/ogNitaku.h new file mode 100644 index 00000000..5d020ed3 --- /dev/null +++ b/include/zen/ogNitaku.h @@ -0,0 +1,35 @@ +#ifndef _ZEN_OGNITAKU_H +#define _ZEN_OGNITAKU_H + +#include "types.h" + +struct Controller; +struct Graphics; +struct P2DScreen; +struct P2DTextBox; + +namespace zen { + +/** + * @brief TODO + */ +struct ogNitakuMgr { + ogNitakuMgr(P2DScreen*, P2DTextBox*, P2DTextBox*, P2DTextBox*, bool, bool); + + void start(); + void update(Controller*); + void cursorEnable(f32); + void cursorDisable(f32); + + // unused/inlined: + void MoveCursorYes(f32); + void MoveCursorNo(f32); + void InitCursor(); + void stop(); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogRader.h b/include/zen/ogRader.h new file mode 100644 index 00000000..911e9aa8 --- /dev/null +++ b/include/zen/ogRader.h @@ -0,0 +1,54 @@ +#ifndef _ZEN_OGRADER_H +#define _ZEN_OGRADER_H + +#include "types.h" + +struct P2DPane; +struct P2DPicture; +struct Controller; +struct Graphics; +struct Vector3f; + +namespace zen { + +/** + * @brief TODO + */ +struct ogRaderMgr { + ogRaderMgr(); + + void setRaderAngle(f32); + void setRaderScroll(int, int); + void getPartsPos(); + void getAllPikiPos(); + void startSub(); + void startMenu(P2DPane*); + void MapOn(); + void updateGame(Controller*); + void AreaScroll(f32*, f32*, f32, f32); + void updateMenu(Controller*); + void update(Controller*); + void end(); + void draw(Graphics&); + + // unused/inlined: + void ogCalcDispXZ(Vector3f); + void setRaderScale(f32); + void chaseRaderScale(f32); + void getOrimaPos(); + void getContainerPos(); + void getRocketPos(); + void start(); + void MapOff(); + void RotatePos(f32*, f32*); + void DrawCircle(u8, u8, u8, u8, f32); + + // TODO: members +}; + +// unused/inlined global functions: +void setOffsetSub(P2DPicture*); + +} // namespace zen + +#endif diff --git a/include/zen/ogResult.h b/include/zen/ogResult.h new file mode 100644 index 00000000..b97432a2 --- /dev/null +++ b/include/zen/ogResult.h @@ -0,0 +1,41 @@ +#ifndef _ZEN_OGRESULT_H +#define _ZEN_OGRESULT_H + +#include "types.h" + +struct P2DPane; +struct Controller; +struct Graphics; + +namespace zen { + +/** + * @brief TODO + */ +enum EnumResult { + +}; + +/** + * @brief TODO + */ +struct ogScrResultMgr { + ogScrResultMgr(); + ogScrResultMgr(EnumResult*); + + void ogScrResultMgrSub(); + void start(); + void update(Controller*); + void draw(Graphics&); + + // unused/inlined: + void check1000(int, P2DPane*, P2DPane*, int); + void setEnumResultTable(EnumResult*); + void StartRESULT(); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogSave.h b/include/zen/ogSave.h new file mode 100644 index 00000000..926bf903 --- /dev/null +++ b/include/zen/ogSave.h @@ -0,0 +1,29 @@ +#ifndef _ZEN_OGSAVE_H +#define _ZEN_OGSAVE_H + +#include "types.h" + +struct Controller; +struct Graphics; + +namespace zen { + +/** + * @brief TODO + */ +struct ogSaveMgr { + ogSaveMgr(); + + void start(); + void update(Controller*); + void draw(Graphics&); + + // unused/inlined: + void startDirectSave(s16); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/unsorted_include_todo/zen/ogScrStartMgr.h b/include/zen/ogStart.h similarity index 59% rename from unsorted_include_todo/zen/ogScrStartMgr.h rename to include/zen/ogStart.h index 2dc43931..21a17be5 100644 --- a/unsorted_include_todo/zen/ogScrStartMgr.h +++ b/include/zen/ogStart.h @@ -1,17 +1,27 @@ -#ifndef _ZEN_OGSCRSTARTMGR_H -#define _ZEN_OGSCRSTARTMGR_H +#ifndef _ZEN_OGSTART_H +#define _ZEN_OGSTART_H -/* +#include "types.h" + +struct Controller; +struct Graphics; + +namespace zen { + +/** * @brief TODO */ -namespace zen { struct ogScrStartMgr { ogScrStartMgr(); + void start(); void stop(); void update(Controller*); void draw(Graphics&); + + // TODO: members }; + } // namespace zen #endif diff --git a/include/zen/ogSub.h b/include/zen/ogSub.h index cc6ce95f..d4865697 100644 --- a/include/zen/ogSub.h +++ b/include/zen/ogSub.h @@ -4,6 +4,7 @@ #include "types.h" struct Matrix3f; +struct P2DPane; struct P2DPicture; struct P2DScreen; struct P2DTextBox; @@ -11,6 +12,104 @@ struct Vector3f; namespace zen { +/** + * @brief TODO + */ +struct PikaAlphaMgr { + PikaAlphaMgr(P2DScreen*); + + void start(); + void startFadeIn(f32); + void startFadeOut(f32); + void update(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct setTenmetuAlpha { + setTenmetuAlpha(P2DPicture*, f32, f32, u8, u8); + setTenmetuAlpha(P2DPicture*, f32); + + void updateColor(); + void start(); + void startFadeIn(f32, f32, f32); + void startFadeOut(f32, f32, f32); + void update(); + + // unused/inlined: + void calcAlpha(f32); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogFadeMgr { + + /** + * @brief TODO + */ + enum ogFadeStatusFlag { + + }; + + ogFadeMgr(P2DPane*, u8); + + void start(ogFadeStatusFlag, f32); + void setAlpha(); + void update(); +}; + +/** + * @brief TODO + */ +struct ogTexAnimMgr { + ogTexAnimMgr(P2DScreen*); + + void update(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogTexAnimSubMgr { + ogTexAnimSubMgr(P2DScreen*, P2DPicture*, P2DTextBox*); + + // unused/inlined: + void update(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct TypingTextMgr { + TypingTextMgr(P2DTextBox*); + + void start(); + void update(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ogMsgCtrlTagMgr { + ogMsgCtrlTagMgr(); + + void CheckCtrlTag(char*, s16*, f32*); + + // TODO: members +}; + // global utility functions void ogCheckInsCard(); void calcPuruPuruScale(f32); @@ -26,6 +125,9 @@ void makeRotMatrix(Vector3f&, Matrix3f&); void makePathName(const char*, const char*, char*); void loadTexExp(const char*, bool, bool); +// unused/inlined globals: +void movePicturePos(P2DPicture*, P2DPicture*); + } // namespace zen #endif diff --git a/include/zen/ogTotalScore.h b/include/zen/ogTotalScore.h new file mode 100644 index 00000000..bb0b5e50 --- /dev/null +++ b/include/zen/ogTotalScore.h @@ -0,0 +1,39 @@ +#ifndef _ZEN_OGTOTALSCORE_H +#define _ZEN_OGTOTALSCORE_H + +#include "types.h" + +struct Controller; +struct Graphics; +struct P2DPane; + +namespace zen { + +/** + * @brief TODO + */ +enum TotalScoreType { + +}; + +/** + * @brief TODO + */ +struct ogScrTotalScoreMgr { + ogScrTotalScoreMgr(TotalScoreType*); + + void start(); + void update(Controller*); + void draw(Graphics&); + void setRankInEffect(); + void setRankInColor(); + + // unused/inlined: + void setEffect(P2DPane*, int); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogTutorial.h b/include/zen/ogTutorial.h new file mode 100644 index 00000000..b28ac47b --- /dev/null +++ b/include/zen/ogTutorial.h @@ -0,0 +1,40 @@ +#ifndef _ZEN_OGTUTORIAL_H +#define _ZEN_OGTUTORIAL_H + +#include "types.h" + +struct Controller; +struct Graphics; +struct P2DTextBox; + +namespace zen { + +/** + * @brief TODO + */ +struct ogScrTutorialMgr { + + /** + * @brief TODO + */ + enum EnumTutorial { + // TODO: this + }; + + ogScrTutorialMgr(); + + void update(Controller*); + void draw(Graphics&); + void start(zen::ogScrTutorialMgr::EnumTutorial); + + // unused/inlined: + void nextPage(); + void backPage(); + void setCursorXY(P2DTextBox*); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/src/plugPikiOgawa/ogCallBack.cpp b/src/plugPikiOgawa/ogCallBack.cpp index 271d1319..85be18a5 100644 --- a/src/plugPikiOgawa/ogCallBack.cpp +++ b/src/plugPikiOgawa/ogCallBack.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/TextColorCallBack.h" /* * --INFO-- @@ -161,7 +161,7 @@ void zen::TextColorCallBack::setTargetColor(Colour&, Colour&, f32) * Address: 80198EDC * Size: 000538 */ -void zen::TextColorCallBack::invoke(P2DPane*) +bool zen::TextColorCallBack::invoke(P2DPane*) { /* .loc_0x0: diff --git a/src/plugPikiOgawa/ogDiary.cpp b/src/plugPikiOgawa/ogDiary.cpp index cd2a29d5..0772d002 100644 --- a/src/plugPikiOgawa/ogDiary.cpp +++ b/src/plugPikiOgawa/ogDiary.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogDiary.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogFileChkSel.cpp b/src/plugPikiOgawa/ogFileChkSel.cpp index af851682..1d0aa815 100644 --- a/src/plugPikiOgawa/ogFileChkSel.cpp +++ b/src/plugPikiOgawa/ogFileChkSel.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogFileChkSel.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogFileCopy.cpp b/src/plugPikiOgawa/ogFileCopy.cpp index 08a95c4d..913bb96d 100644 --- a/src/plugPikiOgawa/ogFileCopy.cpp +++ b/src/plugPikiOgawa/ogFileCopy.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogFileSelect.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogFileDelete.cpp b/src/plugPikiOgawa/ogFileDelete.cpp index 7cf35225..bfcf61d3 100644 --- a/src/plugPikiOgawa/ogFileDelete.cpp +++ b/src/plugPikiOgawa/ogFileDelete.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogFileSelect.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogFileSelect.cpp b/src/plugPikiOgawa/ogFileSelect.cpp index 51fc59a5..64695663 100644 --- a/src/plugPikiOgawa/ogFileSelect.cpp +++ b/src/plugPikiOgawa/ogFileSelect.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "zen/ogFileSelect.h" +#include "MemoryCard.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogGraph.cpp b/src/plugPikiOgawa/ogGraph.cpp index b2c7894e..fbf78447 100644 --- a/src/plugPikiOgawa/ogGraph.cpp +++ b/src/plugPikiOgawa/ogGraph.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogGraph.h" /* * --INFO-- @@ -20,12 +20,14 @@ static void _Print(char*, ...) // UNUSED FUNCTION } +namespace zen { + /* * --INFO-- * Address: 80197F28 * Size: 0000C4 */ -zen::ogGraphMgr::ogGraphMgr(P2DScreen*) +ogGraphMgr::ogGraphMgr(P2DScreen*) { /* .loc_0x0: @@ -90,7 +92,7 @@ zen::ogGraphMgr::ogGraphMgr(P2DScreen*) * Address: 80197FEC * Size: 000304 */ -void zen::ogGraphMgr::SetDummyLineData() +void ogGraphMgr::SetDummyLineData() { /* .loc_0x0: @@ -305,7 +307,7 @@ void zen::ogGraphMgr::SetDummyLineData() * Address: 801982F0 * Size: 000320 */ -void zen::ogGraphMgr::MakeData() +void ogGraphMgr::MakeData() { /* .loc_0x0: @@ -577,7 +579,7 @@ void zen::ogGraphMgr::MakeData() * Address: 80198610 * Size: 00029C */ -void zen::setGraphGX(void*, int, u8) +static void setGraphGX(void*, int, u8) { /* .loc_0x0: @@ -782,7 +784,7 @@ void zen::setGraphGX(void*, int, u8) * Address: 801988AC * Size: 0000DC */ -void zen::ogGraphMgr::draw(u8) +void ogGraphMgr::draw(u8) { /* .loc_0x0: @@ -849,3 +851,4 @@ void zen::ogGraphMgr::draw(u8) blr */ } +} // namespace zen diff --git a/src/plugPikiOgawa/ogMakeDefault.cpp b/src/plugPikiOgawa/ogMakeDefault.cpp index 000967e1..00dbe7f2 100644 --- a/src/plugPikiOgawa/ogMakeDefault.cpp +++ b/src/plugPikiOgawa/ogMakeDefault.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogMakeDefault.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogMap.cpp b/src/plugPikiOgawa/ogMap.cpp index e3905455..43842fd4 100644 --- a/src/plugPikiOgawa/ogMap.cpp +++ b/src/plugPikiOgawa/ogMap.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "zen/ogMap.h" +#include "std/Math.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogMemChk.cpp b/src/plugPikiOgawa/ogMemChk.cpp index d571c7b6..0f5fb996 100644 --- a/src/plugPikiOgawa/ogMemChk.cpp +++ b/src/plugPikiOgawa/ogMemChk.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogMemChk.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogMenu.cpp b/src/plugPikiOgawa/ogMenu.cpp index 8b8150c1..54906a5a 100644 --- a/src/plugPikiOgawa/ogMenu.cpp +++ b/src/plugPikiOgawa/ogMenu.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "zen/ogMenu.h" +#include "P2D/Pane.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogMessage.cpp b/src/plugPikiOgawa/ogMessage.cpp index 8d46109e..ba27cdef 100644 --- a/src/plugPikiOgawa/ogMessage.cpp +++ b/src/plugPikiOgawa/ogMessage.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogMessage.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogNitaku.cpp b/src/plugPikiOgawa/ogNitaku.cpp index 4312ad9e..2b1a7411 100644 --- a/src/plugPikiOgawa/ogNitaku.cpp +++ b/src/plugPikiOgawa/ogNitaku.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogNitaku.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogRader.cpp b/src/plugPikiOgawa/ogRader.cpp index b179f719..ffdebbbe 100644 --- a/src/plugPikiOgawa/ogRader.cpp +++ b/src/plugPikiOgawa/ogRader.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "zen/ogRader.h" +#include "Vector.h" +#include "P2D/Pane.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogResult.cpp b/src/plugPikiOgawa/ogResult.cpp index b370be9f..84ffdd14 100644 --- a/src/plugPikiOgawa/ogResult.cpp +++ b/src/plugPikiOgawa/ogResult.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogResult.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogSave.cpp b/src/plugPikiOgawa/ogSave.cpp index 814c1e73..d1ce7912 100644 --- a/src/plugPikiOgawa/ogSave.cpp +++ b/src/plugPikiOgawa/ogSave.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogSave.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogStart.cpp b/src/plugPikiOgawa/ogStart.cpp index e2410179..27279d02 100644 --- a/src/plugPikiOgawa/ogStart.cpp +++ b/src/plugPikiOgawa/ogStart.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogStart.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogSub.cpp b/src/plugPikiOgawa/ogSub.cpp index 1c27c39a..6a227d97 100644 --- a/src/plugPikiOgawa/ogSub.cpp +++ b/src/plugPikiOgawa/ogSub.cpp @@ -1,4 +1,5 @@ #include "zen/ogSub.h" +#include "zen/Number.h" /* * --INFO-- @@ -3198,14 +3199,14 @@ void zen::cnvSpecialNumberHyphen(char*) * Address: 80180E54 * Size: 000008 */ -u32 P2DPaneCallBack::draw(P2DPane*) { return 0x1; } +bool P2DPaneCallBack::draw(P2DPane*) { return true; } /* * --INFO-- * Address: 80180E5C * Size: 0001F8 */ -void zen::NumberPicCallBack::invoke(P2DPane*) +bool zen::NumberPicCallBack::invoke(P2DPane*) { /* .loc_0x0: diff --git a/src/plugPikiOgawa/ogTotalScore.cpp b/src/plugPikiOgawa/ogTotalScore.cpp index f1881a77..633d9fb8 100644 --- a/src/plugPikiOgawa/ogTotalScore.cpp +++ b/src/plugPikiOgawa/ogTotalScore.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogTotalScore.h" /* * --INFO-- diff --git a/src/plugPikiOgawa/ogTutorial.cpp b/src/plugPikiOgawa/ogTutorial.cpp index b88ad81f..e2bf8b26 100644 --- a/src/plugPikiOgawa/ogTutorial.cpp +++ b/src/plugPikiOgawa/ogTutorial.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogTutorial.h" /* * --INFO-- diff --git a/unsorted_include_todo/zen/PikaAlphaMgr.h b/unsorted_include_todo/zen/PikaAlphaMgr.h deleted file mode 100644 index 79f3c296..00000000 --- a/unsorted_include_todo/zen/PikaAlphaMgr.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _ZEN_PIKAALPHAMGR_H -#define _ZEN_PIKAALPHAMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct PikaAlphaMgr { - PikaAlphaMgr(P2DScreen*); - void start(); - void startFadeIn(float); - void startFadeOut(float); - void update(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/TextColorCallBack.h b/unsorted_include_todo/zen/TextColorCallBack.h deleted file mode 100644 index e113c12c..00000000 --- a/unsorted_include_todo/zen/TextColorCallBack.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _ZEN_TEXTCOLORCALLBACK_H -#define _ZEN_TEXTCOLORCALLBACK_H - -/** - * .obj __vt__Q23zen17TextColorCallBack, global - * .4byte __RTTI__Q23zen17TextColorCallBack - * .4byte 0 - * .4byte invoke__Q23zen17TextColorCallBackFP7P2DPane - * .4byte draw__15P2DPaneCallBackFP7P2DPane - */ - -struct P2DPaneCallBack { - virtual void invoke(P2DPane*); // _08 - virtual void draw(P2DPane*); // _0C (weak) -}; - -namespace zen { -/** - * @brief TODO - */ -struct TextColorCallBack : public P2DPaneCallBack { - virtual void invoke(P2DPane*); // _08 - - TextColorCallBack(P2DPane*); - void setTargetColor(Colour&, Colour&, float); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/TypingTextMgr.h b/unsorted_include_todo/zen/TypingTextMgr.h deleted file mode 100644 index 94ffc79e..00000000 --- a/unsorted_include_todo/zen/TypingTextMgr.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ZEN_TYPINGTEXTMGR_H -#define _ZEN_TYPINGTEXTMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct TypingTextMgr { - TypingTextMgr(P2DTextBox*); - void start(); - void update(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogDrawDiary.h b/unsorted_include_todo/zen/ogDrawDiary.h deleted file mode 100644 index 5b0cf234..00000000 --- a/unsorted_include_todo/zen/ogDrawDiary.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ZEN_OGDRAWDIARY_H -#define _ZEN_OGDRAWDIARY_H - -/* - * @brief TODO - */ -namespace zen { -struct ogDrawDiary { - ogDrawDiary(); - void open(float, float, short); - void update(Controller*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogDrawScrMenu.h b/unsorted_include_todo/zen/ogDrawScrMenu.h deleted file mode 100644 index 37fa552b..00000000 --- a/unsorted_include_todo/zen/ogDrawScrMenu.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_OGDRAWSCRMENU_H -#define _ZEN_OGDRAWSCRMENU_H - -/* - * @brief TODO - */ -namespace zen { -struct ogDrawScrMenu { - ogDrawScrMenu(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogDrawSelectDiary.h b/unsorted_include_todo/zen/ogDrawSelectDiary.h deleted file mode 100644 index 5afc5914..00000000 --- a/unsorted_include_todo/zen/ogDrawSelectDiary.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _ZEN_OGDRAWSELECTDIARY_H -#define _ZEN_OGDRAWSELECTDIARY_H - -/* - * @brief TODO - */ -namespace zen { -struct ogDrawSelectDiary { - ogDrawSelectDiary(); - void start(); - void setCursorAlpha(); - void MoveCursor(); - void update(Controller*); - void draw(Graphics&); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogFadeMgr.h b/unsorted_include_todo/zen/ogFadeMgr.h deleted file mode 100644 index 3d2e91f5..00000000 --- a/unsorted_include_todo/zen/ogFadeMgr.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _ZEN_OGFADEMGR_H -#define _ZEN_OGFADEMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogFadeMgr { - ogFadeMgr(P2DPane*, unsigned char); - void start(zen::ogFadeMgr::ogFadeStatusFlag, float); - void setAlpha(); - void update(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogGraphMgr.h b/unsorted_include_todo/zen/ogGraphMgr.h deleted file mode 100644 index 80fdf93b..00000000 --- a/unsorted_include_todo/zen/ogGraphMgr.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_OGGRAPHMGR_H -#define _ZEN_OGGRAPHMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogGraphMgr { - ogGraphMgr(P2DScreen*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogMsgCtrlTagMgr.h b/unsorted_include_todo/zen/ogMsgCtrlTagMgr.h deleted file mode 100644 index e09ef1be..00000000 --- a/unsorted_include_todo/zen/ogMsgCtrlTagMgr.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _ZEN_OGMSGCTRLTAGMGR_H -#define _ZEN_OGMSGCTRLTAGMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogMsgCtrlTagMgr { - ogMsgCtrlTagMgr(); - void CheckCtrlTag(char*, short*, float*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogNitakuMgr.h b/unsorted_include_todo/zen/ogNitakuMgr.h deleted file mode 100644 index 2d6ff1b4..00000000 --- a/unsorted_include_todo/zen/ogNitakuMgr.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _ZEN_OGNITAKUMGR_H -#define _ZEN_OGNITAKUMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogNitakuMgr { - ogNitakuMgr(P2DScreen*, P2DTextBox*, P2DTextBox*, P2DTextBox*, bool, bool); - void start(); - void cursorEnable(float); - void cursorDisable(float); - void update(Controller*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogRaderMgr.h b/unsorted_include_todo/zen/ogRaderMgr.h deleted file mode 100644 index 5323324b..00000000 --- a/unsorted_include_todo/zen/ogRaderMgr.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_OGRADERMGR_H -#define _ZEN_OGRADERMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogRaderMgr { - ogRaderMgr(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogSaveMgr.h b/unsorted_include_todo/zen/ogSaveMgr.h deleted file mode 100644 index f846b46f..00000000 --- a/unsorted_include_todo/zen/ogSaveMgr.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _ZEN_OGSAVEMGR_H -#define _ZEN_OGSAVEMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogSaveMgr { - ogSaveMgr(); - void start(); - void update(Controller*); - void draw(Graphics&); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrDiaryMgr.h b/unsorted_include_todo/zen/ogScrDiaryMgr.h deleted file mode 100644 index 79fe6ac5..00000000 --- a/unsorted_include_todo/zen/ogScrDiaryMgr.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _ZEN_OGSCRDIARYMGR_H -#define _ZEN_OGSCRDIARYMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrDiaryMgr { - ogScrDiaryMgr(); - void update(Controller*); - void draw(Graphics&); - void start(short, short); - void typePage(); - void nextPage(); - void backPage(); - void exit(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrFileSelectMgr.h b/unsorted_include_todo/zen/ogScrFileSelectMgr.h deleted file mode 100644 index 37bcaa06..00000000 --- a/unsorted_include_todo/zen/ogScrFileSelectMgr.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _ZEN_OGSCRFILESELECTMGR_H -#define _ZEN_OGSCRFILESELECTMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrFileSelectMgr { - void setOperateMode_Copy(); - void CopyEffectStart(); - void OperateCopy(Controller*); - void setOperateMode_Delete(); - void OperateDelete(Controller*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrMapMgr.h b/unsorted_include_todo/zen/ogScrMapMgr.h deleted file mode 100644 index 720a9e8d..00000000 --- a/unsorted_include_todo/zen/ogScrMapMgr.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _ZEN_OGSCRMAPMGR_H -#define _ZEN_OGSCRMAPMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrMapMgr { - void start(short); - ogScrMapMgr(); - void update(Controller*); - void draw(Graphics&); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrMessageMgr.h b/unsorted_include_todo/zen/ogScrMessageMgr.h deleted file mode 100644 index 9fa27643..00000000 --- a/unsorted_include_todo/zen/ogScrMessageMgr.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_OGSCRMESSAGEMGR_H -#define _ZEN_OGSCRMESSAGEMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrMessageMgr { - void SearchTopPage(int); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrResultMgr.h b/unsorted_include_todo/zen/ogScrResultMgr.h deleted file mode 100644 index d615f8c1..00000000 --- a/unsorted_include_todo/zen/ogScrResultMgr.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_OGSCRRESULTMGR_H -#define _ZEN_OGSCRRESULTMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrResultMgr { - void ogScrResultMgrSub(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrTotalScoreMgr.h b/unsorted_include_todo/zen/ogScrTotalScoreMgr.h deleted file mode 100644 index 50dd3769..00000000 --- a/unsorted_include_todo/zen/ogScrTotalScoreMgr.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _ZEN_OGSCRTOTALSCOREMGR_H -#define _ZEN_OGSCRTOTALSCOREMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrTotalScoreMgr { - ogScrTotalScoreMgr(zen::TotalScoreType*); - void start(); - void update(Controller*); - void draw(Graphics&); - void setRankInEffect(); - void setRankInColor(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogScrTutorialMgr.h b/unsorted_include_todo/zen/ogScrTutorialMgr.h deleted file mode 100644 index b6b53687..00000000 --- a/unsorted_include_todo/zen/ogScrTutorialMgr.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _ZEN_OGSCRTUTORIALMGR_H -#define _ZEN_OGSCRTUTORIALMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogScrTutorialMgr { - ogScrTutorialMgr(); - void update(Controller*); - void draw(Graphics&); - void start(zen::ogScrTutorialMgr::EnumTutorial); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogTexAnimMgr.h b/unsorted_include_todo/zen/ogTexAnimMgr.h deleted file mode 100644 index 2cf531f8..00000000 --- a/unsorted_include_todo/zen/ogTexAnimMgr.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _ZEN_OGTEXANIMMGR_H -#define _ZEN_OGTEXANIMMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogTexAnimMgr { - ogTexAnimMgr(P2DScreen*); - void update(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/ogTexAnimSubMgr.h b/unsorted_include_todo/zen/ogTexAnimSubMgr.h deleted file mode 100644 index a98203a7..00000000 --- a/unsorted_include_todo/zen/ogTexAnimSubMgr.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_OGTEXANIMSUBMGR_H -#define _ZEN_OGTEXANIMSUBMGR_H - -/* - * @brief TODO - */ -namespace zen { -struct ogTexAnimSubMgr { - ogTexAnimSubMgr(P2DScreen*, P2DPicture*, P2DTextBox*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/setTenmetuAlpha.h b/unsorted_include_todo/zen/setTenmetuAlpha.h deleted file mode 100644 index 563469a3..00000000 --- a/unsorted_include_todo/zen/setTenmetuAlpha.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _ZEN_SETTENMETUALPHA_H -#define _ZEN_SETTENMETUALPHA_H - -/* - * @brief TODO - */ -namespace zen { -struct setTenmetuAlpha { - setTenmetuAlpha(P2DPicture*, float, float, unsigned char, unsigned char); - setTenmetuAlpha(P2DPicture*, float); - void updateColor(); - void start(); - void startFadeIn(float, float, float); - void startFadeOut(float, float, float); - void update(); -}; -} // namespace zen - -#endif