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 /src | |
| parent | 87ea4c687d97fc9a0e3e06fa4732087794881039 (diff) | |
| parent | f6b308ed82a89de31f90166215e0a88a5cdb1ad7 (diff) | |
Merge pull request #112 from AetiasHax/game-state
Delink GameModeBattle
Diffstat (limited to 'src')
| -rw-r--r-- | src/09_Adventure/Game/GameModeAdventure.cpp | 2 | ||||
| -rw-r--r-- | src/12_Battle/Game/GameModeBattle.cpp | 12 | ||||
| -rw-r--r-- | src/Main/Game/GameMode.cpp | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/09_Adventure/Game/GameModeAdventure.cpp b/src/09_Adventure/Game/GameModeAdventure.cpp index dbfa9690..4bfa2526 100644 --- a/src/09_Adventure/Game/GameModeAdventure.cpp +++ b/src/09_Adventure/Game/GameModeAdventure.cpp @@ -100,7 +100,7 @@ THUMB GameModeAdventure::~GameModeAdventure() { } // non-matching -ARM unk32 GameModeAdventure::vfunc_08(unk32 param1) { +ARM unk32 GameModeAdventure::vfunc_08(bool param1) { unk32 uVar2 = 0; if (data_027e0d38->mUnk_14 == 1) { diff --git a/src/12_Battle/Game/GameModeBattle.cpp b/src/12_Battle/Game/GameModeBattle.cpp new file mode 100644 index 00000000..2e48a190 --- /dev/null +++ b/src/12_Battle/Game/GameModeBattle.cpp @@ -0,0 +1,12 @@ +#include "Game/GameModeBattle.hpp" + +GameModeBattle *GameModeBattle::Create(unk32 param1) {} +GameModeBattle::GameModeBattle(unk32 param1) : + GameModePlay(param1) {} +GameModeBattle::~GameModeBattle() {} +void GameModeBattle::vfunc_24() {} +unk32 GameModeBattle::vfunc_08(unk32 param1) {} +void GameModeBattle::vfunc_0c(u16 *param1) {} +void GameModeBattle::vfunc_10(u16 *param1) {} +void GameModeBattle::vfunc_14(u16 *param1) {} +void GameModeBattle::vfunc_18() {} diff --git a/src/Main/Game/GameMode.cpp b/src/Main/Game/GameMode.cpp index fd68c708..6e1792bb 100644 --- a/src/Main/Game/GameMode.cpp +++ b/src/Main/Game/GameMode.cpp @@ -4,5 +4,5 @@ THUMB GameMode::~GameMode() {} THUMB void GameMode::func_0202c0b8() {} THUMB void GameMode::vfunc_0c(u16 *param1) {} THUMB void GameMode::vfunc_10(u16 *param1) {} -THUMB void GameMode::vfunc_14(u16 *param1) {} +THUMB void GameMode::vfunc_14(bool param1) {} THUMB void GameMode::vfunc_18() {} |
