more Yamashita diffable

projectPiki · Sep 24, 2024 · ee11add · ee11add
1 parent 57abb3c
commit ee11add
Show file tree

Hide file tree

Showing 56 changed files with 712 additions and 751 deletions.
diff --git a/include/GameCourseClearSection.h b/include/GameCourseClearSection.h
@@ -0,0 +1,242 @@
+#ifndef _GAMECOURSECLEARSECTION_H
+#define _GAMECOURSECLEARSECTION_H
+
+#include "types.h"
+#include "Section.h"
+
+struct Menu;
+struct Font;
+
+/**
+ * @brief TODO
+ */
+struct GameCourseClearScreen : public Node {
+	virtual void read(RandomAccessStream&); // _0C
+	virtual void update();                  // _10
+	virtual void draw(Graphics&);           // _14
+
+	void menuQuitGame(Menu&);
+
+	// _00     = VTBL
+	// _00-_20 = Node
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct GameCourseClearSection : public Section {
+	GameCourseClearSection();
+
+	virtual void init(); // _30
+
+	// _00     = VTBL
+	// _00-_20 = Section?
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct GameModeMgr {
+	GameModeMgr(int);
+
+	void updateSelect(Controller*);
+	void drawSelect(Graphics&, Font*);
+
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct CMcourseSelectMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct CMresultMode : public GameModeBase {
+	CMresultMode();
+
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct ContainerMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct CountDownMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct FinalResultMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct GameInfoMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct GameOverMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct HiScoreMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct HurryUpMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct ProgressiveMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct SaveFailureMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct SaveMesMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct UfoPartsMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct WMPauseMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct WorldMapMode : public GameModeBase {
+	virtual void update(Controller*); // _08
+	virtual void draw(Graphics&);     // _0C
+
+	// _??     = VTBL
+	// _00-_?? = GameModeBase
+	// TODO: members
+};
+
+#endif
diff --git a/include/TAI/EffectAttack.h b/include/TAI/EffectAttack.h
@@ -0,0 +1,82 @@
+#ifndef _TAI_EFFECTATTACK_H
+#define _TAI_EFFECTATTACK_H
+
+#include "types.h"
+#include "zen/CallBack.h"
+#include "zen/particle.h"
+
+struct Creature;
+struct Vector3f;
+struct Teki;
+
+/**
+ * @brief TODO
+ */
+struct TAIeffectAttackParam {
+	void init();
+
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct TAIeffectAttackEventCallBack {
+
+	virtual bool hitCreature(TAIeffectAttackParam*, Creature*);                                    // _08
+	virtual bool hitCreature(TAIeffectAttackParam*, Creature*, Vector3f);                          // _0C
+	virtual bool hitCreature(zen::particleGenerator*, TAIeffectAttackParam*, Creature*, Vector3f); // _10
+	virtual bool hitMap(TAIeffectAttackParam*);                                                    // _14
+	virtual void playEventSound(zen::particleGenerator*, TAIeffectAttackParam*);                   // _18
+	virtual void ptclHitMap(zen::particleGenerator*, TAIeffectAttackParam*);                       // _1C
+	virtual bool hitCheckCulling(zen::particleGenerator*, TAIeffectAttackParam*, Creature*);       // _20
+
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct EventTypeCallBack : public zen::CallBack1<zen::particleGenerator*> {
+	virtual bool invoke(zen::particleGenerator*); // _08
+
+	// _00     = VTBL
+	// _00-_04 = zen::CallBack1?
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct CylinderTypeCallBack : public zen::CallBack1<zen::particleGenerator*> {
+	virtual bool invoke(zen::particleGenerator*); // _08
+
+	void init(TAIeffectAttackParam*, Teki*, Vector3f&, Vector3f, f32, f32, f32, f32, TAIeffectAttackEventCallBack*);
+	void hitCheckCommon(zen::particleGenerator*, Creature*);
+
+	// unused/inlined:
+	void hitCheck(zen::particleGenerator*);
+
+	// _00     = VTBL
+	// _00-_04 = zen::CallBack1?
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct ConeTypeCallBack : public zen::CallBack1<zen::particleGenerator*> {
+	virtual bool invoke(zen::particleGenerator*); // _08
+
+	void init(TAIeffectAttackParam*, Teki*, Vector3f&, Vector3f, f32, f32, f32, f32, TAIeffectAttackEventCallBack*);
+	void hitCheckCommon(zen::particleGenerator*, Creature*);
+
+	// unused/inlined:
+	void hitCheck(zen::particleGenerator*);
+
+	// _00     = VTBL
+	// _00-_04 = zen::CallBack1?
+	// TODO: members
+};
+
+#endif
diff --git a/include/YaiStrategy.h b/include/YaiStrategy.h
@@ -0,0 +1,25 @@
+#ifndef _YAISTRATEGY_H
+#define _YAISTRATEGY_H
+
+#include "types.h"
+#include "TekiStrategy.h"
+
+/**
+ * @brief TODO
+ */
+struct YaiStrategy {
+	YaiStrategy(int, int);
+
+	virtual void start(Teki&);               // _08
+	virtual void act(Teki&);                 // _0C
+	virtual void eventPerformed(TekiEvent&); // _10
+	virtual void draw(Teki&, Graphics&);     // _18
+
+	void init(int, int);
+
+	// _00     = VTBL
+	// _00-_?? = TekiStrategy
+	// TODO: members
+};
+
+#endif
diff --git a/include/teki.h b/include/teki.h
@@ -274,6 +274,9 @@ struct YTeki : public NTeki {
 	void killStickToMouthPiki();
 	void startNewMotion(int);
 
+	// unused/inlined:
+	void getMapAttribute();
+
 	// _00       = VTBL
 	// _000-_46C = NTeki
 	u8 _46C[0x538 - 0x46C]; // _46C, TODO: work out members