Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-21 14:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gameSystem.cpp nearly done

Browse Source
This commit is contained in:
PikHacker 2023-01-08 22:23:40 -05:00
parent 713b890156
commit 6699e517fc
11 changed files with 245 additions and 1167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/recommended_todo.md
View File

@ -114,7 +114,7 @@
### <section id="plugProjectKandoU">plugProjectKandoU</section>
| File | Size (bytes) | File | Size (bytes) |
| ---- | ---- | ---- | ---- |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameTekiStat.cpp">gameTekiStat.cpp</a> | 3425 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameStat.cpp">gameStat.cpp</a> | 3616 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameTekiStat.cpp">gameTekiStat.cpp</a> | 3425 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameStat.cpp">gameStat.cpp</a> | 3642 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiTeki.cpp">aiTeki.cpp</a> | 5860 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/mapMgrTraceMove.cpp">mapMgrTraceMove.cpp</a> | 9037 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDeathCount.cpp">gameDeathCount.cpp</a> | 12493 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePelletList.cpp">gamePelletList.cpp</a> | 12594 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseHIOSection.cpp">baseHIOSection.cpp</a> | 13022 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellIterator.cpp">cellIterator.cpp</a> | 13172 |
@ -126,14 +126,14 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiRescue.cpp">aiRescue.cpp</a> | 21068 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameResultTexMgr.cpp">gameResultTexMgr.cpp</a> | 21454 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayCommonData.cpp">gamePlayCommonData.cpp</a> | 21622 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveResult.cpp">singleGS_CaveResult.cpp</a> | 22864 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiCrop.cpp">aiCrop.cpp</a> | 26982 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_WorldMap.cpp">singleGS_WorldMap.cpp</a> | 27025 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiTransport.cpp">aiTransport.cpp</a> | 27315 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 28384 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainResult.cpp">singleGS_MainResult.cpp</a> | 29765 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/creatureStick.cpp">creatureStick.cpp</a> | 29885 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Ending.cpp">singleGS_Ending.cpp</a> | 31138 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiEnter.cpp">aiEnter.cpp</a> | 31764 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 32347 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 34058 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBore.cpp">aiBore.cpp</a> | 34931 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 35256 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiWeed.cpp">aiWeed.cpp</a> | 38096 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiAttack.cpp">aiAttack.cpp</a> | 38730 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 42495 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 43430 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 43833 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameSystem.cpp">gameSystem.cpp</a> | 46374 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiTransport.cpp">aiTransport.cpp</a> | 27315 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameSystem.cpp">gameSystem.cpp</a> | 27882 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 28384 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainResult.cpp">singleGS_MainResult.cpp</a> | 29765 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/creatureStick.cpp">creatureStick.cpp</a> | 29885 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Ending.cpp">singleGS_Ending.cpp</a> | 31138 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiEnter.cpp">aiEnter.cpp</a> | 31764 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 32347 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 34058 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBore.cpp">aiBore.cpp</a> | 34931 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 35256 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiWeed.cpp">aiWeed.cpp</a> | 38096 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiAttack.cpp">aiAttack.cpp</a> | 38730 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 42495 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 43430 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 43833 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameGeneratorCache.cpp">gameGeneratorCache.cpp</a> | 46655 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayDataMemCard.cpp">gamePlayDataMemCard.cpp</a> | 48734 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCaveInfo.cpp">gameCaveInfo.cpp</a> | 49620 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletCarcass.cpp">pelletCarcass.cpp</a> | 55418 |

2
include/CellMgrParms.h
View File

