Skip to content

Commit

Permalink
misc Ogawa and Yamashita work
Browse files Browse the repository at this point in the history
  • Loading branch information
@HeartPiece44
HeartPiece44 committed Dec 20, 2024
1 parent 137856e commit 49889ea
Show file tree
Hide file tree
Showing 58 changed files with 1,473 additions and 2,740 deletions.
10 changes: 5 additions & 5 deletions configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,15 +736,15 @@ def MatchingFor(*versions):
Object(NonMatching, "plugPikiOgawa/ogMemChk.cpp"),
Object(NonMatching, "plugPikiOgawa/ogDiary.cpp"),
Object(NonMatching, "plugPikiOgawa/ogMenu.cpp"),
Object(NonMatching, "plugPikiOgawa/ogFileChkSel.cpp"),
Object(Matching, "plugPikiOgawa/ogFileChkSel.cpp"),
Object(NonMatching, "plugPikiOgawa/ogMakeDefault.cpp"),
Object(NonMatching, "plugPikiOgawa/ogTotalScore.cpp"),
Object(NonMatching, "plugPikiOgawa/ogSave.cpp"),
Object(NonMatching, "plugPikiOgawa/ogNitaku.cpp"),
Object(NonMatching, "plugPikiOgawa/ogFileCopy.cpp"),
Object(NonMatching, "plugPikiOgawa/ogFileDelete.cpp"),
Object(NonMatching, "plugPikiOgawa/ogGraph.cpp"),
Object(NonMatching, "plugPikiOgawa/ogStart.cpp"),
Object(Matching, "plugPikiOgawa/ogStart.cpp"),
Object(NonMatching, "plugPikiOgawa/ogCallBack.cpp"),
],
},
Expand Down Expand Up @@ -776,15 +776,15 @@ def MatchingFor(*versions):
Object(Matching, "plugPikiYamashita/TAIAmotion.cpp"),
Object(NonMatching, "plugPikiYamashita/TAIAjudge.cpp"),
Object(NonMatching, "plugPikiYamashita/TAIAattack.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DGrafContext.cpp"),
Object(Matching, "plugPikiYamashita/P2DGrafContext.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DOrthoGraph.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DPerspGraph.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DPane.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DPicture.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DScreen.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DStream.cpp"),
Object(NonMatching, "plugPikiYamashita/PSUList.cpp"),
Object(NonMatching, "plugPikiYamashita/PUTRect.cpp"),
Object(Matching, "plugPikiYamashita/PSUList.cpp"),
Object(Matching, "plugPikiYamashita/PUTRect.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DWindow.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DTextBox.cpp"),
Object(NonMatching, "plugPikiYamashita/P2DPrint.cpp"),
Expand Down
3 changes: 2 additions & 1 deletion include/AIPerf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ struct Menu;
*/
struct AIPerf {
void clearCounts();
void addMenu(Menu*);
void toggleMoveType(Menu&);
void toggleGeneratorMode(Menu&);
void toggleBridge(Menu&);
Expand All @@ -31,6 +30,8 @@ struct AIPerf {
void flowerPiki(Menu&);
void breakSluice(Menu&);

static void addMenu(Menu*);

// unused/inlined:
void toggleAIGrid(Menu&);
void toggleUpdateMgr(Menu&);
Expand Down
4 changes: 3 additions & 1 deletion include/Demo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ struct DemoFlags {

/**
* @brief TODO
*
* @note Size: 0x1 (empty).
*/
struct DemoEventMgr {
DemoEventMgr();
Expand All @@ -86,7 +88,7 @@ struct DemoEventMgr {
void getEventName(int, int);
void getSenderName(int);

// TODO: members
// no members
};

extern DemoEventMgr* demoEventMgr;
Expand Down
2 changes: 2 additions & 0 deletions include/DynParticle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ struct DynParticleHeap {
// TODO: members
};

extern DynParticleHeap* particleHeap;

#endif
30 changes: 29 additions & 1 deletion include/GameCoreSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,21 @@

#include "types.h"
#include "Node.h"
#include "Light.h"

struct Camera;
struct Controller;
struct Creature;
struct Font;
struct MapMgr;
struct Menu;
struct Navi;
struct RectArea;
struct SearchSystem;

namespace zen {
struct DrawGameInfo;
}

/**
* @brief TODO
Expand Down Expand Up @@ -63,7 +72,26 @@ struct GameCoreSection : public Node {

// _00 = VTBL
// _00-_20 = Node
// TODO: members
Controller* mController; // _20
u8 _24[0x4]; // _24, unknown
u32 _28; // _28, unknown
u32 _2C; // _2C, unknown
u8 _30; // _30
u8 _31; // _31
u32 _34; // _34, unknown
u8 _38[0x4]; // _38, unknown
Menu* _3C; // _3C, unknown
u8 _40[0x50 - 0x40]; // _40, unknown
u32 _50; // _50, unknown
SearchSystem* _54; // _54
Navi* mNavi; // _58
u8 _5C[0x64 - 0x5C]; // _5C, unknown
MapMgr* mMapMgr; // _64
Texture* _68; // _68
Font* mBigFont; // _6C
Light _70; // _70
u8 _2BC[0x344 - 0x2BC]; // _2BC
zen::DrawGameInfo* mDrawGameInfo; // _344
};

inline void clearCorePauseFlag() { GameCoreSection::pauseFlag = 0; }
Expand Down
38 changes: 26 additions & 12 deletions include/Generator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,23 @@ struct GeneratorCache {

/**
* @brief TODO
*
* @note Size: 0x4.
*/
struct GeneratorList {
GeneratorList();

void findGenerator(int);
void createRamGenerators();
void updateUseList();

u8 _00[0x4]; // _04, unknown
};

/**
* @brief TODO
*
* @note Size: 0x60.
*/
struct GeneratorMgr : public Node {
GeneratorMgr();
Expand All @@ -142,8 +148,9 @@ struct GeneratorMgr : public Node {
void changeNaviPos();

// _00 = VTBL
// _00-_1C = Node
// TODO: members
// _00-_20 = Node
u8 _20[0x5C - 0x20]; // _20, unknown
u8 _5C; // _5C
};

/**
Expand Down Expand Up @@ -206,7 +213,7 @@ struct GenObjectActor : public GenObject {
virtual void doRead(RandomAccessStream&); // _14
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand All @@ -229,7 +236,8 @@ struct GenObjectBoss : public GenObject {
virtual void updateUseList(Generator*, int); // _24
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

void readParameters(RandomAccessStream&);
void writeParameters(RandomAccessStream&);

Expand All @@ -247,7 +255,7 @@ struct GenObjectDebug : public GenObject {
virtual void doRead(RandomAccessStream&); // _14
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand All @@ -270,7 +278,7 @@ struct GenObjectItem : public GenObject {
virtual void updateUseList(Generator*, int); // _24
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand Down Expand Up @@ -312,7 +320,7 @@ struct GenObjectMapParts : public GenObject {
virtual void render(Graphics&, Generator*); // _30
virtual void* birth(BirthInfo&); // _34

void initialise(MapMgr*);
static void initialise(MapMgr*);

// _04 = VTBL
// _00-_18 = GenObject
Expand All @@ -328,7 +336,7 @@ struct GenObjectNavi : public GenObject {
virtual void doRead(RandomAccessStream&); // _14
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand All @@ -346,7 +354,7 @@ struct GenObjectPellet : public GenObject {
virtual void updateUseList(Generator*, int); // _24
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand Down Expand Up @@ -386,7 +394,7 @@ struct GenObjectPlant : public GenObject {
virtual void render(Graphics&, Generator*); // _30
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand All @@ -406,7 +414,7 @@ struct GenObjectTeki : public GenObject {
virtual void updateUseList(Generator*, int); // _24
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand All @@ -427,7 +435,7 @@ struct GenObjectWorkObject : public GenObject {
virtual void updateUseList(Generator*, int); // _24
virtual void* birth(BirthInfo&); // _34

void initialise();
static void initialise();

// _04 = VTBL
// _00-_18 = GenObject
Expand Down Expand Up @@ -647,5 +655,11 @@ struct GenAreaFactory : public Factory<GenArea> {
};

extern GeneratorCache* generatorCache;
extern GeneratorList* generatorList;
extern GeneratorMgr* generatorMgr;
extern GeneratorMgr* onceGeneratorMgr;
extern GeneratorMgr* dailyGeneratorMgr;
extern GeneratorMgr* plantGeneratorMgr;
extern GeneratorMgr* limitGeneratorMgr;

#endif
2 changes: 1 addition & 1 deletion include/Graphics.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct Graphics {
Light mLight; // _10
u8 _25C[0x2E4 - 0x25C]; // _25C, unknown
Camera* mCamera; // _2E4
u32 _2E8; // _2E8
u32 _2E8; // _2E8
u8 _2EC[0x30C - 0x2EC]; // _2EC, unknown
int mScreenWidth; // _30C, maybe viewport width?
int mScreenHeight; // _310, maybe viewport height?
Expand Down
2 changes: 2 additions & 0 deletions include/Light.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ struct LFlareGroup : public CoreNode {

/**
* @brief TODO
*
* @note Size: 0x24C?
*/
struct Light : public CoreNode {
Light();
Expand Down
2 changes: 1 addition & 1 deletion include/Navi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ struct Navi : public Creature, public PaniAnimKeyListener, public PelletView {
u8 _2E0; // _2E0
bool mIsPellet; // _2E1, is lying down/carryable
Kontroller* mKontroller; // _2E4
u8 _2E8[0x2EC - 0x2E8]; // _2E8, unknown
Camera* mNaviCamera; // _2E8, could be CullFrustum*, but probably Camera*
Vector3f* mLookAtPosPtr; // _2EC
u8 _2F0; // _2F0
u8 _2F1[0x314 - 0x2F1]; // _2F1, unknown
Expand Down
Loading

0 comments on commit 49889ea

Please sign in to comment.