diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-07-06 12:19:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-06 12:19:46 +0200 |
| commit | 70e6bb21469372c6ed0a80264bffec7c160ca310 (patch) | |
| tree | ed6736b4a3ac5c2956b6390f0572a10bb6f91722 /include/Game | |
| parent | 87ea4c687d97fc9a0e3e06fa4732087794881039 (diff) | |
| parent | f6b308ed82a89de31f90166215e0a88a5cdb1ad7 (diff) | |
Merge pull request #112 from AetiasHax/game-state
Delink GameModeBattle
Diffstat (limited to 'include/Game')
| -rw-r--r-- | include/Game/GameMode.hpp | 4 | ||||
| -rw-r--r-- | include/Game/GameModeAdventure.hpp | 2 | ||||
| -rw-r--r-- | include/Game/GameModeBattle.hpp | 30 |
3 files changed, 33 insertions, 3 deletions
diff --git a/include/Game/GameMode.hpp b/include/Game/GameMode.hpp index 2a80d115..d1f5c4e9 100644 --- a/include/Game/GameMode.hpp +++ b/include/Game/GameMode.hpp @@ -24,10 +24,10 @@ public: /* 008 */ /* 00 */ virtual ~GameMode(); - /* 08 */ virtual unk32 vfunc_08(unk32 param1) = 0; + /* 08 */ virtual GameModeId vfunc_08(bool param1) = 0; /* 0c */ virtual void vfunc_0c(u16 *param1); /* 10 */ virtual void vfunc_10(u16 *param1); - /* 14 */ virtual void vfunc_14(u16 *param1); + /* 14 */ virtual void vfunc_14(bool param1); /* 18 */ virtual void vfunc_18(); /* 1c */ diff --git a/include/Game/GameModeAdventure.hpp b/include/Game/GameModeAdventure.hpp index 934a6a10..18ef4981 100644 --- a/include/Game/GameModeAdventure.hpp +++ b/include/Game/GameModeAdventure.hpp @@ -102,7 +102,7 @@ public: /* 018 */ /* 00 */ virtual ~GameModeAdventure() override; - /* 08 */ virtual unk32 vfunc_08(unk32 param1) override; + /* 08 */ virtual unk32 vfunc_08(bool param1) override; /* 0c */ virtual void vfunc_0c(u16 *param1) override; /* 10 */ virtual void vfunc_10(u16 *param1) override; /* 14 */ virtual void vfunc_14(u16 *param1) override; diff --git a/include/Game/GameModeBattle.hpp b/include/Game/GameModeBattle.hpp new file mode 100644 index 00000000..e45d5210 --- /dev/null +++ b/include/Game/GameModeBattle.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include "Game/GameModePlay.hpp" + +class GameModeBattle : public GameModePlay { +public: + /* 000 (base) */ + /* 008 */ unk8 mUnk_008[0x878]; + /* 880 */ unk16 mUnk_880; + /* 882 */ unk8 mUnk_882[0xa]; + /* 88c */ unk16 mUnk_88c; + /* 88e */ unk8 mUnk_88e[0x102]; + /* 990 */ unk32 mUnk_990; + /* 994 */ unk32 mUnk_994; + /* 998 */ unk32 mUnk_998; + /* 99c */ unk8 mUnk_99c[0x4]; + /* 9a0 */ + + /* 00 */ virtual ~GameModeBattle() override; + /* 08 */ virtual unk32 vfunc_08(unk32 param1) override; + /* 0c */ virtual void vfunc_0c(u16 *param1) override; + /* 10 */ virtual void vfunc_10(u16 *param1) override; + /* 14 */ virtual void vfunc_14(u16 *param1) override; + /* 18 */ virtual void vfunc_18() override; + /* 24 */ virtual void vfunc_24(); + /* 28 */ + + GameModeBattle(unk32 param1); + static GameModeBattle *Create(unk32 param1); +}; |