@ -23,7 +23,7 @@ struct _CellParms {
struct CellMgrParms : public Parameters, public JKRDisposer {
CellMgrParms();
void globalInstance();
static void globalInstance();
inline static CellMgrParms* getInstance() { return mInstance; }

2
include/DynamicsParms.h
View File

@ -15,7 +15,7 @@ struct DynamicsParms : public Parameters, public JKRDisposer {
// then dtor thunk at _10?
virtual ~DynamicsParms(); // _14 (weak)
void globalInstance();
static void globalInstance();
// _00-_0C = Parameters
// _0C-_24 = JKRDisposer

2
include/Game/BaseGameSection.h
View File

@ -64,6 +64,8 @@ enum DemoTimers {
};
struct BaseGameSection : public BaseHIOSection {
static u8 sOptDraw;
struct ZoomCamera : public LookAtCamera {
virtual ~ZoomCamera() { } // _08 (weak)
virtual void doUpdate(); // _78

27
include/Game/GameSystem.h
View File

@ -57,9 +57,9 @@ struct GameSystem : public NodeObjectMgr<GenericObjectMgr> {
void addObjectMgr(GenericObjectMgr*);
s32 calcFrameDist(int);
void detachAllMgr();
void detachObjectMgr_reuse(GenericObjectMgr*);
TObjectNode<GenericObjectMgr>* detachObjectMgr_reuse(GenericObjectMgr*);
void detachObjectMgr(GenericObjectMgr*);
LightMgr* getLightMgr();
GameLightMgr* getLightMgr();
void init();
bool isZukanMode();
bool paused_soft();
@ -68,7 +68,7 @@ struct GameSystem : public NodeObjectMgr<GenericObjectMgr> {
void setFrozen(bool, char*);
void setMoviePause(bool, char*);
void setPause(bool, char*, int);
void startPause(bool, int, char*);
int startPause(bool, int, char*);
inline bool isVersusMode() { return m_mode == GSM_VERSUS_MODE; }
inline bool isMultiplayerMode() { return (m_mode == GSM_VERSUS_MODE || m_mode == GSM_TWO_PLAYER_CHALLENGE); }
@ -86,7 +86,7 @@ struct GameSystem : public NodeObjectMgr<GenericObjectMgr> {
u8 m_isInCave; // _48
u8 _49; // _49
bool m_isFrozen; // _4A
bool m_isPaused; // _4B
u8 m_isPaused; // _4B
bool m_isPausedSoft; // _4C
bool m_isMoviePause; // _4D
u32 m_frameTimer; // _50
@ -94,11 +94,22 @@ struct GameSystem : public NodeObjectMgr<GenericObjectMgr> {
BaseGameSection* m_section; // _58
};
struct OptimiseController {
virtual ~OptimiseController(); // _08
struct OptimiseController : public JKRDisposer, public Parameters {
OptimiseController()
: Parameters(nullptr, "Dynamics")
, m_c000(this, 'c000', "ピクミン首", true, false, true)
, // pikmin neck
m_c001(this, 'c001', "コリジョンバッファ有効", false, false, true) // collision buffer enabled
{
}
void globalInstance();
void deleteInstance();
virtual ~OptimiseController() { mInstance = nullptr; } // _08
static void globalInstance();
static void deleteInstance();
Parm<bool> m_c000;
Parm<bool> m_c001;
static OptimiseController* mInstance;
};

2
include/Game/Stickers.h
View File

@ -15,7 +15,7 @@ struct Stickers : public Container<Game::Creature> {
virtual void* getEnd(); // _1C
virtual Creature* get(void*); // _20
void initialise();
static void initialise();
};
} // namespace Game

4
include/Game/gameStat.h
View File

@ -33,7 +33,7 @@ struct PikiCounter {
void dec(int);
// _00 = VTBL
u32 m_pikiCounts[PikiColorCount]; // 04, counts of each piki type?
u32 m_pikiCounts[PikiColorCount]; // 04
};
struct PikiNaviCounter {
@ -43,7 +43,7 @@ struct PikiNaviCounter {
void inc(Piki*);
void dec(Piki*);
PikiCounter m_counter[PikiColorCount]; // _00, probably?
PikiCounter m_counter[PikiColorCount]; // _00
};
int getMapPikmins(int);

1
include/ObjectMgr.h
View File

@ -3,6 +3,7 @@
#include "Container.h"
#include "GenericObjectMgr.h"
#include "Iterator.h"
template <typename T>
struct ObjectMgr : public Container<T>, GenericObjectMgr {

2
include/SysShape/Model.h
View File

@ -79,6 +79,8 @@ struct Model : public MtxObject {
J3DModel* m_j3dModel; // _08
int m_jointCount; // _0C
Joint* m_joints; // _10
static u8 viewCalcMode;
};
} // namespace SysShape

4
src/plugProjectKandoU/gameStat.cpp
View File

@ -96,7 +96,7 @@ PikiCounter::PikiCounter() { clear(); }
*/
void PikiCounter::clear()
{
for (int i = 0; i < 7; i++) {
for (int i = 0; i < PikiColorCount; i++) {
m_pikiCounts[i] = 0;
}
}
@ -161,7 +161,7 @@ PikiNaviCounter::PikiNaviCounter() { clear(); }
*/
void PikiNaviCounter::clear()
{
for (int i = 0; i < 7; i++) {
for (int i = 0; i < PikiColorCount; i++) {
m_counter[i].clear();
}
}

1348
src/plugProjectKandoU/gameSystem.cpp
View File

File diff suppressed because it is too large Load Diff