diff --git a/include/Game/GameMode.hpp b/include/Game/GameMode.hpp index 315847ee..0b6beaf3 100644 --- a/include/Game/GameMode.hpp +++ b/include/Game/GameMode.hpp @@ -5,10 +5,21 @@ #include "System/SysNew.hpp" +enum GameModes { + GameMode_Load = 0, + GameMode_StartupScreen = 1, + GameMode_Adventure = 2, + GameMode_FileSelect = 3, + GameMode_WFCSetup = 4, + GameMode_DownloadPlay = 5, + GameMode_Battle = 6, + GameMode_Contact = 7 +}; + class GameMode : public SysObject { public: /* 000 (vtable) */ - /* 004 */ unk32 mUnk_004; + /* 004 */ s32 mModeId; /* 008 */ /* 00 */ virtual ~GameMode(); @@ -20,8 +31,8 @@ public: /* 1c */ inline GameMode() {} - inline GameMode(unk32 param1) : - mUnk_004(param1) {} + inline GameMode(s32 modeId) : + mModeId(modeId) {} void func_0202c0b8(); }; diff --git a/include/Game/GameModeAdventure.hpp b/include/Game/GameModeAdventure.hpp index 015ab345..934a6a10 100644 --- a/include/Game/GameModeAdventure.hpp +++ b/include/Game/GameModeAdventure.hpp @@ -44,9 +44,16 @@ public: class UnkStruct_020f2978_00 { public: - /* 00 */ unk8 pad[0x18]; + /* 000 (vtable) */ + /* 04 */ unk8 pad[0x14]; /* 18 */ + /* 00 */ virtual void vfunc_00(); // func_ov000_020d0670 + /* 04 */ virtual void vfunc_04(); // func_ov000_020cff1c + /* 08 */ virtual void vfunc_08(); // func_ov000_020d0000 + /* 0c */ virtual void vfunc_0c(); // func_ov000_020d0048 + /* 10 */ virtual void vfunc_10(); // func_ov000_020cff8c + UnkStruct_020f2978_00(); ~UnkStruct_020f2978_00(); };