From 0640134c29f4ac643580a8f07d55f6efb36d314c Mon Sep 17 00:00:00 2001 From: Dean Southwood Date: Mon, 16 Sep 2024 23:57:58 +1000 Subject: [PATCH] more Kando, Yamashita diffable, link 2 small files --- configure.py | 4 +- include/AIPerf.h | 48 ++ include/BuildingItem.h | 52 ++ include/Collision.h | 2 +- include/CourseDebug.h | 15 + include/Creature.h | 19 +- include/CreatureCollPart.h | 7 + include/CreatureProp.h | 2 + include/DualCreature.h | 53 ++ include/DynColl.h | 2 + include/DynCreature.h | 16 +- include/GameCreditsSection.h | 20 + include/GameStageClearSection.h | 20 + include/Generator.h | 13 +- include/Geometry.h | 46 ++ include/Iterator.h | 16 + include/KEffect.h | 38 ++ include/MapMgr.h | 2 +- include/MemStat.h | 54 +++ include/ObjectMgr.h | 6 +- include/OnePlayerSection.h | 5 +- include/Pellet.h | 141 ++++++ include/Piki.h | 25 + include/PikiAI.h | 209 +++++--- include/RopeCreature.h | 65 +++ include/Stickers.h | 26 + include/Vector.h | 3 +- include/ViewPiki.h | 3 + include/WorkObject.h | 145 ++++++ include/zen/CallBack.h | 30 ++ include/zen/bBoardColourAnim.h | 31 ++ include/zen/ogSub.h | 31 ++ include/zen/particle.h | 231 +++++++++ .../zen/zenList.h | 28 +- src/plugPikiColin/mapMgr.cpp | 2 +- src/plugPikiKando/aiAction.cpp | 17 +- src/plugPikiKando/aiActions.cpp | 31 +- src/plugPikiKando/aiAttack.cpp | 45 +- src/plugPikiKando/aiBoMake.cpp | 25 +- src/plugPikiKando/aiBore.cpp | 85 +--- src/plugPikiKando/aiBou.cpp | 7 +- src/plugPikiKando/aiBreakWall.cpp | 24 +- src/plugPikiKando/aiBridge.cpp | 24 +- src/plugPikiKando/aiChase.cpp | 7 +- src/plugPikiKando/aiCrowd.cpp | 28 +- src/plugPikiKando/aiDecoy.cpp | 21 +- src/plugPikiKando/aiEnter.cpp | 7 +- src/plugPikiKando/aiEscape.cpp | 7 +- src/plugPikiKando/aiExit.cpp | 7 +- src/plugPikiKando/aiFormation.cpp | 21 +- src/plugPikiKando/aiFree.cpp | 26 +- src/plugPikiKando/aiGoto.cpp | 7 +- src/plugPikiKando/aiGuard.cpp | 7 +- src/plugPikiKando/aiKinoko.cpp | 26 +- src/plugPikiKando/aiMine.cpp | 24 +- src/plugPikiKando/aiPerf.cpp | 6 +- src/plugPikiKando/aiPick.cpp | 29 +- src/plugPikiKando/aiPickCreature.cpp | 10 +- src/plugPikiKando/aiPullout.cpp | 26 +- src/plugPikiKando/aiPush.cpp | 24 +- src/plugPikiKando/aiPut.cpp | 33 +- src/plugPikiKando/aiRandomBoid.cpp | 7 +- src/plugPikiKando/aiRescue.cpp | 24 +- src/plugPikiKando/aiRope.cpp | 7 +- src/plugPikiKando/aiShoot.cpp | 26 +- src/plugPikiKando/aiStone.cpp | 186 +------ src/plugPikiKando/aiTransport.cpp | 28 +- src/plugPikiKando/aiWatch.cpp | 7 +- src/plugPikiKando/aiWeed.cpp | 23 +- src/plugPikiKando/collInfo.cpp | 35 +- src/plugPikiKando/courseDebug.cpp | 124 +---- src/plugPikiKando/creatureCollPart.cpp | 21 +- src/plugPikiKando/creatureCollision.cpp | 2 +- src/plugPikiKando/creatureMove.cpp | 2 +- src/plugPikiKando/creatureStick.cpp | 39 +- src/plugPikiKando/dualCreature.cpp | 7 +- src/plugPikiKando/dynCreature.cpp | 10 + src/plugPikiKando/genActor.cpp | 7 +- src/plugPikiKando/genItem.cpp | 5 +- src/plugPikiKando/genMapParts.cpp | 7 +- src/plugPikiKando/genNavi.cpp | 5 +- src/plugPikiKando/genPellet.cpp | 17 +- src/plugPikiKando/generator.cpp | 11 +- src/plugPikiKando/generatorCache.cpp | 5 +- src/plugPikiKando/memStat.cpp | 72 +-- src/plugPikiKando/pelletMgr.cpp | 166 ++----- src/plugPikiKando/piki.cpp | 68 ++- src/plugPikiKando/pikidoKill.cpp | 2 +- src/plugPikiKando/ropeCreature.cpp | 40 +- src/plugPikiKando/ropeItem.cpp | 25 +- src/plugPikiKando/viewPiki.cpp | 9 +- src/plugPikiKando/workObject.cpp | 110 +++-- src/plugPikiYamashita/bBoardColourAnim.cpp | 2 +- src/plugPikiYamashita/gameCredits.cpp | 58 +-- src/plugPikiYamashita/gameStageClear.cpp | 52 +- src/plugPikiYamashita/particleGenerator.cpp | 16 +- src/plugPikiYamashita/particleLoader.cpp | 2 +- src/plugPikiYamashita/particleManager.cpp | 2 +- src/plugPikiYamashita/particleMdlManager.cpp | 3 +- src/plugPikiYamashita/ptclGenPack.cpp | 141 ++---- src/plugPikiYamashita/simpleParticle.cpp | 2 +- unsorted_include_todo/AIPerf.h | 11 - unsorted_include_todo/Bridge.h | 456 ------------------ unsorted_include_todo/BuildingItem.h | 372 -------------- unsorted_include_todo/BuildingItemProp.h | 21 - unsorted_include_todo/DualCreature.h | 165 ------- unsorted_include_todo/GameCreditsSection.h | 52 -- unsorted_include_todo/HinderRock.h | 455 ----------------- unsorted_include_todo/KEffect.h | 36 -- unsorted_include_todo/MemInfo.h | 27 -- unsorted_include_todo/MemInfoNode.h | 27 -- unsorted_include_todo/MemStat.h | 18 - unsorted_include_todo/PelCreature.h | 238 --------- unsorted_include_todo/Pellet.h | 298 ------------ unsorted_include_todo/PelletConfig.h | 28 -- unsorted_include_todo/PelletMgr.h | 140 ------ unsorted_include_todo/PelletProp.h | 21 - unsorted_include_todo/RopeCreature.h | 166 ------- unsorted_include_todo/RopeItem.h | 230 --------- unsorted_include_todo/RopeProp.h | 21 - unsorted_include_todo/Stickers.h | 24 - unsorted_include_todo/WorkObject.h | 361 -------------- unsorted_include_todo/WorkObjectMgr.h | 122 ----- unsorted_include_todo/WorkObjectNode.h | 27 -- unsorted_include_todo/zen.h | 27 -- unsorted_include_todo/zen/PCRData.h | 27 -- unsorted_include_todo/zen/PtclGenPack.h | 19 - unsorted_include_todo/zen/bBoardColourAnim.h | 13 - .../zen/bBoardColourAnimData.h | 15 - unsorted_include_todo/zen/particleChildMdl.h | 27 -- unsorted_include_todo/zen/particleGenerator.h | 27 -- unsorted_include_todo/zen/particleLoader.h | 14 - unsorted_include_todo/zen/particleManager.h | 15 - unsorted_include_todo/zen/particleMdl.h | 27 -- unsorted_include_todo/zen/particleMdlBase.h | 27 -- .../zen/particleMdlManager.h | 13 - unsorted_include_todo/zen/simplePtclManager.h | 15 - 137 files changed, 1874 insertions(+), 5067 deletions(-) create mode 100644 include/AIPerf.h create mode 100644 include/BuildingItem.h create mode 100644 include/CourseDebug.h create mode 100644 include/DualCreature.h create mode 100644 include/GameCreditsSection.h create mode 100644 include/GameStageClearSection.h create mode 100644 include/Geometry.h create mode 100644 include/Iterator.h create mode 100644 include/KEffect.h create mode 100644 include/MemStat.h create mode 100644 include/Pellet.h create mode 100644 include/RopeCreature.h create mode 100644 include/Stickers.h create mode 100644 include/WorkObject.h create mode 100644 include/zen/CallBack.h create mode 100644 include/zen/bBoardColourAnim.h create mode 100644 include/zen/ogSub.h create mode 100644 include/zen/particle.h rename {unsorted_include_todo => include}/zen/zenList.h (50%) delete mode 100644 unsorted_include_todo/AIPerf.h delete mode 100644 unsorted_include_todo/Bridge.h delete mode 100644 unsorted_include_todo/BuildingItem.h delete mode 100644 unsorted_include_todo/BuildingItemProp.h delete mode 100644 unsorted_include_todo/DualCreature.h delete mode 100644 unsorted_include_todo/GameCreditsSection.h delete mode 100644 unsorted_include_todo/HinderRock.h delete mode 100644 unsorted_include_todo/KEffect.h delete mode 100644 unsorted_include_todo/MemInfo.h delete mode 100644 unsorted_include_todo/MemInfoNode.h delete mode 100644 unsorted_include_todo/MemStat.h delete mode 100644 unsorted_include_todo/PelCreature.h delete mode 100644 unsorted_include_todo/Pellet.h delete mode 100644 unsorted_include_todo/PelletConfig.h delete mode 100644 unsorted_include_todo/PelletMgr.h delete mode 100644 unsorted_include_todo/PelletProp.h delete mode 100644 unsorted_include_todo/RopeCreature.h delete mode 100644 unsorted_include_todo/RopeItem.h delete mode 100644 unsorted_include_todo/RopeProp.h delete mode 100644 unsorted_include_todo/Stickers.h delete mode 100644 unsorted_include_todo/WorkObject.h delete mode 100644 unsorted_include_todo/WorkObjectMgr.h delete mode 100644 unsorted_include_todo/WorkObjectNode.h delete mode 100644 unsorted_include_todo/zen.h delete mode 100644 unsorted_include_todo/zen/PCRData.h delete mode 100644 unsorted_include_todo/zen/PtclGenPack.h delete mode 100644 unsorted_include_todo/zen/bBoardColourAnim.h delete mode 100644 unsorted_include_todo/zen/bBoardColourAnimData.h delete mode 100644 unsorted_include_todo/zen/particleChildMdl.h delete mode 100644 unsorted_include_todo/zen/particleGenerator.h delete mode 100644 unsorted_include_todo/zen/particleLoader.h delete mode 100644 unsorted_include_todo/zen/particleManager.h delete mode 100644 unsorted_include_todo/zen/particleMdl.h delete mode 100644 unsorted_include_todo/zen/particleMdlBase.h delete mode 100644 unsorted_include_todo/zen/particleMdlManager.h delete mode 100644 unsorted_include_todo/zen/simplePtclManager.h diff --git a/configure.py b/configure.py index 07701390..72fd025b 100755 --- a/configure.py +++ b/configure.py @@ -678,8 +678,8 @@ def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: "mw_version": "GC/1.2.5n", "objects": [ Object(NonMatching, "plugPikiYamashita/gameCourseClear.cpp"), - Object(NonMatching, "plugPikiYamashita/gameStageClear.cpp"), - Object(NonMatching, "plugPikiYamashita/gameCredits.cpp"), + Object(Matching, "plugPikiYamashita/gameStageClear.cpp"), + Object(Matching, "plugPikiYamashita/gameCredits.cpp"), Object(NonMatching, "plugPikiYamashita/zenMath.cpp"), Object(NonMatching, "plugPikiYamashita/effectMgr.cpp"), Object(NonMatching, "plugPikiYamashita/particleGenerator.cpp"), diff --git a/include/AIPerf.h b/include/AIPerf.h new file mode 100644 index 00000000..af8ee34c --- /dev/null +++ b/include/AIPerf.h @@ -0,0 +1,48 @@ +#ifndef _AIPERF_H +#define _AIPERF_H + +#include "types.h" + +struct Menu; + +/* + * @brief TODO + */ +struct AIPerf { + void clearCounts(); + void addMenu(Menu*); + void toggleMoveType(Menu&); + void toggleGeneratorMode(Menu&); + void toggleBridge(Menu&); + void toggleShowRoute(Menu&); + void toggleKando(Menu&); + void toggleLOD(Menu&); + void toggleColls(Menu&); + void toggleASync(Menu&); + void toggleInsQuick(Menu&); + void toggleSoundDebug(Menu&); + void toggleCollSort(Menu&); + void incOptLevel(Menu&); + void decOptLevel(Menu&); + void incUfoLevel(Menu&); + void decUfoLevel(Menu&); + void collectPikis(Menu&); + void fullfillPiki(Menu&); + void flowerPiki(Menu&); + void breakSluice(Menu&); + + // unused/inlined: + void toggleAIGrid(Menu&); + void toggleUpdateMgr(Menu&); + void togglePikiMabiki(Menu&); + void togglePsOptimise(Menu&); + void toggleIteratorCull(Menu&); + void toggleUseGrid(Menu&); + void incGridShift(Menu&); + void decGridShift(Menu&); + void toggleUpdateSearchBuffer(Menu&); + + // TODO: members +}; + +#endif diff --git a/include/BuildingItem.h b/include/BuildingItem.h new file mode 100644 index 00000000..d9f410b9 --- /dev/null +++ b/include/BuildingItem.h @@ -0,0 +1,52 @@ +#ifndef _BUILDINGITEM_H +#define _BUILDINGITEM_H + +#include "types.h" +#include "ItemMgr.h" +#include "CreatureProp.h" + +struct ItemShapeObject; +struct SimpleAI; + +/** + * @brief TODO + */ +struct BuildingItemProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO. + */ +struct BuildingItem : public ItemCreature { + BuildingItem(int, CreatureProp*, ItemShapeObject*, SimpleAI*); + + virtual bool insideSafeArea(Vector3f&); // _10 + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 (weak) + virtual void doStore(CreatureInf*); // _48 + virtual void doRestore(CreatureInf*); // _4C + virtual void doSave(RandomAccessStream&); // _50 + virtual void doLoad(RandomAccessStream&); // _54 + virtual void getBoundingSphereRadius(); // _64 + virtual bool isAlive(); // _88 + virtual bool needShadow(); // _90 (weak) + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void refresh2d(Graphics&); // _F0 + virtual void doKill(); // _10C + virtual void playEffect(int); // _12C + virtual void isCompleted(); // _15C + + void startBreakEffect(); + void stopBreakEffect(); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +#endif diff --git a/include/Collision.h b/include/Collision.h index 6707e21f..f6c33a92 100644 --- a/include/Collision.h +++ b/include/Collision.h @@ -115,7 +115,7 @@ struct ObjCollInfo : public CoreNode { Vector3f mCentrePosition; // _34 f32 mRadius; // _40 BaseShape* mParentShape; // _44 - s32 _48; // _48 + u32 _48; // _48 char* mPlatformName; // _4C ObjCollFlags mFlags; // _50 }; diff --git a/include/CourseDebug.h b/include/CourseDebug.h new file mode 100644 index 00000000..f17c3248 --- /dev/null +++ b/include/CourseDebug.h @@ -0,0 +1,15 @@ +#ifndef _COURSEDEBUG_H +#define _COURSEDEBUG_H + +#include "types.h" + +namespace CourseDebug { +// Global debug objects - these are all size 0x4, maybe BOOL? or u32? +extern int collision; +extern int pikiNoAttack; +extern int noCarryover; +extern int pelletDebug; + +} // namespace CourseDebug + +#endif diff --git a/include/Creature.h b/include/Creature.h index 905554f1..3e5bb717 100644 --- a/include/Creature.h +++ b/include/Creature.h @@ -11,12 +11,15 @@ struct CollInfo; struct CollTriInfo; struct CollPart; +struct Colour; struct Condition; struct CreatureInf; struct CreatureProp; struct DynCollObject; struct Matrix4f; +struct MoveTrace; struct Msg; +struct Pellet; struct RopeCreature; struct RouteTracer; struct SeContext; @@ -155,7 +158,7 @@ struct Creature : public RefCountable, public EventTalker { void endStickMouth(); void startStickObjectSphere(Creature*, CollPart*, f32); void startStickObjectTube(Creature*, CollPart*); - void startStickObject(Creature*, CollPart*, f32); + void startStickObject(Creature*, CollPart*, int, f32); void endStickObject(); void startStick(Creature*, CollPart*); void endStick(); @@ -173,6 +176,13 @@ struct Creature : public RefCountable, public EventTalker { void insideSphere(struct Sphere&); void adjustDistance(Vector3f&, f32); void getAtariType(); + void checkForward(Vector3f&, f32, f32&); + void getNextTri(CollTriInfo*, Vector3f&, int&); + void renderCollTriInfo(Graphics&, CollTriInfo*, Colour&); + void isStickToSphere(); + void adjustStickObject(Vector3f&); + void startStickObjectPellet(Pellet*, int, f32); + void isStickLeader(); inline void setCreatureFlag(u32 flag) { mCreatureFlags |= flag; } inline void resetCreatureFlag(u32 flag) { mCreatureFlags &= ~flag; } @@ -187,14 +197,17 @@ struct Creature : public RefCountable, public EventTalker { FastGrid mGrid; // _40 u8 _58[0x6C - 0x58]; // _58, TODO: work out members EObjType mObjType; // _6C, object type - u8 _70[0x94 - 0x70]; // _70, TODO: work out members + Vector3f _70; // _70 + u8 _7C[0x94 - 0x7C]; // _7C, TODO: work out members Vector3f mPosition; // _94 f32 mDirection; // _A0 u8 _A4[0xC8 - 0xA4]; // _A4, TODO: work out members u32 mCreatureFlags; // _C8, bitflag u32 _CC; // _CC f32 _D0; // _D0 - u8 _D4[0x184 - 0xD4]; // _CC, TODO: work out members + u8 _D4[0xE0 - 0xD4]; // _D4, TODO: work out members + Quat _E0; // _E0 + u8 _F0[0x184 - 0xF0]; // _F0, TODO: work out members Creature* mStickTarget; // _184, creature/object this creature is stuck to u8 _188[0x220 - 0x188]; // _188, TODO: work out members CollInfo* mCollInfo; // _220 diff --git a/include/CreatureCollPart.h b/include/CreatureCollPart.h index 381b7d3f..2d6e2504 100644 --- a/include/CreatureCollPart.h +++ b/include/CreatureCollPart.h @@ -4,6 +4,8 @@ #include "types.h" #include "DynColl.h" +struct CollPart; + /** * @brief TODO */ @@ -29,6 +31,11 @@ struct CreaturePlatMgr { void init(Creature*, MapMgr*, Shape*); void release(); void update(Graphics&); + + // TODO: members + Shape* _00; // _00 + CollPart* _04[16]; // _04 + u32 _44; // _44, count of something? }; #endif diff --git a/include/CreatureProp.h b/include/CreatureProp.h index c9c4dc86..ce2e9418 100644 --- a/include/CreatureProp.h +++ b/include/CreatureProp.h @@ -7,6 +7,8 @@ /** * @brief TODO + * + * @note Size: 0x58. */ struct CreatureProp { diff --git a/include/DualCreature.h b/include/DualCreature.h new file mode 100644 index 00000000..ad4614cf --- /dev/null +++ b/include/DualCreature.h @@ -0,0 +1,53 @@ +#ifndef _DUALCREATURE_H +#define _DUALCREATURE_H + +#include "types.h" +#include "DynCreature.h" + +struct ItemShapeObject; +struct MapMgr; + +/** + * @brief TODO + */ +struct DualCreature : public DynCreature { + DualCreature(); + + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void doKill(); // _10C + virtual void onGround(); // _114 + + void isFrontFace(); + void getY(); + void useRealDynamics(); + void useSimpleDynamics(); + void rotateY(f32); + + // unused/inlined: + void createCollisions(Graphics&); + + // _00 = VTBL + // _00-_43C = DynCreature? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PelCreature : public DualCreature { + PelCreature(int, ItemShapeObject*, CreatureProp*, MapMgr*); + + virtual void init(Vector3f&); // _28 + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual bool isAlive(); // _88 + virtual void doRender(Graphics&, Matrix4f&); // _118 + virtual void doCreateColls(Graphics&); // _11C + + // _00 = VTBL + // _00-_43C = DualCreature? + // TODO: members +}; + +#endif diff --git a/include/DynColl.h b/include/DynColl.h index 1fcdfbbd..0aa07b36 100644 --- a/include/DynColl.h +++ b/include/DynColl.h @@ -3,10 +3,12 @@ #include "types.h" #include "Node.h" +#include "BoundBox.h" struct Creature; struct MapAnimShapeObject; struct MapMgr; +struct Shape; /** * @brief TODO diff --git a/include/DynCreature.h b/include/DynCreature.h index dbc80262..acbaf7bc 100644 --- a/include/DynCreature.h +++ b/include/DynCreature.h @@ -3,6 +3,7 @@ #include "types.h" #include "Creature.h" +#include "Matrix4f.h" /** * @brief TODO @@ -27,8 +28,21 @@ struct DynCreature : public Creature { // _00 = VTBL // _00-_2B8 = Creature - u8 _2B8[0x2D0 - 0x2B8]; // _2B8 + Vector3f _2B8; // _2B8 + Vector3f _2C4; // _2C4 f32 _2D0; // _2D0 + u16 _2D4; // _2D4, might be s16 + u32 _2D8; // _2D8, unknown + Vector3f _2DC; // _2DC + Vector3f _2E8; // _2E8 + f32 _2F4; // _2F4 + Matrix4f _2F8; // _2F8 + Matrix4f _338; // _338 + Matrix4f _378; // _378 + Matrix4f _3B8; // _3B8 + u8 _3F8[0x438 - 0x3F8]; // _3F8, unknown + u8 _438; // _438, flag of some kind? + u8 _439; // _439 }; #endif diff --git a/include/GameCreditsSection.h b/include/GameCreditsSection.h new file mode 100644 index 00000000..a2aa322c --- /dev/null +++ b/include/GameCreditsSection.h @@ -0,0 +1,20 @@ +#ifndef _GAMECREDITSSECTION_H +#define _GAMECREDITSSECTION_H + +#include "types.h" +#include "Section.h" + +/* + * @brief TODO + */ +struct GameCreditsSection : public Section { + GameCreditsSection(); + + virtual void init() { } // _30 (weak) + + // _00 = VTBL + // _00-_20 = Section? + // TODO: members +}; + +#endif diff --git a/include/GameStageClearSection.h b/include/GameStageClearSection.h new file mode 100644 index 00000000..6a7c3fd0 --- /dev/null +++ b/include/GameStageClearSection.h @@ -0,0 +1,20 @@ +#ifndef _GAMESTAGECLEARSECTION_H +#define _GAMESTAGECLEARSECTION_H + +#include "types.h" +#include "Section.h" + +/* + * @brief TODO + */ +struct GameStageClearSection : public Section { + GameStageClearSection(); + + virtual void init() { } // _30 (weak) + + // _00 = VTBL + // _00-_20 = Section? + // TODO: members +}; + +#endif diff --git a/include/Generator.h b/include/Generator.h index 9b0ebec2..81451d61 100644 --- a/include/Generator.h +++ b/include/Generator.h @@ -2,10 +2,11 @@ #define _GENERATOR_H #include "types.h" -#include "Ayu.h" #include "Node.h" #include "Parameters.h" +#include "Ayu.h" #include "Vector.h" +#include "ID32.h" struct Creature; struct MapMgr; @@ -237,7 +238,10 @@ struct GenObjectDebug : public GenObject { // _04 = VTBL // _00-_18 = GenObject - // TODO: members + Parm mCollision; // _18, p00 + Parm mPikiNoAttack; // _28, p01 + Parm mNoCarryover; // _38, p02 + Parm mPelletDebug; // _48, p03 }; /** @@ -293,7 +297,7 @@ struct GenObjectMapParts : public GenObject { virtual void render(Graphics&, Generator*); // _30 virtual void* birth(BirthInfo&); // _34 - void initialise(); + void initialise(MapMgr*); // _04 = VTBL // _00-_18 = GenObject @@ -331,7 +335,8 @@ struct GenObjectPellet : public GenObject { // _04 = VTBL // _00-_18 = GenObject - // TODO: members + u32 _18; // _18, unknown + ID32 _1C; // _1C }; /** diff --git a/include/Geometry.h b/include/Geometry.h new file mode 100644 index 00000000..bc4a3a3b --- /dev/null +++ b/include/Geometry.h @@ -0,0 +1,46 @@ +#ifndef _GEOMETRY_H +#define _GEOMETRY_H + +#include "types.h" +#include "Vector.h" + +struct Sphere; + +/** + * @brief TODO + */ +struct Cylinder { + + void get2dDist(Vector3f&); + void collide(const Sphere&, Vector3f&, f32&); + void getPosRatio(const Vector3f&); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct Sphere { + + // TODO: members +}; + +/** + * @brief TODO + */ +struct Tube { + + void getYRatio(f32); + void collide(const Sphere&, Vector3f&, f32&); + void getPosRatio(const Vector3f&); + void getPosGradient(Vector3f&, f32, Vector3f&, Vector3f&); + void setPos(f32); + + // unused/inlined: + void getRatioRadius(f32); + + // TODO: members +}; + +#endif diff --git a/include/Iterator.h b/include/Iterator.h new file mode 100644 index 00000000..2eac1648 --- /dev/null +++ b/include/Iterator.h @@ -0,0 +1,16 @@ +#ifndef _ITERATOR_H +#define _ITERATOR_H + +#include "types.h" + +/** + * @brief TODO + */ +struct Iterator { + void next(); + void first(); + + // TODO: members +}; + +#endif diff --git a/include/KEffect.h b/include/KEffect.h new file mode 100644 index 00000000..402ae988 --- /dev/null +++ b/include/KEffect.h @@ -0,0 +1,38 @@ +#ifndef _KEFFECT_H +#define _KEFFECT_H + +#include "types.h" +#include "zen/particle.h" +#include "zen/CallBack.h" + +/** + * @brief TODO + */ +struct EffectParm { + // TODO: members +}; + +/** + * @brief TODO + */ +struct KEffect : public zen::CallBack1, + public zen::CallBack2, + public zen::CallBack1 { + virtual bool invoke(zen::particleGenerator*); // _08 (weak) + virtual bool invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) + virtual bool invoke(zen::particleMdl*); // _28 (weak) + virtual void emit(EffectParm&) = 0; // _2C + virtual void kill(); // _30 (weak) + virtual void stop(); // _34 (weak) + virtual void restart(); // _38 (weak) + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_04 = CallBack1 + // _04-_08 = CallBack2 + // _08-_0C = CallBack1 + // TODO: members +}; + +#endif diff --git a/include/MapMgr.h b/include/MapMgr.h index 2dfca540..cb369421 100644 --- a/include/MapMgr.h +++ b/include/MapMgr.h @@ -196,7 +196,7 @@ struct MapMgr { void recTraceMove(CollGroup*, MoveTrace&, f32); void traceMove(Creature*, MoveTrace&, f32); void loadPlatshape(char*); - void requestCollPart(ObjCollInfo*, Creature*); + CollPart* requestCollPart(ObjCollInfo*, Creature*); // unused/inlined: void closeCollTri(CollGroup*, CollTriInfo*); diff --git a/include/MemStat.h b/include/MemStat.h new file mode 100644 index 00000000..61f8ab90 --- /dev/null +++ b/include/MemStat.h @@ -0,0 +1,54 @@ +#ifndef _MEMSTAT_H +#define _MEMSTAT_H + +#include "types.h" +#include "CoreNode.h" + +/** + * @brief TODO + */ +struct MemInfoNode : public CoreNode { + MemInfoNode() + : CoreNode("meminfo") + { + } + + // _00 = VTBL + // _00-_14 = CoreNode + // TODO: members +}; + +/** + * @brief TODO + */ +struct MemInfo : public MemInfoNode { + // _00 = VTBL + // _00-_14 = MemInfoNode? + // TODO: members +}; + +/** + * @brief TODO + */ +struct MemStat { + MemStat(); + + void reset(); + void start(char*); + void end(char*); + void print(); + void getInfo(char*); + void printInfoRec(MemInfo*, int); + void getInfoRec(char*, MemInfo*); + + // unused/inlined: + void getMemorySize(char*); + void getRestMemory(); + + // TODO: members + MemInfo mMemInfo; // _00 +}; + +extern MemStat* memStat; + +#endif diff --git a/include/ObjectMgr.h b/include/ObjectMgr.h index f0d4e871..9d00191f 100644 --- a/include/ObjectMgr.h +++ b/include/ObjectMgr.h @@ -43,7 +43,7 @@ struct ObjectMgr : public Traversable, public Node { // _00 = VTBL 1 // _08 = VTBL 2 // _00-_08 = Traversable - // _08-_1C = Node + // _08-_28 = Node // TODO: members }; @@ -78,7 +78,7 @@ struct MonoObjectMgr : public ObjectMgr { // _00 = VTBL 1 // _08 = VTBL 2 - // _00-_1C = ObjectMgr? + // _00-_28 = ObjectMgr? // TODO: members }; @@ -117,7 +117,7 @@ struct PolyObjectMgr : public ObjectMgr { // _00 = VTBL 1 // _08 = VTBL 2 - // _00-_1C = ObjectMgr? + // _00-_28 = ObjectMgr? // TODO: members }; diff --git a/include/OnePlayerSection.h b/include/OnePlayerSection.h index b1224396..09bfb505 100644 --- a/include/OnePlayerSection.h +++ b/include/OnePlayerSection.h @@ -20,7 +20,10 @@ struct FlowController { // TODO: members u8 _00[0x244]; // _00, unknown int _244; // _244 - u8 _248[0x25C - 0x248]; // _248, unknown + u8 _248[0x24C - 0x248]; // _248, unknown + u32 _24C; // _24C, unknown + u32 _250; // _250, unknown + u8 _254[0x25C - 0x254]; // _254, unknown }; /** diff --git a/include/Pellet.h b/include/Pellet.h new file mode 100644 index 00000000..6e5480ff --- /dev/null +++ b/include/Pellet.h @@ -0,0 +1,141 @@ +#ifndef _PELLET_H +#define _PELLET_H + +#include "types.h" +#include "DualCreature.h" +#include "CreatureProp.h" +#include "ObjectMgr.h" + +struct PaniAnimKeyEvent; +struct PelletShapeObject; +struct PelletView; + +/** + * @brief TODO + */ +struct PelletProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct PelletConfig : public Parameters, public CoreNode { + PelletConfig(); + + virtual void read(RandomAccessStream&); // _18 (weak) + // TODO: members +}; + +/** + * @brief TODO + */ +struct Pellet : public DualCreature { + Pellet(); + + virtual void init(Vector3f&); // _28 + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual f32 getCylinderHeight(); // _44 + virtual void doSave(RandomAccessStream&); // _50 + virtual void doLoad(RandomAccessStream&); // _54 + virtual void getCentre(); // _58 + virtual bool isVisible(); // _74 + virtual bool isAtari(); // _84 + virtual bool isAlive(); // _88 + virtual bool ignoreAtari(Creature*); // _98 + virtual bool isFree(); // _9C + virtual void stimulate(Interaction&); // _A0 + virtual void collisionCallback(struct CollEvent&); // _A8 + virtual void bounceCallback(); // _AC + virtual void startWaterEffect(); // _CC + virtual void finishWaterEffect(); // _D0 + virtual void update(); // _E0 + virtual void postUpdate(int, float); // _E4 + virtual void refresh(Graphics&); // _EC + virtual void doAnimation(); // _108 + virtual void doKill(); // _10C + virtual void doRender(Graphics&, Matrix4f&); // _118 + virtual void doCreateColls(Graphics&); // _11C + virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _12C (weak) + + void isUfoPartsID(u32); + void getState(); + void setTrySound(bool); + void startPick(); + void finishPick(); + void startGoal(); + void doCarry(Creature*, Vector3f&, u16); + void getBottomRadius(); + void startStickTeki(Creature*, f32); + void endStickTeki(Creature*); + void winnable(int); + void stickSlot(int); + void stickOffSlot(int); + void getMinFreeSlotIndex(); + void getNearestFreeSlotIndex(Vector3f&); + void getRandomFreeSlotIndex(); + void getSlotLocalPos(int, f32); + void getSlotGlobalPos(int, f32); + void setSlotFlag(int); + void resetSlotFlag(int); + void isSlotFlag(int); + void initPellet(PelletShapeObject*, PelletConfig*); + void startCarryMotion(f32); + void finishMotion(); + + // unused/inlined: + void initSlotFlags(); + void initPellet(PelletView*, PelletConfig*); + void stopMotion(); + void startAppear(); + + // _00 = VTBL + // _00-_43C = DualCreature? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PelletMgr : public MonoObjectMgr { + PelletMgr(MapMgr*); + + virtual ~PelletMgr(); // _48 (weak) + virtual void refresh(Graphics&); // _58 + virtual void createObject(); // _80 + virtual void read(RandomAccessStream&); // _84 (weak) + + void getUfoIndexFromID(u32); + void getUfoIDFromIndex(int); + void decomposeNumberPellet(u32, int&, int&); + void registerUfoParts(); + void newNumberPellet(int, int); + void newPellet(u32, PelletView*); + void getShapeObject(u32); + void addUseList(u32); + void initShapeInfos(); + void getConfigIndex(u32); + void getConfigFromIdx(int); + void getConfig(u32); + void readConfigs(RandomAccessStream&); + void readAnimInfos(RandomAccessStream&); + void initTekiNakaParts(); + void createShapeObjects(); + void refresh2d(Graphics&); + + // unused/inlined: + void useShape(u32); + void getConfigIdAt(int); + + // _00 = VTBL 1 + // _08 = VTBL 2 + // _00-_28 = MonoObjectMgr? + // TODO: members +}; + +#endif diff --git a/include/Piki.h b/include/Piki.h index f93dddfc..70b79201 100644 --- a/include/Piki.h +++ b/include/Piki.h @@ -102,6 +102,21 @@ struct Piki : public Creature, public PaniAnimKeyListener { void enableMotionBlend(); void checkBridgeWall(Creature*, Vector3f&); + // unused/inlined: + void getPikiState(); + void initRouteTraceDynamic(Creature*); + void updateFire(); + void getNaviID(); + void getLastState(); + void birthBuried(); + void isGrowable(); + void isTamable(); + void growup(); + void doMotionBlend(); + void swapMotion(PaniMotionInfo&, PaniMotionInfo&); + void setSpeed(f32); + void getCurrentMotionName(); + // _00 = VTBL // _00-_2B8 = Creature // _2B8 = PaniAnimKeyListener @@ -114,7 +129,17 @@ struct Piki : public Creature, public PaniAnimKeyListener { * @brief TODO */ struct PikiShapeObject { + PikiShapeObject(Shape*); + void exitCourse(); + void init(); + void getAnimMgr(); + void initOnce(); + + // unused/inlined: + void create(int); + + // TODO: members }; #endif diff --git a/include/PikiAI.h b/include/PikiAI.h index 7a5f6531..ad3120c5 100644 --- a/include/PikiAI.h +++ b/include/PikiAI.h @@ -50,11 +50,11 @@ struct Action : public Receiver { virtual void draw(struct Graphics&); // _40 (weak) virtual ~Action(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void resume(); // _54 (weak) virtual void restart(); // _58 (weak) - virtual void resumable(); // _5C (weak) + virtual bool resumable(); // _5C (weak) virtual void getInfo(char*); // _60 (weak) void procMsg(Msg*); // this isn't overridden in the vtable but it exists, idk. @@ -68,11 +68,14 @@ struct Action : public Receiver { * @brief TODO */ struct AndAction : public Action { - inline AndAction(); // TODO: probably + inline AndAction(Piki* piki) // TODO: probably + : Action(piki, false) + { + } virtual ~AndAction(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C // _00 = VTBL // _00-_14 = Action @@ -87,7 +90,7 @@ struct OrAction : public Action { virtual ~OrAction(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C // _00 = VTBL // _00-_14 = Action @@ -115,6 +118,11 @@ struct TopAction : public Action { struct ObjBore { ObjBore(); + // unused/inlined: + void getIndex(int); + void addBoredom(int, f32); + void update(); + u32 _00; // _00, unknown (pointer?) u32 _04; // _04, unknown (pointer?) u8* _08; // _08, array of size _10, might be bools @@ -128,6 +136,13 @@ struct TopAction : public Action { struct Boredom { Boredom(); + // unused/inlined: + void getIndex(int); + void getBoredom(int, int); + void addBoredom(int, int, f32); + void update(); + void draw2d(Graphics&, int); + ObjBore* mObjects; // _00, array of mObjectCnt objects u32 _04; // _04, unknown (pointer?) u32 _08; // _08, unknown @@ -140,14 +155,17 @@ struct TopAction : public Action { virtual void draw(Graphics&); // _40 virtual ~TopAction(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void resume(); // _54 virtual void restart(); // _58 - virtual void resumable(); // _5C + virtual bool resumable(); // _5C virtual void getInfo(char*); // _60 void abandon(zen::particleGenerator*); + // unused/inlined: + void knowledgeCheck(); + // _00 = VTBL // _00-_14 = Action // TODO: members @@ -173,7 +191,7 @@ struct ActAdjust : public Action { virtual void defaultInitialiser(); // _38 (weak) virtual ~ActAdjust(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -189,14 +207,17 @@ struct ActAttack : public AndAction, public PaniAnimKeyListener { virtual ~ActAttack(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void resume(); // _54 virtual void restart(); // _58 - virtual void resumable(); // _5C + virtual bool resumable(); // _5C virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 - void findTarget(); + Creature* findTarget(); + + // unused/inlined: + void decideTarget(); // _00 = VTBL // _00-_18 = AndAction @@ -212,14 +233,14 @@ struct ActBoMake : public Action { virtual ~ActBoMake(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 void initApproach(); - void exeApproach(); + int exeApproach(); void initWork(); - void exeWork(); + int exeWork(); // _00 = VTBL // TODO: members @@ -234,7 +255,7 @@ struct ActBoreListen : public Action { virtual void procAnimMsg(Piki*, MsgAnim*); // _20 virtual ~ActBoreListen(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -249,7 +270,7 @@ struct ActBoreOneshot : public Action, public PaniAnimKeyListener { virtual ~ActBoreOneshot(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -269,12 +290,15 @@ struct ActBoreRest : public Action, public PaniAnimKeyListener { virtual ~ActBoreRest(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 void sitDown(); + // unused/inlined: + void standUp(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -291,7 +315,7 @@ struct ActBoreSelect : public Action { virtual void procAnimMsg(Piki*, MsgAnim*); // _20 virtual ~ActBoreSelect(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void stop(); @@ -310,7 +334,7 @@ struct ActBoreTalk : public Action, public PaniAnimKeyListener { virtual ~ActBoreTalk(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -331,7 +355,7 @@ struct ActBou : public Action { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActBou(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void gotoLeg(); @@ -351,7 +375,7 @@ struct ActBreakWall : public Action, public PaniAnimKeyListener { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActBreakWall(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 @@ -376,7 +400,7 @@ struct ActBridge : public Action, public PaniAnimKeyListener { virtual void dump(); // _3C virtual ~ActBridge(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -386,6 +410,22 @@ struct ActBridge : public Action, public PaniAnimKeyListener { void newInitWork(); void newExeWork(); + // unused/inlined: + void collideBridgeSurface(); + void collideBridgeBlocker(); + void initDetour(); + void exeDetour(); + void initClimb(); + void exeClimb(); + void initApproach(); + void exeApproach(); + void initGo(); + void exeGo(); + void initWork(); + void exeWork(); + void doWork(int); + void newInitApproach(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -411,7 +451,7 @@ struct ActChase : public Action { virtual ~ActChase(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -430,15 +470,22 @@ struct ActCrowd : public Action, public SlotChangeListner { virtual void procWallMsg(Piki*, MsgWall*); // _28 virtual ~ActCrowd(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 - virtual void resumable(); // _5C + virtual bool resumable(); // _5C virtual void inform(int); // _64 void startSort(); void startZawatuki(); void finishZawatuki(); + // unused/inlined: + void initRouteMove(); + void exeRouteMove(); + void setFormed(); + void startBoredom(); + void startTalk(); + // _00 = VTBL // _00-_14 = Action // _18 = SlotChangeListner @@ -453,12 +500,15 @@ struct ActDecoy : public Action, public PaniAnimKeyListener { virtual ~ActDecoy(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 (weak) void findTeki(); + // unused/inlined: + void update(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -501,13 +551,16 @@ struct ActEnter : public Action { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActEnter(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void findLeg(); void gotoLeg(); void climb(); + // unused/inlined: + void routeMove(); + // _00 = VTBL // _00-_14 = Action // TODO: members @@ -532,7 +585,7 @@ struct ActEscape : public Action { virtual ~ActEscape(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void getInfo(char*); // _60 @@ -550,7 +603,7 @@ struct ActExit : public Action { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActExit(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -566,7 +619,7 @@ struct ActFlower : public Action, public PaniAnimKeyListener { virtual ~ActFlower(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 (weak) @@ -584,7 +637,7 @@ struct ActFormation : public Action, public PaniAnimKeyListener { virtual ~ActFormation(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 (weak) @@ -605,9 +658,9 @@ struct ActFree : public Action, public PaniAnimKeyListener { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActFree(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 - virtual void resumable(); // _5C + virtual bool resumable(); // _5C virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 void initBoid(struct Vector3f&, f32); @@ -628,7 +681,7 @@ struct ActFreeSelect : public Action { virtual void procTargetMsg(Piki*, MsgTarget*); // _18 virtual ~ActFreeSelect(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void finishRest(); @@ -659,7 +712,7 @@ struct ActGoto : public Action { virtual void defaultInitialiser(); // _38 (weak) virtual ~ActGoto(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -676,7 +729,7 @@ struct ActGuard : public Action { virtual void dump(); // _3C virtual ~ActGuard(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void findFriend(); @@ -704,13 +757,17 @@ struct ActJumpAttack : public Action, public PaniAnimKeyListener { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActJumpAttack(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 void attackHit(); void doClimb(); + // unused/inlined: + void getAttackPos(); + void getAttackSize(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -725,7 +782,7 @@ struct ActKinoko : public Action, public PaniAnimKeyListener { virtual ~ActKinoko(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -736,6 +793,10 @@ struct ActKinoko : public Action, public PaniAnimKeyListener { void initBoid(); void exeBoid(); + // unused/inlined: + void initStick(); + void initJump(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -750,13 +811,19 @@ struct ActMine : public Action, public PaniAnimKeyListener { virtual ~ActMine(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 (weak) void initWatch(); void exeMine(); + // unused/inlined: + void exeWatch(); + void exeGo(); + void initMine(); + void initGo(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -782,7 +849,7 @@ struct ActPick : public Action, public PaniAnimKeyListener { virtual ~ActPick(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 (weak) @@ -796,6 +863,15 @@ struct ActPick : public Action, public PaniAnimKeyListener { * @brief TODO */ struct ActPickCreature : public AndAction { + + /** + * @brief TODO + */ + struct InitGoto { + void initialise(Action*, Action*); + // TODO: members + }; + ActPickCreature(Piki*); virtual ~ActPickCreature(); // _44 (weak) @@ -814,7 +890,7 @@ struct ActPickItem : public AndAction { virtual ~ActPickItem(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void findItem(); @@ -832,7 +908,7 @@ struct ActPullout : public Action { virtual ~ActPullout(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -848,7 +924,7 @@ struct ActPulloutCreature : public Action, public PaniAnimKeyListener { virtual ~ActPulloutCreature(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 (weak) @@ -866,7 +942,7 @@ struct ActPush : public Action, public PaniAnimKeyListener { virtual ~ActPush(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 (weak) @@ -874,6 +950,10 @@ struct ActPush : public Action, public PaniAnimKeyListener { void initGo(); void exeGo(); + // unused/inlined: + void collideRockSurface(); + void initApproach(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -899,7 +979,7 @@ struct ActPut : public Action { virtual ~ActPut(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -916,7 +996,7 @@ struct ActPutBomb : public Action, public PaniAnimKeyListener { virtual void procCollideMsg(Piki*, MsgCollide*); // _1C virtual ~ActPutBomb(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -931,6 +1011,10 @@ struct ActPutBomb : public Action, public PaniAnimKeyListener { void initPut(); void exeThrow(); + // unused/inlined: + void exeWait(); + void exePut(); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -945,7 +1029,7 @@ struct ActPutItem : public Action { virtual ~ActPutItem(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void findPos(); @@ -985,7 +1069,7 @@ struct ActRandomBoid : public Action { virtual ~ActRandomBoid(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void getInfo(char*); // _60 @@ -1002,7 +1086,7 @@ struct ActRescue : public Action, public PaniAnimKeyListener { virtual ~ActRescue(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -1029,7 +1113,7 @@ struct ActRope : public Action { virtual ~ActRope(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 // _00 = VTBL @@ -1045,11 +1129,14 @@ struct ActShoot : public AndAction { virtual ~ActShoot(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 void findTarget(); + // unused/inlined: + void decideTarget(); + // _00 = VTBL // _00-_18 = AndAction // TODO: members @@ -1063,7 +1150,7 @@ struct ActShootCreature : public Action, public PaniAnimKeyListener { virtual ~ActShootCreature(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 @@ -1081,7 +1168,7 @@ struct ActStone : public Action, public PaniAnimKeyListener { virtual ~ActStone(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 @@ -1107,7 +1194,7 @@ struct ActTransport : public Action, public PaniAnimKeyListener { virtual void draw(Graphics&); // _40 virtual ~ActTransport(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _64 @@ -1116,7 +1203,7 @@ struct ActTransport : public Action, public PaniAnimKeyListener { void getCarriers(); void findPellet(); void setSlotIndex(); - void execJump(); + int execJump(); void gotoLiftPos(); void doLift(); void useWaterRoute(); @@ -1130,6 +1217,14 @@ struct ActTransport : public Action, public PaniAnimKeyListener { void crMove(); void moveToWayPoint(); + // unused/inlined: + void initWait(); + void exeWait(); + void getNumStickers(); + void calcNumStickers(); + void initJump(); + void crGetRadius(int); + // _00 = VTBL // _00-_14 = Action // _14 = PaniAnimKeyListener @@ -1165,7 +1260,7 @@ struct ActWatch : public Action { virtual ~ActWatch(); // _44 (weak) virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void getInfo(char*); // _60 @@ -1182,7 +1277,7 @@ struct ActWeed : public Action, public PaniAnimKeyListener { virtual ~ActWeed(); // _44 virtual void init(Creature*); // _48 - virtual void exec(); // _4C + virtual int exec(); // _4C virtual void cleanup(); // _50 virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _70 diff --git a/include/RopeCreature.h b/include/RopeCreature.h new file mode 100644 index 00000000..c26284d8 --- /dev/null +++ b/include/RopeCreature.h @@ -0,0 +1,65 @@ +#ifndef _ROPECREATURE_H +#define _ROPECREATURE_H + +#include "types.h" +#include "Creature.h" +#include "CreatureProp.h" + +struct Shape; + +/** + * @brief TODO + */ +struct RopeProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct RopeCreature : public Creature { + RopeCreature(CreatureProp*); + + virtual bool needShadow(); // _90 (weak) + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void doKill() = 0; // _10C + + void setRope(Creature*); + void getRopePos(f32); + + // _00 = VTBL + // _00-_2B8 = Creature + Creature* _2B8; // _2B8, probably + RopeCreature* _2BC; // _2BC, probably + f32 _2C0; // _2C0 + Vector3f _2C4; // _2C4 +}; + +/** + * @brief TODO + */ +struct RopeItem : public RopeCreature { + RopeItem(CreatureProp*, Shape*); + + virtual void init(Vector3f&); // _28 + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual bool isVisible(); // _74 + virtual bool isAtari(); // _84 + virtual bool isAlive(); // _88 + virtual bool needShadow(); // _90 + virtual void doKill(); // _10C + + void autoInit(); + + // _00 = VTBL + // _00-_2CC = RopeCreature + // TODO: members +}; + +#endif diff --git a/include/Stickers.h b/include/Stickers.h new file mode 100644 index 00000000..a2ed19b3 --- /dev/null +++ b/include/Stickers.h @@ -0,0 +1,26 @@ +#ifndef _STICKERS_H +#define _STICKERS_H + +#include "types.h" +#include "Traversable.h" + +/** + * @brief TODO + */ +struct Stickers : public Traversable { + Stickers(Creature*); + + virtual Creature* getCreature(int); // _08 + virtual int getFirst(); // _0C + virtual int getNext(int); // _10 + virtual bool isDone(int); // _14 + + void calcNum(); + + // _00 = VTBL + // _00-_08 = Traversable + // TODO: members + int mCount; // _08 +}; + +#endif diff --git a/include/Vector.h b/include/Vector.h index 2794e17c..7da6f082 100644 --- a/include/Vector.h +++ b/include/Vector.h @@ -131,7 +131,8 @@ struct Quat { // unused/inlined: void multiplyTo(Quat&, Quat&); - // TODO: members + Vector3f v; // _00, vector part + f32 s; // _0C, scalar part }; inline Vector3f operator-(const Vector3f& a, const Vector3f& b) { return Vector3f(a.x - b.x, a.y - b.y, a.z - b.z); } diff --git a/include/ViewPiki.h b/include/ViewPiki.h index 64bbfca2..cc4fe785 100644 --- a/include/ViewPiki.h +++ b/include/ViewPiki.h @@ -25,6 +25,9 @@ struct ViewPiki : public Piki { void init(Shape*, MapMgr*, Navi*); + // unused/inlined: + void refresh2d(Graphics&, int); + // _00 = VTBL // _00-_588 = Piki // TODO: members diff --git a/include/WorkObject.h b/include/WorkObject.h new file mode 100644 index 00000000..bdf85aa5 --- /dev/null +++ b/include/WorkObject.h @@ -0,0 +1,145 @@ +#ifndef _WORKOBJECT_H +#define _WORKOBJECT_H + +#include "types.h" +#include "ItemMgr.h" +#include "ObjectMgr.h" + +/** + * @brief TODO + */ +struct WorkObject : public ItemCreature { + WorkObject(); // unused/inlined + + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + virtual void doKill(); // _10C + virtual void finalSetup(); // _158 + virtual bool isBridge(); // _15C + virtual bool isHinderRock(); // _160 + virtual bool isFinished(); // _164 + virtual bool workable(Vector3f&); // _168 + + // _00 = VTBL + // _00-_??? = ItemCreature? + // TODO: members +}; + +/** + * @brief TODO + */ +struct WorkObjectMgr : public ObjectMgr { + WorkObjectMgr(); + + virtual Creature* getCreature(int); // _08 + virtual int getFirst(); // _0C + virtual int getNext(int); // _10 + virtual bool isDone(int); // _14 + virtual ~WorkObjectMgr(); // _48 + virtual int getSize(); // _60 + virtual int getMax(); // _64 + + void finalSetup(); + void loadShapes(); + void birth(int, int); + + // unused/inlined: + void getNameIndex(char*); + void getName(int); + void getShapeNameIndex(char*); + void getShapeName(int); + void addUseList(int); + + // _00 = VTBL 1 + // _08 = VTBL 2 + // _00-_28 = ObjectMgr? + // TODO: members +}; + +/** + * @brief TODO + */ +struct WorkObjectNode : public CoreNode { + + // _00 = VTBL + // _00-_14 = CoreNode + // TODO: members +}; + +/** + * @brief TODO + */ +struct Bridge : public WorkObject { + Bridge(Shape*, bool); + + virtual bool insideSafeArea(Vector3f&); // _10 + virtual bool alwaysUpdatePlatform(); // _18 + virtual void startAI(int); // _34 + virtual void doSave(RandomAccessStream&); // _50 + virtual void doLoad(RandomAccessStream&); // _54 + virtual void stimulate(Interaction&); // _A0 + virtual void dump(); // _C8 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void finalSetup(); // _158 + virtual bool isBridge(); // _15C + virtual bool isFinished(); // _164 + virtual bool workable(Vector3f&); // _168 + + void getFirstUnfinishedStage(); + void getFirstFinishedStage(); + void getJointIndex(int); + bool isStageFinished(int); + void flatten(); + void setStageFinished(int, bool); + void getStagePos(int); + void getStageZ(int); + void getBridgePos(Vector3f&, f32&, f32&); + void getBridgeZVec(); + void getBridgeXVec(); + void getStartPos(); + f32 getStageDepth(); + f32 getStageWidth(); + void startStageFinished(int, bool); + + // _00 = VTBL + // _00-_??? = WorkObject? + // TODO: members +}; + +/** + * @brief TODO + */ +struct HinderRock : public WorkObject { + HinderRock(Shape*); + + virtual bool insideSafeArea(Vector3f&); // _10 + virtual void startAI(int); // _34 + virtual void doSave(RandomAccessStream&); // _50 + virtual void doLoad(RandomAccessStream&); // _54 + virtual f32 getCentreSize(); // _5C + virtual void stimulate(Interaction&); // _A0 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual bool isHinderRock(); // _160 + virtual bool isFinished(); // _164 + virtual bool workable(Vector3f&); // _168 + + void beginPush(); + void endPush(); + void getZVector(); + void getXVector(); + void getPlaneFlag(Vector3f&); + void updatePlanes(); + void getVertex(int); + + // unused/inlined: + void getPlaneIndex(Vector3f&); + void getTangentPos(f32); + + // _00 = VTBL + // _00-_??? = WorkObject? + // TODO: members +}; + +#endif diff --git a/include/zen/CallBack.h b/include/zen/CallBack.h new file mode 100644 index 00000000..4b077113 --- /dev/null +++ b/include/zen/CallBack.h @@ -0,0 +1,30 @@ +#ifndef _ZEN_CALLBACK_H +#define _ZEN_CALLBACK_H + +#include "types.h" + +namespace zen { + +/* + * @brief TODO + */ +template +struct CallBack1 { + virtual bool invoke(A) = 0; // _08 + + // TODO: members +}; + +/* + * @brief TODO + */ +template +struct CallBack2 { + virtual bool invoke(A, B) = 0; // _08 + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/bBoardColourAnim.h b/include/zen/bBoardColourAnim.h new file mode 100644 index 00000000..18ffe0a6 --- /dev/null +++ b/include/zen/bBoardColourAnim.h @@ -0,0 +1,31 @@ +#ifndef _ZEN_BBOARDCOLOURANIM_H +#define _ZEN_BBOARDCOLOURANIM_H + +#include "types.h" + +struct Colour; + +namespace zen { + +/* + * @brief TODO + */ +struct bBoardColourAnimData { + void set(u8*); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct bBoardColourAnim { + void update(f32, Colour*, Colour*); + void init(zen::bBoardColourAnimData*, s16); + + // TODO: members +}; + +} // namespace zen + +#endif diff --git a/include/zen/ogSub.h b/include/zen/ogSub.h new file mode 100644 index 00000000..cc6ce95f --- /dev/null +++ b/include/zen/ogSub.h @@ -0,0 +1,31 @@ +#ifndef _ZEN_OGSUB_H +#define _ZEN_OGSUB_H + +#include "types.h" + +struct Matrix3f; +struct P2DPicture; +struct P2DScreen; +struct P2DTextBox; +struct Vector3f; + +namespace zen { + +// global utility functions +void ogCheckInsCard(); +void calcPuruPuruScale(f32); +void setNumberTag(P2DScreen*, u32, int*, int); +void setTextColor(P2DTextBox*, P2DPicture*); +void getStringCVS(char*, char*, s16); +void getSpecialNumber(int); +void setSpecialNumber(int, int); +void cnvSpecialNumber(char*); +void cnvSpecialNumberHyphen(char*); +void getDistPointAndLine(Vector3f, Vector3f, Vector3f, f32&); +void makeRotMatrix(Vector3f&, Matrix3f&); +void makePathName(const char*, const char*, char*); +void loadTexExp(const char*, bool, bool); + +} // namespace zen + +#endif diff --git a/include/zen/particle.h b/include/zen/particle.h new file mode 100644 index 00000000..c4d6cab6 --- /dev/null +++ b/include/zen/particle.h @@ -0,0 +1,231 @@ +#ifndef _ZEN_PARTICLE_H +#define _ZEN_PARTICLE_H + +#include "types.h" +#include "zen/zenList.h" +#include "Dolphin/mtx.h" + +struct Colour; +struct Graphics; +struct Texture; +struct Vector3f; + +namespace zen { +template +struct CallBack1; + +template +struct CallBack2; + +struct particleMdl; +struct particleMdlManager; + +/* + * @brief TODO + */ +enum ParticleGeneratorFlags { + PTCLGEN_Unk1 = 0x1, + PTCLGEN_GenFinished = 0x2, + PTCLGEN_Unk3 = 0x4, + PTCLGEN_GenStopped = 0x8, +}; + +/* + * @brief TODO + */ +struct particleMdlBase : public zenList { + virtual void remove(); // _0C + + // unused/inlined: + ~particleMdlBase(); + + // _00 = VTBL + // _00-_0C = zenList + // TODO: members +}; + +/* + * @brief TODO + */ +struct particleMdl : public particleMdlBase { + particleMdl(); + + virtual void remove(); // _0C + + ~particleMdl(); + + // _00 = VTBL + // _00-_0C = particleMdlBase? + // TODO: members +}; + +/* + * @brief TODO + */ +struct particleChildMdl : public particleMdlBase { + particleChildMdl(); + + virtual void remove(); // _0C + + ~particleChildMdl(); + + // _00 = VTBL + // _00-_0C = particleMdlBase? + // TODO: members +}; + +/* + * @brief TODO + */ +struct particleMdlManager { + void init(u32, u32); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct particleGenerator : public zenList { + particleGenerator(); + + virtual void remove(); // _0C + + ~particleGenerator(); + + void getGPos(); + void init(u8*, Texture*, Texture*, Vector3f&, particleMdlManager*, CallBack1*, + CallBack2*); + void update(f32); + void draw(Graphics&); + void pmSetDDF(u8*); + void SetPtclsLife(); + void PtclsGen(particleMdl*); + void pmCalcAccel(particleMdl*); + void UpdatePtclsStatus(f32); + void ClearPtclsStatus(Texture*, Texture*); + void drawPtclBillboard(Graphics&); + void drawPtclOriented(Graphics&); + void RotAxisX(Mtx&, f32&, f32&); + void RotAxisY(Mtx&, f32&, f32&); + void RotAxisZ(Mtx&, f32&, f32&); + void RotAxisXY(Mtx&, f32&, f32&); + void RotAxisXZ(Mtx&, f32&, f32&); + void RotAxisYZ(Mtx&, f32&, f32&); + void RotAxisXYZ(Mtx&, f32&, f32&); + void updatePtclChildren(f32); + void drawPtclChildren(Graphics&); + void forceFinish(); + void finish(CallBack1*, CallBack2*); + void forceFinish(CallBack1*, CallBack2*); + void pmGetParticle(); + void pmGetParticleChild(); + + // unused/inlined: + void pmIntpManual(f32*, f32*); + void pmIntpLinear(f32*, f32*); + + inline void setFlag(u32 flag) { mGeneratorFlags |= flag; } + inline void resetFlag(u32 flag) { mGeneratorFlags &= ~flag; } + inline bool isFlag(u32 flag) { return mGeneratorFlags & flag; } + + // _00 = VTBL + // _00-_0C = zenList + // TODO: members + u8 _0C[0x18 - 0xC]; // _0C, unknown + Vector3f* mEmitPosPtr; // _18 + u8 _1C[0x80 - 0x1C]; // _1C, unknown + u32 mGeneratorFlags; // _80 +}; + +/* + * @brief TODO + */ +struct particleManager { + void init(u32, u32, u32, f32); + void createGenerator(u8*, Texture*, Texture*, Vector3f&, CallBack1*, CallBack2*); + void update(); + void draw(Graphics&); + void cullingDraw(Graphics&); + void killAllGenarator(bool); + void killGenerator(particleGenerator*, bool); + void killGenerator(CallBack1*, CallBack2*, bool); + void pmCheckList(particleGenerator*); + void pmGetPtclGen(); + + // unused/inlined: + ~particleManager(); + void calcActiveList(); + void debugUpdate(); + void debugDraw(Graphics&); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct PCRData : public zenList { + + // _00 = VTBL + // _00-_0C = zenList + // TODO: members +}; + +/* + * @brief TODO + */ +struct particleLoader { + void load(char*, bool); + void pmFind(char*); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct simplePtclManager { + void update(f32); + void draw(Graphics&); + void forceFinish(); + + // unused/inlined: + void create(Texture*, s16, const Vector3f&, const Vector3f&, const Vector3f&, f32, f32, const Colour&, const Colour&, + zen::CallBack1*); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct PtclGenPack { + void setPtclGenPtr(u32, particleGenerator*); + void setEmitPosPtr(Vector3f*); + void startGen(); + void stopGen(); + void finish(); + void forceFinish(); + bool checkStopGen(); + + // unused/inlined: + particleGenerator* getPtclGenPtr(u32 idx); + void setEmitPos(Vector3f&); + void setEmitDir(Vector3f&); + void setCallBack(CallBack1*, CallBack2*); + void start(); + void stop(); + void checkStop(); + void checkEmit(); + void checkActive(); + + inline particleGenerator** getGenList() { return mGeneratorList; } + + u32 mLimit; // _00 + particleGenerator** mGeneratorList; // _04 +}; + +} // namespace zen + +#endif diff --git a/unsorted_include_todo/zen/zenList.h b/include/zen/zenList.h similarity index 50% rename from unsorted_include_todo/zen/zenList.h rename to include/zen/zenList.h index 6e44b2eb..e4d2dda2 100644 --- a/unsorted_include_todo/zen/zenList.h +++ b/include/zen/zenList.h @@ -1,22 +1,36 @@ #ifndef _ZEN_ZENLIST_H #define _ZEN_ZENLIST_H -/** - * .obj __vt__Q23zen7zenList, weak - * .4byte __RTTI__Q23zen7zenList - * .4byte 0 - * .4byte insertAfter__Q23zen7zenListFPQ23zen7zenList - * .4byte remove__Q23zen7zenListFv - */ +#include "types.h" namespace zen { + /** * @brief TODO */ struct zenList { virtual void insertAfter(zenList*); // _08 virtual void remove(); // _0C + + // _00 = VTBL + zenList* mPrev; // _04 + zenList* mNext; // _08 }; + +/** + * @brief TODO + */ +struct zenListManager { + zenListManager(); + + void get(); + + // unused/inlined: + ~zenListManager(); + + // TODO: members +}; + } // namespace zen #endif diff --git a/src/plugPikiColin/mapMgr.cpp b/src/plugPikiColin/mapMgr.cpp index 75bd51d9..585b8624 100644 --- a/src/plugPikiColin/mapMgr.cpp +++ b/src/plugPikiColin/mapMgr.cpp @@ -9481,7 +9481,7 @@ void MapMgr::loadPlatshape(char*) * Address: 80069494 * Size: 00009C */ -void MapMgr::requestCollPart(ObjCollInfo*, Creature*) +CollPart* MapMgr::requestCollPart(ObjCollInfo*, Creature*) { /* .loc_0x0: diff --git a/src/plugPikiKando/aiAction.cpp b/src/plugPikiKando/aiAction.cpp index ba96ff0d..26c536ad 100644 --- a/src/plugPikiKando/aiAction.cpp +++ b/src/plugPikiKando/aiAction.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -373,7 +373,7 @@ Action::Child::~Child() void Action::init(Creature*) { // Generated from sth r0, 0x8(r3) - _08 = 0; + // _08 = 0; } /* @@ -381,7 +381,7 @@ void Action::init(Creature*) * Address: 800C3F0C * Size: 000008 */ -u32 Action::exec() { return 0x2; } +int Action::exec() { return 2; } /* * --INFO-- @@ -464,7 +464,7 @@ void AndAction::init(Creature*) * Address: 800C3FF4 * Size: 00014C */ -void AndAction::exec() +int AndAction::exec() { /* .loc_0x0: @@ -651,7 +651,7 @@ void OrAction::init(Creature*) * Address: 800C4220 * Size: 000150 */ -void OrAction::exec() +int OrAction::exec() { /* .loc_0x0: @@ -993,7 +993,8 @@ void TopAction::MotionListener::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800C45F0 * Size: 00064C */ -TopAction::TopAction(Piki*) +TopAction::TopAction(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -1602,7 +1603,7 @@ void TopAction::init(Creature*) * Address: 800C4DAC * Size: 000598 */ -void TopAction::exec() +int TopAction::exec() { /* .loc_0x0: @@ -2087,7 +2088,7 @@ void TopAction::abandon(zen::particleGenerator*) * Address: 800C53C8 * Size: 00004C */ -void TopAction::resumable() +bool TopAction::resumable() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiActions.cpp b/src/plugPikiKando/aiActions.cpp index b3470b37..819ebb97 100644 --- a/src/plugPikiKando/aiActions.cpp +++ b/src/plugPikiKando/aiActions.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800A79F8 * Size: 000080 */ -ActPick::ActPick(Piki*) +ActPick::ActPick(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -243,7 +244,7 @@ void ActPick::cleanup() * Address: 800A7C48 * Size: 0000B4 */ -void ActPick::exec() +int ActPick::exec() { /* .loc_0x0: @@ -306,7 +307,8 @@ void ActPick::exec() * Address: ........ * Size: 000040 */ -ActPut::ActPut(Piki*) +ActPut::ActPut(Piki* piki) + : Action(piki, false) { // UNUSED FUNCTION } @@ -345,7 +347,7 @@ void ActPut::cleanup() { } * Address: 800A7D10 * Size: 0000D8 */ -void ActPut::exec() +int ActPut::exec() { /* .loc_0x0: @@ -419,7 +421,8 @@ void ActPut::exec() * Address: 800A7DE8 * Size: 00006C */ -ActAdjust::ActAdjust(Piki*) +ActAdjust::ActAdjust(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -638,7 +641,7 @@ void ActAdjust::cleanup() * Address: 800A807C * Size: 00011C */ -void ActAdjust::exec() +int ActAdjust::exec() { /* .loc_0x0: @@ -857,17 +860,3 @@ ActPick::~ActPick() blr */ } - -/* - * --INFO-- - * Address: 800A82E0 - * Size: 000008 - */ -void ActPick::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x868 - */ -} diff --git a/src/plugPikiKando/aiAttack.cpp b/src/plugPikiKando/aiAttack.cpp index 26e29ab1..691ec49a 100644 --- a/src/plugPikiKando/aiAttack.cpp +++ b/src/plugPikiKando/aiAttack.cpp @@ -1,4 +1,4 @@ -#include "Action.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 800A82E8 * Size: 0000C8 */ -ActAttack::ActAttack(Piki*) +ActAttack::ActAttack(Piki* piki) { /* .loc_0x0: @@ -336,7 +336,7 @@ void ActAttack::animationKeyUpdated(PaniAnimKeyEvent&) void ActAttack::resume() { // Generated from stb r0, 0x1C(r3) - _1C = 0; + // _1C = 0; } /* @@ -379,14 +379,14 @@ void ActAttack::restart() * Address: 800A86C0 * Size: 000008 */ -u32 ActAttack::resumable() { return 0x1; } +bool ActAttack::resumable() { return true; } /* * --INFO-- * Address: 800A86C8 * Size: 000008 */ -u32 ActAttack::findTarget() { return 0x0; } +Creature* ActAttack::findTarget() { return nullptr; } /* * --INFO-- @@ -403,7 +403,7 @@ void ActAttack::decideTarget() * Address: 800A86D0 * Size: 00033C */ -void ActAttack::exec() +int ActAttack::exec() { /* .loc_0x0: @@ -699,7 +699,8 @@ void ActAttack::cleanup() * Address: 800A8A70 * Size: 000060 */ -ActJumpAttack::ActJumpAttack(Piki*) +ActJumpAttack::ActJumpAttack(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -1162,7 +1163,7 @@ void ActJumpAttack::procCollideMsg(Piki*, MsgCollide*) * Address: 800A8FBC * Size: 000E6C */ -void ActJumpAttack::exec() +int ActJumpAttack::exec() { /* .loc_0x0: @@ -2764,31 +2765,3 @@ ActAttack::~ActAttack() blr */ } - -/* - * --INFO-- - * Address: 800AA50C - * Size: 000008 - */ -void ActAttack::@24 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x18 - b -0x1FAC - */ -} - -/* - * --INFO-- - * Address: 800AA514 - * Size: 000008 - */ -void ActJumpAttack::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x678 - */ -} diff --git a/src/plugPikiKando/aiBoMake.cpp b/src/plugPikiKando/aiBoMake.cpp index 8ca8191e..209bb688 100644 --- a/src/plugPikiKando/aiBoMake.cpp +++ b/src/plugPikiKando/aiBoMake.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800AC30C * Size: 000054 */ -ActBoMake::ActBoMake(Piki*) +ActBoMake::ActBoMake(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -88,7 +89,7 @@ void ActBoMake::init(Creature*) * Address: 800AC3A0 * Size: 0000A0 */ -void ActBoMake::exec() +int ActBoMake::exec() { /* .loc_0x0: @@ -189,7 +190,7 @@ void ActBoMake::initApproach() * Address: 800AC4A4 * Size: 00012C */ -void ActBoMake::exeApproach() +int ActBoMake::exeApproach() { /* .loc_0x0: @@ -345,7 +346,7 @@ void ActBoMake::initWork() * Address: 800AC684 * Size: 000008 */ -u32 ActBoMake::exeWork() { return 0x0; } +int ActBoMake::exeWork() { return 0; } /* * --INFO-- @@ -454,17 +455,3 @@ ActBoMake::~ActBoMake() blr */ } - -/* - * --INFO-- - * Address: 800AC794 - * Size: 000008 - */ -void ActBoMake::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0xE8 - */ -} diff --git a/src/plugPikiKando/aiBore.cpp b/src/plugPikiKando/aiBore.cpp index 52c714cd..02d471f4 100644 --- a/src/plugPikiKando/aiBore.cpp +++ b/src/plugPikiKando/aiBore.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800AA51C * Size: 000108 */ -ActFreeSelect::ActFreeSelect(Piki*) +ActFreeSelect::ActFreeSelect(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -239,7 +240,7 @@ void ActFreeSelect::finishRest() * Address: 800AA79C * Size: 000108 */ -void ActFreeSelect::exec() +int ActFreeSelect::exec() { /* .loc_0x0: @@ -608,7 +609,8 @@ void ActFreeSelect::determine() * Address: 800AABF8 * Size: 000104 */ -ActBoreSelect::ActBoreSelect(Piki*) +ActBoreSelect::ActBoreSelect(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -771,7 +773,7 @@ void ActBoreSelect::init(Creature*) void ActBoreSelect::stop() { // Generated from stb r0, 0x1A(r3) - _1A = 1; + // _1A = 1; } /* @@ -779,7 +781,7 @@ void ActBoreSelect::stop() * Address: 800AADFC * Size: 000184 */ -void ActBoreSelect::exec() +int ActBoreSelect::exec() { /* .loc_0x0: @@ -1254,7 +1256,8 @@ void ActBoreSelect::determine() * Address: 800AB390 * Size: 000080 */ -ActBoreTalk::ActBoreTalk(Piki*) +ActBoreTalk::ActBoreTalk(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -1539,7 +1542,7 @@ void ActBoreTalk::startTalk() * Address: 800AB70C * Size: 000128 */ -void ActBoreTalk::exec() +int ActBoreTalk::exec() { /* .loc_0x0: @@ -1665,7 +1668,8 @@ void ActBoreTalk::animationKeyUpdated(PaniAnimKeyEvent&) * Address: ........ * Size: 000040 */ -ActBoreListen::ActBoreListen(Piki*) +ActBoreListen::ActBoreListen(Piki* piki) + : Action(piki, false) { // UNUSED FUNCTION } @@ -1682,7 +1686,7 @@ void ActBoreListen::init(Creature*) { } * Address: 800AB860 * Size: 000008 */ -u32 ActBoreListen::exec() { return 0x0; } +int ActBoreListen::exec() { return 0; } /* * --INFO-- @@ -1703,7 +1707,8 @@ void ActBoreListen::procAnimMsg(Piki*, MsgAnim*) { } * Address: 800AB870 * Size: 000080 */ -ActBoreOneshot::ActBoreOneshot(Piki*) +ActBoreOneshot::ActBoreOneshot(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -1847,7 +1852,7 @@ void ActBoreOneshot::init(Creature*) * Address: 800ABA08 * Size: 00001C */ -void ActBoreOneshot::exec() +int ActBoreOneshot::exec() { /* .loc_0x0: @@ -1893,7 +1898,8 @@ void ActBoreOneshot::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800ABA40 * Size: 000080 */ -ActBoreRest::ActBoreRest(Piki*) +ActBoreRest::ActBoreRest(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -2078,7 +2084,7 @@ void ActBoreRest::standUp() * Address: 800ABC34 * Size: 0002E8 */ -void ActBoreRest::exec() +int ActBoreRest::exec() { /* .loc_0x0: @@ -2667,54 +2673,3 @@ ActFreeSelect::~ActFreeSelect() blr */ } - -/* - * --INFO-- - * Address: 800AC2D0 - * Size: 000014 - */ -void ActBoreTalk::@40 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x28 - b -0xAA8 - */ -} - -/* - * --INFO-- - * Address: 800AC2E4 - * Size: 000014 - */ -void ActBoreOneshot::@28 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x1C - b -0x8CC - */ -} - -/* - * --INFO-- - * Address: 800AC2F8 - * Size: 000014 - */ -void ActBoreRest::@40 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x28 - b -0x3E8 - */ -} diff --git a/src/plugPikiKando/aiBou.cpp b/src/plugPikiKando/aiBou.cpp index e300e2e2..fef52a7e 100644 --- a/src/plugPikiKando/aiBou.cpp +++ b/src/plugPikiKando/aiBou.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800AC79C * Size: 00006C */ -ActBou::ActBou(Piki*) +ActBou::ActBou(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -124,7 +125,7 @@ void ActBou::init(Creature*) * Address: 800AC8B0 * Size: 00004C */ -void ActBou::exec() +int ActBou::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiBreakWall.cpp b/src/plugPikiKando/aiBreakWall.cpp index dfd1ce42..e4d8a6ea 100644 --- a/src/plugPikiKando/aiBreakWall.cpp +++ b/src/plugPikiKando/aiBreakWall.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "PikiAI.h" +#include "BuildingItem.h" /* * --INFO-- @@ -25,7 +26,8 @@ static void _Print(char*, ...) * Address: 800AE13C * Size: 000070 */ -ActBreakWall::ActBreakWall(Piki*) +ActBreakWall::ActBreakWall(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -367,7 +369,7 @@ void ActBreakWall::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800AE554 * Size: 000148 */ -void ActBreakWall::exec() +int ActBreakWall::exec() { /* .loc_0x0: @@ -477,7 +479,7 @@ void ActBreakWall::exec() * Address: 800AE69C * Size: 000020 */ -void BuildingItem::isAlive() +bool BuildingItem::isAlive() { /* .loc_0x0: @@ -970,17 +972,3 @@ ActBreakWall::~ActBreakWall() blr */ } - -/* - * --INFO-- - * Address: 800AEC78 - * Size: 000008 - */ -void ActBreakWall::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x8B8 - */ -} diff --git a/src/plugPikiKando/aiBridge.cpp b/src/plugPikiKando/aiBridge.cpp index a255b2f2..5c80227b 100644 --- a/src/plugPikiKando/aiBridge.cpp +++ b/src/plugPikiKando/aiBridge.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800ACEA0 * Size: 0000AC */ -ActBridge::ActBridge(Piki*) +ActBridge::ActBridge(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -210,7 +211,7 @@ void ActBridge::collideBridgeBlocker() * Address: 800AD094 * Size: 000094 */ -void ActBridge::exec() +int ActBridge::exec() { /* .loc_0x0: @@ -1643,20 +1644,3 @@ ActBridge::~ActBridge() blr */ } - -/* - * --INFO-- - * Address: 800AE128 - * Size: 000014 - */ -void ActBridge::@80 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x50 - b -0xFE8 - */ -} diff --git a/src/plugPikiKando/aiChase.cpp b/src/plugPikiKando/aiChase.cpp index 41838473..d87117af 100644 --- a/src/plugPikiKando/aiChase.cpp +++ b/src/plugPikiKando/aiChase.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B5688 * Size: 00006C */ -ActChase::ActChase(Piki*) +ActChase::ActChase(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -172,7 +173,7 @@ void ActChase::cleanup() * Address: 800B580C * Size: 00023C */ -void ActChase::exec() +int ActChase::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiCrowd.cpp b/src/plugPikiKando/aiCrowd.cpp index 32eff7f0..2db9a1c9 100644 --- a/src/plugPikiKando/aiCrowd.cpp +++ b/src/plugPikiKando/aiCrowd.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B5AAC * Size: 0000FC */ -ActCrowd::ActCrowd(Piki*) +ActCrowd::ActCrowd(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -107,7 +108,7 @@ ActCrowd::ActCrowd(Piki*) void ActCrowd::inform(int a1) { // Generated from stw r4, 0x58(r3) - _58 = a1; + // _58 = a1; } /* @@ -549,7 +550,7 @@ void ActCrowd::cleanup() * Address: 800B6068 * Size: 00164C */ -void ActCrowd::exec() +int ActCrowd::exec() { /* .loc_0x0: @@ -2241,21 +2242,4 @@ ActCrowd::~ActCrowd() * Address: 800B7790 * Size: 000008 */ -u32 ActCrowd::resumable() { return 0x1; } - -/* - * --INFO-- - * Address: 800B7798 - * Size: 000014 - */ -void ActCrowd::@128 @4 @inform(int) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x80 - b -0x1C00 - */ -} +bool ActCrowd::resumable() { return true; } diff --git a/src/plugPikiKando/aiDecoy.cpp b/src/plugPikiKando/aiDecoy.cpp index d757b281..eaa5f643 100644 --- a/src/plugPikiKando/aiDecoy.cpp +++ b/src/plugPikiKando/aiDecoy.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B77AC * Size: 000054 */ -ActDecoy::ActDecoy(Piki*) +ActDecoy::ActDecoy(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -239,7 +240,7 @@ void ActDecoy::animationKeyUpdated(PaniAnimKeyEvent&) { } * Address: 800B79DC * Size: 000514 */ -void ActDecoy::exec() +int ActDecoy::exec() { /* .loc_0x0: @@ -639,17 +640,3 @@ ActDecoy::~ActDecoy() blr */ } - -/* - * --INFO-- - * Address: 800B7F5C - * Size: 000008 - */ -void ActDecoy::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x588 - */ -} diff --git a/src/plugPikiKando/aiEnter.cpp b/src/plugPikiKando/aiEnter.cpp index 370a4524..2594baf4 100644 --- a/src/plugPikiKando/aiEnter.cpp +++ b/src/plugPikiKando/aiEnter.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B7F64 * Size: 000060 */ -ActEnter::ActEnter(Piki*) +ActEnter::ActEnter(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -282,7 +283,7 @@ void ActEnter::findLeg() * Address: 800B8280 * Size: 0000E8 */ -void ActEnter::exec() +int ActEnter::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiEscape.cpp b/src/plugPikiKando/aiEscape.cpp index cc4f068f..7b0dc1b5 100644 --- a/src/plugPikiKando/aiEscape.cpp +++ b/src/plugPikiKando/aiEscape.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B8828 * Size: 00007C */ -ActEscape::ActEscape(Piki*) +ActEscape::ActEscape(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -185,7 +186,7 @@ void ActEscape::cleanup() * Address: 800B89E0 * Size: 0002CC */ -void ActEscape::exec() +int ActEscape::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiExit.cpp b/src/plugPikiKando/aiExit.cpp index 664e9c3d..346e8b39 100644 --- a/src/plugPikiKando/aiExit.cpp +++ b/src/plugPikiKando/aiExit.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B8D68 * Size: 000060 */ -ActExit::ActExit(Piki*) +ActExit::ActExit(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -144,7 +145,7 @@ void ActExit::procCollideMsg(Piki*, MsgCollide*) * Address: 800B8EB4 * Size: 0002E8 */ -void ActExit::exec() +int ActExit::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiFormation.cpp b/src/plugPikiKando/aiFormation.cpp index ceeb2dca..bfe5b3c6 100644 --- a/src/plugPikiKando/aiFormation.cpp +++ b/src/plugPikiKando/aiFormation.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -260,7 +260,8 @@ void ActFormation::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800B9C04 * Size: 00005C */ -ActFormation::ActFormation(Piki*) +ActFormation::ActFormation(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -513,7 +514,7 @@ void ActFormation::cleanup() * Address: 800B9EE8 * Size: 0006A4 */ -void ActFormation::exec() +int ActFormation::exec() { /* .loc_0x0: @@ -1027,17 +1028,3 @@ ActFormation::~ActFormation() blr */ } - -/* - * --INFO-- - * Address: 800BA5F8 - * Size: 000008 - */ -void ActFormation::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0xD24 - */ -} diff --git a/src/plugPikiKando/aiFree.cpp b/src/plugPikiKando/aiFree.cpp index 8b9a28e5..93a2d340 100644 --- a/src/plugPikiKando/aiFree.cpp +++ b/src/plugPikiKando/aiFree.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BA600 * Size: 0000CC */ -ActFree::ActFree(Piki*) +ActFree::ActFree(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -570,7 +571,7 @@ void ActFree::animationKeyUpdated(PaniAnimKeyEvent&) { } * Address: 800BAD04 * Size: 0000F0 */ -void ActFree::exec() +int ActFree::exec() { /* .loc_0x0: @@ -772,21 +773,4 @@ ActFree::~ActFree() * Address: 800BAF4C * Size: 000008 */ -u32 ActFree::resumable() { return 0x1; } - -/* - * --INFO-- - * Address: 800BAF54 - * Size: 000014 - */ -void ActFree::@72 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x48 - b -0x264 - */ -} +bool ActFree::resumable() { return true; } diff --git a/src/plugPikiKando/aiGoto.cpp b/src/plugPikiKando/aiGoto.cpp index e9b14fef..d2ff2b82 100644 --- a/src/plugPikiKando/aiGoto.cpp +++ b/src/plugPikiKando/aiGoto.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BAF68 * Size: 00004C */ -ActGoto::ActGoto(Piki*) +ActGoto::ActGoto(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -202,7 +203,7 @@ void ActGoto::cleanup() * Address: 800BB144 * Size: 000378 */ -void ActGoto::exec() +int ActGoto::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiGuard.cpp b/src/plugPikiKando/aiGuard.cpp index 9c8f9653..de2cefde 100644 --- a/src/plugPikiKando/aiGuard.cpp +++ b/src/plugPikiKando/aiGuard.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BB534 * Size: 000084 */ -ActGuard::ActGuard(Piki*) +ActGuard::ActGuard(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -251,7 +252,7 @@ void ActGuard::dump() * Address: 800BB7A4 * Size: 00071C */ -void ActGuard::exec() +int ActGuard::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiKinoko.cpp b/src/plugPikiKando/aiKinoko.cpp index 201aca8e..577bbfa4 100644 --- a/src/plugPikiKando/aiKinoko.cpp +++ b/src/plugPikiKando/aiKinoko.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B4570 * Size: 0000A4 */ -ActKinoko::ActKinoko(Piki*) +ActKinoko::ActKinoko(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -128,7 +129,7 @@ void ActKinoko::init(Creature*) * Address: 800B4694 * Size: 00006C */ -void ActKinoko::exec() +int ActKinoko::exec() { /* .loc_0x0: @@ -352,7 +353,7 @@ void ActKinoko::exeJump() void ActKinoko::initAttack() { // Generated from stw r0, 0x1C(r3) - _1C = 1; + // _1C = 1; } /* @@ -1380,20 +1381,3 @@ ActKinoko::~ActKinoko() blr */ } - -/* - * --INFO-- - * Address: 800B5674 - * Size: 000014 - */ -void ActKinoko::@48 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x30 - b -0x12C - */ -} diff --git a/src/plugPikiKando/aiMine.cpp b/src/plugPikiKando/aiMine.cpp index 0c987f0f..42717351 100644 --- a/src/plugPikiKando/aiMine.cpp +++ b/src/plugPikiKando/aiMine.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800B92C0 * Size: 000080 */ -ActMine::ActMine(Piki*) +ActMine::ActMine(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -307,7 +308,7 @@ void ActMine::exeMine() * Address: 800B9580 * Size: 000200 */ -void ActMine::exec() +int ActMine::exec() { /* .loc_0x0: @@ -584,20 +585,3 @@ ActMine::~ActMine() blr */ } - -/* - * --INFO-- - * Address: 800B98C4 - * Size: 000014 - */ -void ActMine::@40 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x28 - b -0x150 - */ -} diff --git a/src/plugPikiKando/aiPerf.cpp b/src/plugPikiKando/aiPerf.cpp index 38b1570f..a75b34f7 100644 --- a/src/plugPikiKando/aiPerf.cpp +++ b/src/plugPikiKando/aiPerf.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "AIPerf.h" +#include "WorkObject.h" +#include "Delegate.h" /* * --INFO-- @@ -2331,7 +2333,7 @@ void AIPerf::breakSluice(Menu&) * Address: 80086470 * Size: 000008 */ -u32 WorkObject::isBridge() { return 0x0; } +bool WorkObject::isBridge() { return false; } /* * --INFO-- diff --git a/src/plugPikiKando/aiPick.cpp b/src/plugPikiKando/aiPick.cpp index ebe22ce4..fd47e677 100644 --- a/src/plugPikiKando/aiPick.cpp +++ b/src/plugPikiKando/aiPick.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BCAFC * Size: 0000E0 */ -ActPickItem::ActPickItem(Piki*) +ActPickItem::ActPickItem(Piki* piki) + : AndAction(piki) { /* .loc_0x0: @@ -287,7 +288,7 @@ void ActPickItem::init(Creature*) * Address: 800BCE0C * Size: 0000E8 */ -void ActPickItem::exec() +int ActPickItem::exec() { /* .loc_0x0: @@ -397,7 +398,8 @@ void ActPickItem::cleanup() * Address: ........ * Size: 000080 */ -ActFlower::ActFlower(Piki*) +ActFlower::ActFlower(Piki* piki) + : Action(piki, false) { // UNUSED FUNCTION } @@ -636,7 +638,7 @@ void ActFlower::cleanup() * Address: 800BD1E8 * Size: 000074 */ -void ActFlower::exec() +int ActFlower::exec() { /* .loc_0x0: @@ -768,20 +770,3 @@ ActPickItem::~ActPickItem() blr */ } - -/* - * --INFO-- - * Address: 800BD350 - * Size: 000014 - */ -void ActFlower::@32 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x20 - b -0x2D0 - */ -} diff --git a/src/plugPikiKando/aiPickCreature.cpp b/src/plugPikiKando/aiPickCreature.cpp index 7219cdc2..f9ab898f 100644 --- a/src/plugPikiKando/aiPickCreature.cpp +++ b/src/plugPikiKando/aiPickCreature.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BD364 * Size: 0000CC */ -ActPickCreature::ActPickCreature(Piki*) +ActPickCreature::ActPickCreature(Piki* piki) + : AndAction(piki) { /* .loc_0x0: @@ -122,7 +123,8 @@ void ActPickCreature::InitGoto::initialise(Action*, Action*) * Address: ........ * Size: 00019C */ -ActDeliver::ActDeliver(Piki*) +ActDeliver::ActDeliver(Piki* piki) + : AndAction(piki) { // UNUSED FUNCTION } @@ -272,7 +274,7 @@ ActDeliver::~ActDeliver() void ActDeliver::defaultInitialiser() { // Generated from stw r0, 0x18(r3) - _18 = 0; + // _18 = 0; } /* diff --git a/src/plugPikiKando/aiPullout.cpp b/src/plugPikiKando/aiPullout.cpp index 4aa5f975..1e43894e 100644 --- a/src/plugPikiKando/aiPullout.cpp +++ b/src/plugPikiKando/aiPullout.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BD670 * Size: 000100 */ -ActPullout::ActPullout(Piki*) +ActPullout::ActPullout(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -295,7 +296,7 @@ void ActPullout::init(Creature*) * Address: 800BD9C0 * Size: 0000DC */ -void ActPullout::exec() +int ActPullout::exec() { /* .loc_0x0: @@ -503,7 +504,8 @@ void ActPulloutCreature::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800BDBD8 * Size: 00005C */ -ActPulloutCreature::ActPulloutCreature(Piki*) +ActPulloutCreature::ActPulloutCreature(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -591,7 +593,7 @@ void ActPulloutCreature::init(Creature*) * Address: 800BDCC8 * Size: 000240 */ -void ActPulloutCreature::exec() +int ActPulloutCreature::exec() { /* .loc_0x0: @@ -845,17 +847,3 @@ ActPullout::~ActPullout() blr */ } - -/* - * --INFO-- - * Address: 800BDFE8 - * Size: 000008 - */ -void ActPulloutCreature::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x48C - */ -} diff --git a/src/plugPikiKando/aiPush.cpp b/src/plugPikiKando/aiPush.cpp index 3e8b4a7b..3e4b49ce 100644 --- a/src/plugPikiKando/aiPush.cpp +++ b/src/plugPikiKando/aiPush.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800BDFF0 * Size: 0000A0 */ -ActPush::ActPush(Piki*) +ActPush::ActPush(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -141,7 +142,7 @@ void ActPush::collideRockSurface() * Address: 800BE128 * Size: 0000CC */ -void ActPush::exec() +int ActPush::exec() { /* .loc_0x0: @@ -869,20 +870,3 @@ ActPush::~ActPush() blr */ } - -/* - * --INFO-- - * Address: 800BE9E0 - * Size: 000014 - */ -void ActPush::@72 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x48 - b -0x39C - */ -} diff --git a/src/plugPikiKando/aiPut.cpp b/src/plugPikiKando/aiPut.cpp index 721cc175..6fbac070 100644 --- a/src/plugPikiKando/aiPut.cpp +++ b/src/plugPikiKando/aiPut.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -79,7 +79,8 @@ void ActPutBomb::procCollideMsg(Piki*, MsgCollide*) * Address: 800BEA94 * Size: 000088 */ -ActPutBomb::ActPutBomb(Piki*) +ActPutBomb::ActPutBomb(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -633,7 +634,7 @@ void ActPutBomb::init(Creature*) void ActPutBomb::initSet() { // Generated from sth r0, 0x18(r3) - _18 = 2; + // _18 = 2; } /* @@ -1233,7 +1234,7 @@ void ActPutBomb::exeAim() void ActPutBomb::initWait() { // Generated from sth r0, 0x18(r3) - _18 = 4; + // _18 = 4; } /* @@ -1572,7 +1573,7 @@ void ActPutBomb::exePut() * Address: 800BFD00 * Size: 000210 */ -void ActPutBomb::exec() +int ActPutBomb::exec() { /* .loc_0x0: @@ -1781,7 +1782,8 @@ void ActPutBomb::cleanup() { } * Address: 800BFF4C * Size: 00005C */ -ActPutItem::ActPutItem(Piki*) +ActPutItem::ActPutItem(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -2424,7 +2426,7 @@ void ActPutItem::init(Creature*) * Address: 800C0760 * Size: 000178 */ -void ActPutItem::exec() +int ActPutItem::exec() { /* .loc_0x0: @@ -2645,20 +2647,3 @@ ActPutBomb::~ActPutBomb() blr */ } - -/* - * --INFO-- - * Address: 800C09FC - * Size: 000014 - */ -void ActPutBomb::@40 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x28 - b -0xAFC - */ -} diff --git a/src/plugPikiKando/aiRandomBoid.cpp b/src/plugPikiKando/aiRandomBoid.cpp index a7f5e308..36037e28 100644 --- a/src/plugPikiKando/aiRandomBoid.cpp +++ b/src/plugPikiKando/aiRandomBoid.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -243,7 +243,8 @@ void ActRandomBoid::AnimListener::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800C0D08 * Size: 00008C */ -ActRandomBoid::ActRandomBoid(Piki*) +ActRandomBoid::ActRandomBoid(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -376,7 +377,7 @@ void ActRandomBoid::cleanup() { } * Address: 800C0E84 * Size: 0003BC */ -void ActRandomBoid::exec() +int ActRandomBoid::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiRescue.cpp b/src/plugPikiKando/aiRescue.cpp index 9b50cc7d..6fff2b8a 100644 --- a/src/plugPikiKando/aiRescue.cpp +++ b/src/plugPikiKando/aiRescue.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800C12E8 * Size: 000098 */ -ActRescue::ActRescue(Piki*) +ActRescue::ActRescue(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -112,7 +113,7 @@ void ActRescue::init(Creature*) * Address: 800C13C4 * Size: 00014C */ -void ActRescue::exec() +int ActRescue::exec() { /* .loc_0x0: @@ -979,20 +980,3 @@ ActRescue::~ActRescue() blr */ } - -/* - * --INFO-- - * Address: 800C1E10 - * Size: 000014 - */ -void ActRescue::@52 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x34 - b -0x910 - */ -} diff --git a/src/plugPikiKando/aiRope.cpp b/src/plugPikiKando/aiRope.cpp index 4e28e0eb..711f77c2 100644 --- a/src/plugPikiKando/aiRope.cpp +++ b/src/plugPikiKando/aiRope.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800C1E24 * Size: 000060 */ -ActRope::ActRope(Piki*) +ActRope::ActRope(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -173,7 +174,7 @@ void ActRope::init(Creature*) * Address: 800C1FFC * Size: 000070 */ -void ActRope::exec() +int ActRope::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiShoot.cpp b/src/plugPikiKando/aiShoot.cpp index 47789cf2..aa0a491a 100644 --- a/src/plugPikiKando/aiShoot.cpp +++ b/src/plugPikiKando/aiShoot.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800C216C * Size: 000120 */ -ActShoot::ActShoot(Piki*) +ActShoot::ActShoot(Piki* piki) + : AndAction(piki) { /* .loc_0x0: @@ -315,7 +316,7 @@ void ActShoot::decideTarget() * Address: 800C24B4 * Size: 0001CC */ -void ActShoot::exec() +int ActShoot::exec() { /* .loc_0x0: @@ -591,7 +592,8 @@ void ActShootCreature::animationKeyUpdated(PaniAnimKeyEvent&) * Address: 800C27AC * Size: 00005C */ -ActShootCreature::ActShootCreature(Piki*) +ActShootCreature::ActShootCreature(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -676,7 +678,7 @@ void ActShootCreature::init(Creature*) * Address: 800C2890 * Size: 0002DC */ -void ActShootCreature::exec() +int ActShootCreature::exec() { /* .loc_0x0: @@ -973,17 +975,3 @@ ActShoot::~ActShoot() blr */ } - -/* - * --INFO-- - * Address: 800C2C4C - * Size: 000008 - */ -void ActShootCreature::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x550 - */ -} diff --git a/src/plugPikiKando/aiStone.cpp b/src/plugPikiKando/aiStone.cpp index 1e5c4448..c50bc807 100644 --- a/src/plugPikiKando/aiStone.cpp +++ b/src/plugPikiKando/aiStone.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800A6D94 * Size: 000054 */ -ActStone::ActStone(Piki*) +ActStone::ActStone(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -94,7 +95,7 @@ void ActStone::init(Creature*) * Address: 800A6E40 * Size: 000074 */ -void ActStone::exec() +int ActStone::exec() { /* .loc_0x0: @@ -360,7 +361,7 @@ void ActStone::exeApproach() void ActStone::initAdjust() { // Generated from sth r0, 0x18(r3) - _18 = 1; + // _18 = 1; } /* @@ -974,7 +975,7 @@ void Action::restart() { } * Address: 800A7878 * Size: 000008 */ -u32 Action::resumable() { return 0x0; } +bool Action::resumable() { return false; } /* * --INFO-- @@ -998,178 +999,3 @@ void Action::getInfo(char*) blr */ } - -/* - * --INFO-- - * Address: 800A78AC - * Size: 000004 - */ -void Receiver::procBounceMsg(Piki*, MsgBounce*) { } - -/* - * --INFO-- - * Address: 800A78B0 - * Size: 000004 - */ -void Receiver::procStickMsg(Piki*, MsgStick*) { } - -/* - * --INFO-- - * Address: 800A78B4 - * Size: 000004 - */ -void Receiver::procHangMsg(Piki*, MsgHang*) { } - -/* - * --INFO-- - * Address: 800A78B8 - * Size: 000004 - */ -void Receiver::procTargetMsg(Piki*, MsgTarget*) { } - -/* - * --INFO-- - * Address: 800A78BC - * Size: 000004 - */ -void Receiver::procCollideMsg(Piki*, MsgCollide*) { } - -/* - * --INFO-- - * Address: 800A78C0 - * Size: 000004 - */ -void Receiver::procAnimMsg(Piki*, MsgAnim*) { } - -/* - * --INFO-- - * Address: 800A78C4 - * Size: 000004 - */ -void Receiver::procDamageMsg(Piki*, MsgDamage*) { } - -/* - * --INFO-- - * Address: 800A78C8 - * Size: 000004 - */ -void Receiver::procWallMsg(Piki*, MsgWall*) { } - -/* - * --INFO-- - * Address: 800A78CC - * Size: 000004 - */ -void Receiver::procOffWallMsg(Piki*, MsgOffWall*) { } - -/* - * --INFO-- - * Address: 800A78D0 - * Size: 000004 - */ -void Receiver::procUserMsg(Piki*, MsgUser*) { } - -/* - * --INFO-- - * Address: 800A78D4 - * Size: 000004 - */ -void Receiver::procGroundMsg(Piki*, MsgGround*) { } - -/* - * --INFO-- - * Address: 800A78D8 - * Size: 000118 - */ -void Receiver::procMsg(Piki*, Msg*) -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r0, 0x0(r5) - cmplwi r0, 0xA - bgt- .loc_0x108 - lis r6, 0x802B - addi r6, r6, 0x5044 - rlwinm r0,r0,2,0,29 - lwzx r0, r6, r0 - mtctr r0 - bctr - lwz r12, 0x0(r3) - lwz r12, 0xC(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x10(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x14(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x18(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x1C(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x20(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x24(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x28(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x2C(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x30(r12) - mtlr r12 - blrl - b .loc_0x108 - lwz r12, 0x0(r3) - lwz r12, 0x34(r12) - mtlr r12 - blrl - - .loc_0x108: - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} - -/* - * --INFO-- - * Address: 800A79F0 - * Size: 000008 - */ -void ActStone::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x508 - */ -} diff --git a/src/plugPikiKando/aiTransport.cpp b/src/plugPikiKando/aiTransport.cpp index e8770286..a7839578 100644 --- a/src/plugPikiKando/aiTransport.cpp +++ b/src/plugPikiKando/aiTransport.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -249,7 +249,7 @@ void ActTransport::exeWait() * Address: 800AEF10 * Size: 000150 */ -void ActTransport::isStickLeader() +bool ActTransport::isStickLeader() { /* .loc_0x0: @@ -517,7 +517,8 @@ void ActTransport::calcNumStickers() * Address: 800AF1F0 * Size: 0000F4 */ -ActTransport::ActTransport(Piki*) +ActTransport::ActTransport(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -1002,7 +1003,7 @@ void ActTransport::initJump() * Address: 800AF784 * Size: 0004F0 */ -void ActTransport::execJump() +int ActTransport::execJump() { /* .loc_0x0: @@ -2533,7 +2534,7 @@ void ActTransport::useWaterRoute() * Address: 800B0B80 * Size: 0008B4 */ -void ActTransport::exec() +int ActTransport::exec() { /* .loc_0x0: @@ -6934,20 +6935,3 @@ ActTransport::~ActTransport() blr */ } - -/* - * --INFO-- - * Address: 800B455C - * Size: 000014 - */ -void ActTransport::@184 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0xB8 - b -0x4F7C - */ -} diff --git a/src/plugPikiKando/aiWatch.cpp b/src/plugPikiKando/aiWatch.cpp index 52f0155c..46f2bb55 100644 --- a/src/plugPikiKando/aiWatch.cpp +++ b/src/plugPikiKando/aiWatch.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -32,7 +32,8 @@ void ActWatch::AnimListener::animationKeyUpdated(PaniAnimKeyEvent&) { } * Address: 800C2C58 * Size: 0000C4 */ -ActWatch::ActWatch(Piki*) +ActWatch::ActWatch(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -262,7 +263,7 @@ void ActWatch::getInfo(char*) * Address: 800C2EE8 * Size: 00015C */ -void ActWatch::exec() +int ActWatch::exec() { /* .loc_0x0: diff --git a/src/plugPikiKando/aiWeed.cpp b/src/plugPikiKando/aiWeed.cpp index b8381ca5..95351a20 100644 --- a/src/plugPikiKando/aiWeed.cpp +++ b/src/plugPikiKando/aiWeed.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiAI.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800C30A8 * Size: 000054 */ -ActWeed::ActWeed(Piki*) +ActWeed::ActWeed(Piki* piki) + : Action(piki, false) { /* .loc_0x0: @@ -94,7 +95,7 @@ void ActWeed::init(Creature*) * Address: 800C3154 * Size: 000060 */ -void ActWeed::exec() +int ActWeed::exec() { /* .loc_0x0: @@ -356,7 +357,7 @@ void ActWeed::exeApproach() void ActWeed::initAdjust() { // Generated from sth r0, 0x18(r3) - _18 = 1; + // _18 = 1; } /* @@ -882,17 +883,3 @@ ActWeed::~ActWeed() blr */ } - -/* - * --INFO-- - * Address: 800C3ADC - * Size: 000008 - */ -void ActWeed::@20 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x14 - b -0x324 - */ -} diff --git a/src/plugPikiKando/collInfo.cpp b/src/plugPikiKando/collInfo.cpp index efa6105e..f148a88a 100644 --- a/src/plugPikiKando/collInfo.cpp +++ b/src/plugPikiKando/collInfo.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Collision.h" +#include "Geometry.h" /* * --INFO-- @@ -1144,8 +1145,9 @@ void CollPartUpdater::updateCollPart(CollPart*) * Address: 80087BC0 * Size: 000124 */ -void CollPart::isStickable() +bool CollPart::isStickable() { + return false; /* .loc_0x0: mflr r0 @@ -1245,8 +1247,9 @@ void CollPart::isStickable() * Address: 80087CE4 * Size: 00005C */ -void CollPart::isClimbable() +bool CollPart::isClimbable() { + return false; /* .loc_0x0: mflr r0 @@ -1284,8 +1287,9 @@ void CollPart::isClimbable() * Address: ........ * Size: 000008 */ -void CollPart::isDamagable() +bool CollPart::isDamagable() { + return false; // UNUSED FUNCTION } @@ -1294,8 +1298,9 @@ void CollPart::isDamagable() * Address: 80087D40 * Size: 000050 */ -void CollPart::isBouncy() +bool CollPart::isBouncy() { + return false; /* .loc_0x0: mflr r0 @@ -1330,8 +1335,9 @@ void CollPart::isBouncy() * Address: 80087D90 * Size: 000034 */ -void CollPart::getChildCount() +int CollPart::getChildCount() { + return 0; /* .loc_0x0: mflr r0 @@ -1359,8 +1365,9 @@ void CollPart::getChildCount() * Address: 80087DC4 * Size: 000028 */ -void CollPart::getChild() +CollPart* CollPart::getChild() { + return nullptr; /* .loc_0x0: lha r0, 0x54(r3) @@ -1383,8 +1390,9 @@ void CollPart::getChild() * Address: 80087DEC * Size: 00005C */ -void CollPart::getChildAt(int) +CollPart* CollPart::getChildAt(int) { + return nullptr; /* .loc_0x0: cmpwi r4, 0 @@ -1426,8 +1434,9 @@ void CollPart::getChildAt(int) * Address: ........ * Size: 000028 */ -void CollPart::getNext() +CollPart* CollPart::getNext() { + return nullptr; // UNUSED FUNCTION } @@ -2874,7 +2883,7 @@ void CollInfo::checkCollisionSpecial(Vector3f&, f32, CndCollPart*) * Address: 80088EF8 * Size: 000008 */ -u32 CndCollPart::satisfy(CollPart*) { return 0x0; } +bool CndCollPart::satisfy(CollPart*) { return false; } /* * --INFO-- @@ -3545,8 +3554,9 @@ void CollInfo::getBoundingSphere() * Address: 80089710 * Size: 000060 */ -void CollInfo::getSphere(u32) +CollPart* CollInfo::getSphere(u32) { + return nullptr; /* .loc_0x0: mflr r0 @@ -3917,8 +3927,9 @@ void CollInfo::updateInfo(Graphics&, bool) * Address: 80089B50 * Size: 000014 */ -void CollInfo::hasInfo() +bool CollInfo::hasInfo() { + return false; /* .loc_0x0: lhz r0, 0xC(r3) diff --git a/src/plugPikiKando/courseDebug.cpp b/src/plugPikiKando/courseDebug.cpp index e5af4506..71b48641 100644 --- a/src/plugPikiKando/courseDebug.cpp +++ b/src/plugPikiKando/courseDebug.cpp @@ -1,12 +1,21 @@ -#include "types.h" +#include "Generator.h" +#include "CourseDebug.h" +#include "Dolphin/os.h" +#include "sysNew.h" + +int CourseDebug::collision; +int CourseDebug::pikiNoAttack; +int CourseDebug::noCarryover; +int CourseDebug::pelletDebug; /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) +static void _Error(char* fmt, ...) { + OSPanic(__FILE__, __LINE__, fmt, "courseDebug"); // UNUSED FUNCTION } @@ -26,8 +35,12 @@ static void _Print(char*, ...) * Size: 00011C */ GenObjectDebug::GenObjectDebug() + : GenObject('debg', "Debug Switches") + , mCollision(this, 0, 0, 0, "p00", nullptr) + , mPikiNoAttack(this, 0, 0, 0, "p01", nullptr) + , mNoCarryover(this, 0, 0, 0, "p02", nullptr) + , mPelletDebug(this, 0, 0, 0, "p03", nullptr) { - // UNUSED FUNCTION } /* @@ -35,89 +48,7 @@ GenObjectDebug::GenObjectDebug() * Address: 800864A8 * Size: 00012C */ -void makeObjectDebug() -{ - /* - .loc_0x0: - mflr r0 - li r3, 0x58 - stw r0, 0x4(r1) - stwu r1, -0x58(r1) - stw r31, 0x54(r1) - stw r30, 0x50(r1) - stw r29, 0x4C(r1) - bl -0x3F4C0 - mr. r31, r3 - beq- .loc_0x10C - lis r4, 0x802B - lis r3, 0x802B - subi r5, r4, 0x11AC - lis r4, 0x6465 - subi r6, r3, 0x11A0 - addi r3, r31, 0 - addi r4, r4, 0x6267 - bl 0x547C8 - lis r3, 0x802C - subi r0, r3, 0x5490 - lis r3, 0x802B - stw r0, 0x4(r31) - subi r0, r3, 0x112C - stw r0, 0x4(r31) - addi r5, r1, 0x24 - addi r4, r31, 0 - lwz r0, -0x5ED0(r13) - addi r3, r31, 0x18 - stw r0, 0x2C(r1) - lwz r0, 0x2C(r1) - stw r0, 0x24(r1) - bl -0x27AA4 - lis r3, 0x802A - addi r29, r3, 0x60C4 - stw r29, 0x20(r31) - li r30, 0 - addi r5, r1, 0x20 - stw r30, 0x24(r31) - mr r4, r31 - addi r3, r31, 0x28 - lwz r0, -0x5ECC(r13) - stw r0, 0x34(r1) - lwz r0, 0x34(r1) - stw r0, 0x20(r1) - bl -0x27AD8 - stw r29, 0x30(r31) - addi r5, r1, 0x1C - addi r4, r31, 0 - stw r30, 0x34(r31) - addi r3, r31, 0x38 - lwz r0, -0x5EC8(r13) - stw r0, 0x3C(r1) - lwz r0, 0x3C(r1) - stw r0, 0x1C(r1) - bl -0x27B00 - stw r29, 0x40(r31) - addi r5, r1, 0x18 - addi r4, r31, 0 - stw r30, 0x44(r31) - addi r3, r31, 0x48 - lwz r0, -0x5EC4(r13) - stw r0, 0x44(r1) - lwz r0, 0x44(r1) - stw r0, 0x18(r1) - bl -0x27B28 - stw r29, 0x50(r31) - stw r30, 0x54(r31) - - .loc_0x10C: - mr r3, r31 - lwz r0, 0x5C(r1) - lwz r31, 0x54(r1) - lwz r30, 0x50(r1) - lwz r29, 0x4C(r1) - addi r1, r1, 0x58 - mtlr r0 - blr - */ -} +static GenObjectDebug* makeObjectDebug() { return new GenObjectDebug; } /* * --INFO-- @@ -178,21 +109,14 @@ void GenObjectDebug::doRead(RandomAccessStream&) { } * Address: 80086664 * Size: 000028 */ -void GenObjectDebug::birth(BirthInfo&) +void* GenObjectDebug::birth(BirthInfo&) { - /* - .loc_0x0: - lwz r0, 0x24(r3) - stw r0, 0x2FD8(r13) - lwz r0, 0x34(r3) - stw r0, 0x2FDC(r13) - lwz r0, 0x44(r3) - stw r0, 0x2FE0(r13) - lwz r0, 0x54(r3) - li r3, 0 - stw r0, 0x2FE4(r13) - blr - */ + CourseDebug::collision = mCollision(); + CourseDebug::pikiNoAttack = mPikiNoAttack(); + CourseDebug::noCarryover = mNoCarryover(); + CourseDebug::pelletDebug = mPelletDebug(); + + return nullptr; } /* diff --git a/src/plugPikiKando/creatureCollPart.cpp b/src/plugPikiKando/creatureCollPart.cpp index 070e4658..77b76a56 100644 --- a/src/plugPikiKando/creatureCollPart.cpp +++ b/src/plugPikiKando/creatureCollPart.cpp @@ -1,14 +1,14 @@ -#include "types.h" +#include "CreatureCollPart.h" +#include "Dolphin/os.h" +#include "Shape.h" +#include "MapMgr.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "creatureCollPart"); } /* * --INFO-- @@ -32,8 +32,17 @@ void CreatureCollPart::touchCallback(Plane&, Vector3f&, Vector3f&) { } * Address: 8008E0C0 * Size: 0000A0 */ -void CreaturePlatMgr::init(Creature*, MapMgr*, Shape*) +void CreaturePlatMgr::init(Creature* creature, MapMgr* map, Shape* shape) { + _44 = 0; + _00 = shape; + FOREACH_NODE(ObjCollInfo, _00->mCollisionInfo.mChild, collInfo) + { + if (collInfo->_48) { + CollPart* part = map->requestCollPart(collInfo, creature); + _04[_44++] = part; + } + } /* .loc_0x0: mflr r0 diff --git a/src/plugPikiKando/creatureCollision.cpp b/src/plugPikiKando/creatureCollision.cpp index 7c8063d9..6eeb0eee 100644 --- a/src/plugPikiKando/creatureCollision.cpp +++ b/src/plugPikiKando/creatureCollision.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Creature.h" /* * --INFO-- diff --git a/src/plugPikiKando/creatureMove.cpp b/src/plugPikiKando/creatureMove.cpp index 9d741623..c1781f3f 100644 --- a/src/plugPikiKando/creatureMove.cpp +++ b/src/plugPikiKando/creatureMove.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Creature.h" /* * --INFO-- diff --git a/src/plugPikiKando/creatureStick.cpp b/src/plugPikiKando/creatureStick.cpp index ccbec070..3f66a03a 100644 --- a/src/plugPikiKando/creatureStick.cpp +++ b/src/plugPikiKando/creatureStick.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "Creature.h" +#include "Iterator.h" +#include "Stickers.h" /* * --INFO-- @@ -522,8 +524,9 @@ void Creature::endClimb() * Address: 8008FF50 * Size: 000048 */ -void Creature::isStickToPlatform() +bool Creature::isStickToPlatform() { + return false; /* .loc_0x0: lwz r0, 0x184(r3) @@ -1699,8 +1702,9 @@ void Stickers::calcNum() * Address: 80090D0C * Size: 0000CC */ -void Stickers::getCreature(int) +Creature* Stickers::getCreature(int) { + return nullptr; /* .loc_0x0: lwz r7, 0x8(r3) @@ -1776,41 +1780,26 @@ void Stickers::getCreature(int) * Address: 80090DD8 * Size: 000008 */ -u32 Stickers::getFirst() { return 0x0; } +int Stickers::getFirst() { return 0; } /* * --INFO-- * Address: 80090DE0 * Size: 000008 */ -void Stickers::getNext(int) -{ - /* - .loc_0x0: - addi r3, r4, 0x1 - blr - */ -} +int Stickers::getNext(int idx) { return idx + 1; } /* * --INFO-- * Address: 80090DE8 * Size: 00001C */ -void Stickers::isDone(int) +bool Stickers::isDone(int idx) { - /* - .loc_0x0: - lwz r0, 0x8(r3) - cmpw r4, r0 - blt- .loc_0x14 - li r3, 0x1 - blr - - .loc_0x14: - li r3, 0 - blr - */ + if (idx >= mCount) { + return true; + } + return false; } /* diff --git a/src/plugPikiKando/dualCreature.cpp b/src/plugPikiKando/dualCreature.cpp index ffbcbd4d..13ce7ae3 100644 --- a/src/plugPikiKando/dualCreature.cpp +++ b/src/plugPikiKando/dualCreature.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "DualCreature.h" /* * --INFO-- @@ -592,8 +592,9 @@ void PelCreature::init(Vector3f&) * Address: 80092484 * Size: 000008 */ -void PelCreature::getiMass() +f32 PelCreature::getiMass() { + return 0.0f; /* .loc_0x0: lfs f1, -0x7490(r2) @@ -606,7 +607,7 @@ void PelCreature::getiMass() * Address: 8009248C * Size: 000008 */ -u32 PelCreature::isAlive() { return 0x1; } +bool PelCreature::isAlive() { return true; } /* * --INFO-- diff --git a/src/plugPikiKando/dynCreature.cpp b/src/plugPikiKando/dynCreature.cpp index a4b7b358..420e1bfd 100644 --- a/src/plugPikiKando/dynCreature.cpp +++ b/src/plugPikiKando/dynCreature.cpp @@ -1,6 +1,7 @@ #include "types.h" #include "DynCreature.h" #include "DynParticle.h" +#include "CreatureProp.h" #include "Matrix4f.h" /* @@ -291,6 +292,15 @@ void DynParticleHeap::releaseOne(DynParticle*) DynCreature::DynCreature() : Creature(nullptr) // temporary for compiler happiness- probably not nullptr { + _2D8 = 0; + _2D4 = 0; + _2F4 = 0.0f; + _2D0 = 0.0f; + _2DC.set(0.0f, 0.0f, 0.0f); + _2B8.set(0.0f, 0.0f, 0.0f); + _2C4.set(0.0f, 0.0f, 0.0f); + _70.set(0.0f, 0.0f, 0.0f); + _438 |= 0x1; /* .loc_0x0: mflr r0 diff --git a/src/plugPikiKando/genActor.cpp b/src/plugPikiKando/genActor.cpp index 6e1379cf..c1b3463e 100644 --- a/src/plugPikiKando/genActor.cpp +++ b/src/plugPikiKando/genActor.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Generator.h" +#include "sysNew.h" /* * --INFO-- @@ -25,7 +26,7 @@ static void _Print(char*, ...) * Address: 80119B30 * Size: 000078 */ -void makeObjectActor() +static GenObjectActor* makeObjectActor() { /* .loc_0x0: @@ -144,7 +145,7 @@ void GenObjectActor::doRead(RandomAccessStream&) * Address: 80119C74 * Size: 000070 */ -void GenObjectActor::birth(BirthInfo&) +void* GenObjectActor::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiKando/genItem.cpp b/src/plugPikiKando/genItem.cpp index 64f2ef1a..46b2805b 100644 --- a/src/plugPikiKando/genItem.cpp +++ b/src/plugPikiKando/genItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Generator.h" /* * --INFO-- @@ -26,6 +26,7 @@ static void _Print(char*, ...) * Size: 000148 */ GenObjectItem::GenObjectItem() + : GenObject('item', "") { // UNUSED FUNCTION } @@ -503,7 +504,7 @@ void GenObjectItem::updateUseList(Generator*, int) * Address: 800EE8A0 * Size: 000448 */ -void GenObjectItem::birth(BirthInfo&) +void* GenObjectItem::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiKando/genMapParts.cpp b/src/plugPikiKando/genMapParts.cpp index 20bf058a..3b84580e 100644 --- a/src/plugPikiKando/genMapParts.cpp +++ b/src/plugPikiKando/genMapParts.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Generator.h" +#include "MapMgr.h" /* * --INFO-- @@ -25,7 +26,7 @@ static void _Print(char*, ...) * Address: 8011785C * Size: 0001C0 */ -void makeObjectMapParts() +static GenObjectMapParts* makeObjectMapParts() { /* .loc_0x0: @@ -714,7 +715,7 @@ void GenObjectMapParts::render(Graphics&, Generator*) * Address: 80118228 * Size: 00027C */ -void GenObjectMapParts::birth(BirthInfo&) +void* GenObjectMapParts::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiKando/genNavi.cpp b/src/plugPikiKando/genNavi.cpp index e6fd2424..19e33ed4 100644 --- a/src/plugPikiKando/genNavi.cpp +++ b/src/plugPikiKando/genNavi.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Generator.h" /* * --INFO-- @@ -26,6 +26,7 @@ static void _Print(char*, ...) * Size: 000060 */ GenObjectNavi::GenObjectNavi() + : GenObject('navi', "") { // UNUSED FUNCTION } @@ -131,7 +132,7 @@ void GenObjectNavi::doRead(RandomAccessStream&) { } * Address: 800F8230 * Size: 0000B8 */ -void GenObjectNavi::birth(BirthInfo&) +void* GenObjectNavi::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiKando/genPellet.cpp b/src/plugPikiKando/genPellet.cpp index 3016e958..090861c9 100644 --- a/src/plugPikiKando/genPellet.cpp +++ b/src/plugPikiKando/genPellet.cpp @@ -1,14 +1,13 @@ -#include "types.h" +#include "Generator.h" +#include "sysNew.h" +#include "Dolphin/os.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "genPellet"); } /* * --INFO-- @@ -26,8 +25,9 @@ static void _Print(char*, ...) * Size: 000070 */ GenObjectPellet::GenObjectPellet() + : GenObject('pelt', "ペレットをうむ") { - // UNUSED FUNCTION + _18 = 0; } /* @@ -35,8 +35,9 @@ GenObjectPellet::GenObjectPellet() * Address: 80099D1C * Size: 000080 */ -void makeObjectPellet() +static GenObjectPellet* makeObjectPellet() { + return new GenObjectPellet(); /* .loc_0x0: mflr r0 @@ -233,7 +234,7 @@ void GenObjectPellet::updateUseList(Generator*, int) * Address: 80099F2C * Size: 000100 */ -void GenObjectPellet::birth(BirthInfo&) +void* GenObjectPellet::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiKando/generator.cpp b/src/plugPikiKando/generator.cpp index 51f04d09..a64943a3 100644 --- a/src/plugPikiKando/generator.cpp +++ b/src/plugPikiKando/generator.cpp @@ -1,19 +1,14 @@ #include "Generator.h" #include "Graphics.h" #include "system.h" - -static char file[] = __FILE__; -static char name[] = "generator"; +#include "sysNew.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "generator"); } /* * --INFO-- @@ -3794,7 +3789,7 @@ void GenObjectPiki::ramLoadParameters(RandomAccessStream&) * Address: 800DDDB8 * Size: 000214 */ -void GenObjectPiki::birth(BirthInfo&) +void* GenObjectPiki::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiKando/generatorCache.cpp b/src/plugPikiKando/generatorCache.cpp index e8295451..6580713d 100644 --- a/src/plugPikiKando/generatorCache.cpp +++ b/src/plugPikiKando/generatorCache.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Generator.h" /* * --INFO-- @@ -868,8 +868,9 @@ void GeneratorCache::preload(u32) * Address: 800DF76C * Size: 000128 */ -void GeneratorCache::hasUfoParts(u32, u32) +bool GeneratorCache::hasUfoParts(u32, u32) { + return false; /* .loc_0x0: mflr r0 diff --git a/src/plugPikiKando/memStat.cpp b/src/plugPikiKando/memStat.cpp index debc3b0f..0f582f0a 100644 --- a/src/plugPikiKando/memStat.cpp +++ b/src/plugPikiKando/memStat.cpp @@ -1,12 +1,16 @@ -#include "types.h" +#include "MemStat.h" +#include "Dolphin/os.h" + +MemStat* memStat; /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) +static void _Error(char* fmt, ...) { + OSPanic(__FILE__, __LINE__, fmt); // UNUSED FUNCTION } @@ -25,46 +29,7 @@ static void _Print(char*, ...) * Address: 80086690 * Size: 000080 */ -MemStat::MemStat() -{ - /* - .loc_0x0: - mflr r0 - lis r4, 0x8022 - stw r0, 0x4(r1) - addi r0, r4, 0x738C - subi r4, r13, 0x5E90 - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - addi r31, r3, 0 - lis r3, 0x8022 - stw r0, 0x0(r31) - addi r0, r3, 0x737C - addi r3, r31, 0 - stw r0, 0x0(r31) - li r0, 0 - stw r0, 0x10(r31) - stw r0, 0xC(r31) - stw r0, 0x8(r31) - bl -0x61800 - lis r3, 0x802B - subi r0, r3, 0x103C - lis r3, 0x802B - stw r0, 0x0(r31) - subi r0, r3, 0x104C - stw r0, 0x0(r31) - mr r3, r31 - bl .loc_0x80 - mr r3, r31 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - - .loc_0x80: - */ -} +MemStat::MemStat() { reset(); } /* * --INFO-- @@ -73,6 +38,8 @@ MemStat::MemStat() */ void MemStat::reset() { + mMemInfo.initCore("infoList"); + /* .loc_0x0: li r5, 0 @@ -245,24 +212,9 @@ void MemStat::getRestMemory() */ void MemStat::print() { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r0, 0x2FE8(r13) - cmplwi r0, 0 - beq- .loc_0x24 - lwz r4, 0x10(r3) - li r5, 0x4 - bl 0x38 - - .loc_0x24: - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ + if (memStat) { + printInfoRec(static_cast(mMemInfo.mChild), 4); + } } /* diff --git a/src/plugPikiKando/pelletMgr.cpp b/src/plugPikiKando/pelletMgr.cpp index 76eb7314..9487815e 100644 --- a/src/plugPikiKando/pelletMgr.cpp +++ b/src/plugPikiKando/pelletMgr.cpp @@ -1,4 +1,8 @@ -#include "types.h" +#include "Pellet.h" +#include "PelletView.h" +#include "StateMachine.h" +#include "Interactions.h" +#include "KEffect.h" /* * --INFO-- @@ -837,8 +841,9 @@ void Pellet::getState() * Address: 80095554 * Size: 000038 */ -void Pellet::ignoreAtari(Creature*) +bool Pellet::ignoreAtari(Creature*) { + return false; /* .loc_0x0: lwz r0, 0x184(r4) @@ -867,8 +872,9 @@ void Pellet::ignoreAtari(Creature*) * Address: 8009558C * Size: 000008 */ -void Pellet::isAlive() +bool Pellet::isAlive() { + return false; /* .loc_0x0: lbz r3, 0x5B8(r3) @@ -881,8 +887,9 @@ void Pellet::isAlive() * Address: 80095594 * Size: 000048 */ -void Pellet::isAtari() +bool Pellet::isAtari() { + return false; /* .loc_0x0: lwz r3, 0x474(r3) @@ -921,8 +928,9 @@ void Pellet::isAtari() * Address: 800955DC * Size: 000050 */ -void Pellet::isVisible() +bool Pellet::isVisible() { + return false; /* .loc_0x0: lwz r4, 0x474(r3) @@ -1707,8 +1715,9 @@ void Pellet::getCentre() * Address: 80095ECC * Size: 000048 */ -void Pellet::getCylinderHeight() +f32 Pellet::getCylinderHeight() { + return 0.0f; /* .loc_0x0: mflr r0 @@ -1741,8 +1750,9 @@ void Pellet::getCylinderHeight() * Address: 80095F14 * Size: 000078 */ -void Pellet::getSize() +f32 Pellet::getSize() { + return 0.0f; /* .loc_0x0: mflr r0 @@ -1806,8 +1816,9 @@ void PelletView::viewGetScale() * Address: 80095FA8 * Size: 000008 */ -void Pellet::getiMass() +f32 Pellet::getiMass() { + return 0.0f; /* .loc_0x0: lfs f1, -0x73E8(r2) @@ -2891,8 +2902,9 @@ void Pellet::init(Vector3f&) * Address: 80096AF4 * Size: 000034 */ -void Pellet::isFree() +bool Pellet::isFree() { + return false; /* .loc_0x0: lwz r0, 0x564(r3) @@ -4829,8 +4841,9 @@ void Pellet::doCreateColls(Graphics&) * Address: 800982CC * Size: 000064 */ -void InteractSwallow::actPellet(Pellet*) +bool InteractSwallow::actPellet(Pellet*) { + return false; /* .loc_0x0: mflr r0 @@ -4874,8 +4887,9 @@ void InteractSwallow::actPellet(Pellet*) * Address: 80098330 * Size: 000148 */ -void InteractKill::actPellet(Pellet*) +bool InteractKill::actPellet(Pellet*) { + return false; /* .loc_0x0: mflr r0 @@ -5495,40 +5509,6 @@ PelletMgr::PelletMgr(MapMgr*) */ } -/* - * --INFO-- - * Address: 80098A40 - * Size: 000058 - */ -void Parm::Parm(Parameters*, f32, f32, f32, ayuID, char*) -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x38(r1) - stfd f31, 0x30(r1) - fmr f31, f1 - stw r31, 0x2C(r1) - mr r31, r3 - lwz r0, 0x0(r5) - addi r5, r1, 0x24 - stw r0, 0x24(r1) - bl -0x39FE8 - lis r3, 0x802A - addi r0, r3, 0x6098 - stw r0, 0x8(r31) - mr r3, r31 - stfs f31, 0xC(r31) - lwz r0, 0x3C(r1) - lfd f31, 0x30(r1) - lwz r31, 0x2C(r1) - addi r1, r1, 0x38 - mtlr r0 - blr - */ -} - /* * --INFO-- * Address: 80098A98 @@ -6406,8 +6386,9 @@ PelletMgr::~PelletMgr() * Address: 80099360 * Size: 000008 */ -void MonoObjectMgr::getSize() +int MonoObjectMgr::getSize() { + return 0; /* .loc_0x0: lwz r3, 0x30(r3) @@ -6420,8 +6401,9 @@ void MonoObjectMgr::getSize() * Address: 80099368 * Size: 000008 */ -void MonoObjectMgr::getMax() +int MonoObjectMgr::getMax() { + return 0; /* .loc_0x0: lwz r3, 0x2C(r3) @@ -6434,7 +6416,7 @@ void MonoObjectMgr::getMax() * Address: 80099370 * Size: 000008 */ -u32 KEffect::invoke(zen::particleGenerator*) { return 0x0; } +bool KEffect::invoke(zen::particleGenerator*) { return false; } /* * --INFO-- @@ -6462,14 +6444,14 @@ void KEffect::restart() { } * Address: 80099384 * Size: 000008 */ -u32 KEffect::invoke(zen::particleGenerator*, zen::particleMdl*) { return 0x0; } +bool KEffect::invoke(zen::particleGenerator*, zen::particleMdl*) { return false; } /* * --INFO-- * Address: 8009938C * Size: 000008 */ -u32 KEffect::invoke(zen::particleMdl*) { return 0x0; } +bool KEffect::invoke(zen::particleMdl*) { return false; } /* * --INFO-- @@ -6667,87 +6649,3 @@ void Receiver::procStickMsg(Pellet*, MsgStick*) { } * Size: 000004 */ void Receiver::procBounceMsg(Pellet*, MsgBounce*) { } - -/* - * --INFO-- - * Address: 80099518 - * Size: 000008 - */ -void PelletConfig::@4 @read(RandomAccessStream&) -{ - /* - .loc_0x0: - subi r3, r3, 0x4 - b -0x461C - */ -} - -/* - * --INFO-- - * Address: 80099520 - * Size: 000008 - */ -void KEffect::@4 @invoke(zen::particleGenerator*, zen::particleMdl*) -{ - /* - .loc_0x0: - subi r3, r3, 0x4 - b -0x1A0 - */ -} - -/* - * --INFO-- - * Address: 80099528 - * Size: 000008 - */ -void KEffect::@8 @invoke(zen::particleMdl*) -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x1A0 - */ -} - -/* - * --INFO-- - * Address: 80099530 - * Size: 000008 - */ -void Pellet::@1088 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x440 - b -0x27C4 - */ -} - -/* - * --INFO-- - * Address: 80099538 - * Size: 000008 - */ -void PelletMgr::@8 @read(RandomAccessStream&) -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x7E0 - */ -} - -/* - * --INFO-- - * Address: 80099540 - * Size: 000008 - */ -void MonoObjectMgr::@8 @update() -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b 0x47E44 - */ -} diff --git a/src/plugPikiKando/piki.cpp b/src/plugPikiKando/piki.cpp index 5e3ac62c..b3d967b7 100644 --- a/src/plugPikiKando/piki.cpp +++ b/src/plugPikiKando/piki.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Piki.h" +#include "PikiState.h" /* * --INFO-- @@ -25,7 +26,7 @@ static void _Print(char*, ...) * Address: 800C6558 * Size: 000300 */ -void Piki::isSafeMePos(Vector3f&) +bool Piki::isSafeMePos(Vector3f&) { /* .loc_0x0: @@ -2075,7 +2076,7 @@ void Piki::crMakeRefs() * Address: 800C7E70 * Size: 00001C */ -void Piki::hasBomb() +bool Piki::hasBomb() { /* .loc_0x0: @@ -2189,7 +2190,7 @@ void Piki::endFire() * Address: 800C7F80 * Size: 00013C */ -void Piki::isTeki(Piki*) +bool Piki::isTeki(Piki*) { /* .loc_0x0: @@ -2563,7 +2564,7 @@ void Piki::actOnSituaton() * Address: 800C84C0 * Size: 000008 */ -u32 PikiState::freeAI() { return 0x0; } +bool PikiState::freeAI() { return false; } /* * --INFO-- @@ -2580,7 +2581,7 @@ void Piki::getNaviID() * Address: 800C84C8 * Size: 00004C */ -void Piki::doDoAI() +bool Piki::doDoAI() { /* .loc_0x0: @@ -2615,7 +2616,7 @@ void Piki::doDoAI() * Address: 800C8514 * Size: 000024 */ -void Piki::isRopable() +bool Piki::isRopable() { /* .loc_0x0: @@ -2682,7 +2683,7 @@ void Piki::getLastState() * Address: 800C8560 * Size: 000018 */ -void Piki::isBuried() +bool Piki::isBuried() { /* .loc_0x0: @@ -4541,7 +4542,7 @@ void Piki::updateColor() * Address: 800C9D44 * Size: 000078 */ -void Piki::needShadow() +bool Piki::needShadow() { /* .loc_0x0: @@ -4589,7 +4590,7 @@ void Piki::needShadow() * Address: 800C9DBC * Size: 000028 */ -void Piki::isFixed() +bool Piki::isFixed() { /* .loc_0x0: @@ -4741,7 +4742,7 @@ void Piki::stimulate(Interaction&) * Address: 800C9F2C * Size: 000074 */ -void Piki::getFormationPri() +int Piki::getFormationPri() { /* .loc_0x0: @@ -5021,7 +5022,7 @@ void Piki::birthBuried() * Address: 800CA1EC * Size: 000064 */ -void Piki::isAtari() +bool Piki::isAtari() { /* .loc_0x0: @@ -5062,7 +5063,7 @@ void Piki::isAtari() * Address: 800CA250 * Size: 0000B8 */ -void Piki::ignoreAtari(Creature*) +bool Piki::ignoreAtari(Creature*) { /* .loc_0x0: @@ -5138,14 +5139,14 @@ void Piki::ignoreAtari(Creature*) * Address: 800CA308 * Size: 000008 */ -u32 Piki::needFlick(Creature*) { return 0x1; } +bool Piki::needFlick(Creature*) { return true; } /* * --INFO-- * Address: 800CA310 * Size: 000110 */ -void Piki::isVisible() +bool Piki::isVisible() { /* .loc_0x0: @@ -5265,7 +5266,7 @@ void Piki::isTamable() * Address: 800CA420 * Size: 0000C4 */ -void Piki::isThrowable() +bool Piki::isThrowable() { /* .loc_0x0: @@ -5420,7 +5421,7 @@ void Piki::jumpCallback() { } * Address: 800CA584 * Size: 000080 */ -void Piki::platAttachable() +bool Piki::platAttachable() { /* .loc_0x0: @@ -5474,7 +5475,7 @@ void Piki::platAttachable() * Address: 800CA604 * Size: 0000E0 */ -void Piki::mayIstick() +bool Piki::mayIstick() { /* .loc_0x0: @@ -6962,14 +6963,15 @@ void Piki::collisionCallback(CollEvent&) * Address: 800CB95C * Size: 000008 */ -u32 PikiState::collideAI() { return 0x0; } +bool PikiState::collideAI() { return false; } /* * --INFO-- * Address: 800CB964 * Size: 000400 */ -Piki::Piki(CreatureProp*) +Piki::Piki(CreatureProp* prop) + : Creature(prop) { /* .loc_0x0: @@ -7444,7 +7446,7 @@ void Piki::setSpeed(f32, f32) * Address: 800CBF78 * Size: 000020 */ -void Piki::getSize() +f32 Piki::getSize() { /* .loc_0x0: @@ -7466,7 +7468,7 @@ void Piki::getSize() * Address: 800CBF98 * Size: 000044 */ -void Piki::getiMass() +f32 Piki::getiMass() { /* .loc_0x0: @@ -7757,7 +7759,7 @@ void Piki::initBirth() { } * Address: 800CC334 * Size: 000038 */ -void Piki::isAlive() +bool Piki::isAlive() { /* .loc_0x0: @@ -7787,7 +7789,7 @@ void Piki::isAlive() * Address: 800CC36C * Size: 000014 */ -void Piki::isFruit() +bool Piki::isFruit() { /* .loc_0x0: @@ -8061,7 +8063,7 @@ void Piki::updateLookCreature() * Address: 800CC6CC * Size: 000008 */ -u32 PikiState::useLookUpdate() { return 0x1; } +bool PikiState::useLookUpdate() { return true; } /* * --INFO-- @@ -9285,7 +9287,7 @@ void Piki::dump() * Address: 800CD668 * Size: 00001C */ -void Piki::getShadowPos() +Vector3f Piki::getShadowPos() { /* .loc_0x0: @@ -9446,17 +9448,3 @@ void __sinit_piki_cpp(void) blr */ } - -/* - * --INFO-- - * Address: 800CD7FC - * Size: 000008 - */ -void Piki::@696 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b -0x36F0 - */ -} diff --git a/src/plugPikiKando/pikidoKill.cpp b/src/plugPikiKando/pikidoKill.cpp index 4f74894e..065ffcc6 100644 --- a/src/plugPikiKando/pikidoKill.cpp +++ b/src/plugPikiKando/pikidoKill.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Piki.h" /* * --INFO-- diff --git a/src/plugPikiKando/ropeCreature.cpp b/src/plugPikiKando/ropeCreature.cpp index 642e075c..999c9c39 100644 --- a/src/plugPikiKando/ropeCreature.cpp +++ b/src/plugPikiKando/ropeCreature.cpp @@ -1,14 +1,12 @@ -#include "types.h" +#include "RopeCreature.h" +#include "Dolphin/os.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "ropeCreature"); } /* * --INFO-- @@ -25,33 +23,11 @@ static void _Print(char*, ...) * Address: 800946A4 * Size: 000058 */ -RopeCreature::RopeCreature(CreatureProp*) +RopeCreature::RopeCreature(CreatureProp* prop) + : Creature(prop) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr r31, r3 - bl -0x97E0 - lis r3, 0x802B - subi r0, r3, 0x524 - stw r0, 0x0(r31) - li r0, 0 - addi r3, r31, 0 - lfs f0, -0x7418(r2) - stfs f0, 0x2CC(r31) - stfs f0, 0x2C8(r31) - stfs f0, 0x2C4(r31) - stw r0, 0x2B8(r31) - stw r0, 0x2BC(r31) - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + _2B8 = nullptr; + _2BC = nullptr; } /* @@ -314,4 +290,4 @@ void RopeCreature::refresh(Graphics&) { } * Address: 80094A30 * Size: 000008 */ -u32 RopeCreature::needShadow() { return 0x0; } +bool RopeCreature::needShadow() { return false; } diff --git a/src/plugPikiKando/ropeItem.cpp b/src/plugPikiKando/ropeItem.cpp index 626154d5..3ce8e572 100644 --- a/src/plugPikiKando/ropeItem.cpp +++ b/src/plugPikiKando/ropeItem.cpp @@ -1,14 +1,12 @@ -#include "types.h" +#include "RopeCreature.h" +#include "Dolphin/os.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "ropeItem"); } /* * --INFO-- @@ -25,7 +23,8 @@ static void _Print(char*, ...) * Address: 800ED9DC * Size: 0000B0 */ -RopeItem::RopeItem(CreatureProp*, Shape*) +RopeItem::RopeItem(CreatureProp* prop, Shape* shape) + : RopeCreature(prop) { /* .loc_0x0: @@ -81,15 +80,16 @@ RopeItem::RopeItem(CreatureProp*, Shape*) * Address: 800EDA8C * Size: 000008 */ -u32 RopeItem::isAtari() { return 0x0; } +bool RopeItem::isAtari() { return false; } /* * --INFO-- * Address: 800EDA94 * Size: 000008 */ -void RopeItem::getSize() +f32 RopeItem::getSize() { + return 0.0f; /* .loc_0x0: lfs f1, -0x64D8(r2) @@ -377,8 +377,9 @@ void RopeItem::doKill() * Address: 800EDDB0 * Size: 000008 */ -void RopeItem::getiMass() +f32 RopeItem::getiMass() { + 0.0f; /* .loc_0x0: lfs f1, -0x64CC(r2) @@ -391,18 +392,18 @@ void RopeItem::getiMass() * Address: 800EDDB8 * Size: 000008 */ -u32 RopeItem::needShadow() { return 0x0; } +bool RopeItem::needShadow() { return false; } /* * --INFO-- * Address: 800EDDC0 * Size: 000008 */ -u32 RopeItem::isAlive() { return 0x1; } +bool RopeItem::isAlive() { return true; } /* * --INFO-- * Address: 800EDDC8 * Size: 000008 */ -u32 RopeItem::isVisible() { return 0x1; } +bool RopeItem::isVisible() { return true; } diff --git a/src/plugPikiKando/viewPiki.cpp b/src/plugPikiKando/viewPiki.cpp index 299e93c5..66a2d00d 100644 --- a/src/plugPikiKando/viewPiki.cpp +++ b/src/plugPikiKando/viewPiki.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "ViewPiki.h" /* * --INFO-- @@ -294,7 +294,7 @@ PikiShapeObject::PikiShapeObject(Shape*) * Address: 800D8B70 * Size: 000020 */ -void ViewPiki::isKinoko() +bool ViewPiki::isKinoko() { /* .loc_0x0: @@ -408,7 +408,8 @@ void ViewPiki::changeShape(int) * Address: 800D8CB8 * Size: 000060 */ -ViewPiki::ViewPiki(CreatureProp*) +ViewPiki::ViewPiki(CreatureProp* prop) + : Piki(prop) { /* .loc_0x0: @@ -1203,7 +1204,7 @@ void Piki::finishLook() * Address: 800D96DC * Size: 000014 */ -void Piki::isLooking() +bool Piki::isLooking() { /* .loc_0x0: diff --git a/src/plugPikiKando/workObject.cpp b/src/plugPikiKando/workObject.cpp index 7ba34217..6ad2e976 100644 --- a/src/plugPikiKando/workObject.cpp +++ b/src/plugPikiKando/workObject.cpp @@ -1,4 +1,7 @@ -#include "types.h" +#include "WorkObject.h" +#include "Generator.h" +#include "Interactions.h" +#include "DynColl.h" /* * --INFO-- @@ -160,6 +163,7 @@ void WorkObject::finalSetup() { } * Size: 00008C */ WorkObject::WorkObject() + : ItemCreature(0, nullptr, nullptr) { // UNUSED FUNCTION } @@ -511,8 +515,9 @@ void WorkObjectMgr::birth(int, int) * Address: 8009B584 * Size: 000088 */ -void WorkObjectMgr::getCreature(int) +Creature* WorkObjectMgr::getCreature(int) { + return nullptr; /* .loc_0x0: cmpwi r4, 0 @@ -567,29 +572,23 @@ void WorkObjectMgr::getCreature(int) * Address: 8009B60C * Size: 000008 */ -u32 WorkObjectMgr::getFirst() { return 0x0; } +int WorkObjectMgr::getFirst() { return 0; } /* * --INFO-- * Address: 8009B614 * Size: 000008 */ -void WorkObjectMgr::getNext(int) -{ - /* - .loc_0x0: - addi r3, r4, 0x1 - blr - */ -} +int WorkObjectMgr::getNext(int idx) { return idx + 1; } /* * --INFO-- * Address: 8009B61C * Size: 000044 */ -void WorkObjectMgr::isDone(int) +bool WorkObjectMgr::isDone(int) { + return false; /* .loc_0x0: mflr r0 @@ -621,8 +620,9 @@ void WorkObjectMgr::isDone(int) * Address: 8009B660 * Size: 000024 */ -void WorkObjectMgr::getSize() +int WorkObjectMgr::getSize() { + return 0; /* .loc_0x0: mflr r0 @@ -643,6 +643,7 @@ void WorkObjectMgr::getSize() * Size: 00015C */ GenObjectWorkObject::GenObjectWorkObject() + : GenObject(0, nullptr) { // UNUSED FUNCTION } @@ -756,7 +757,7 @@ void GenObjectWorkObject::ramLoadParameters(RandomAccessStream&) * Address: 8009B7C4 * Size: 00016C */ -void makeObjectWorkObject() +static void makeObjectWorkObject() { /* .loc_0x0: @@ -1236,8 +1237,9 @@ void GenObjectWorkObject::updateUseList(Generator*, int) * Address: 8009BD9C * Size: 000180 */ -void GenObjectWorkObject::birth(BirthInfo&) +void* GenObjectWorkObject::birth(BirthInfo&) { + return nullptr; /* .loc_0x0: mflr r0 @@ -1464,8 +1466,9 @@ HinderRock::HinderRock(Shape*) * Address: 8009C094 * Size: 000074 */ -void HinderRock::insideSafeArea(Vector3f&) +bool HinderRock::insideSafeArea(Vector3f&) { + return false; /* .loc_0x0: mflr r0 @@ -1644,8 +1647,9 @@ void HinderRock::doSave(RandomAccessStream&) * Address: 8009C2AC * Size: 000008 */ -void HinderRock::getCentreSize() +f32 HinderRock::getCentreSize() { + return 0.0f; /* .loc_0x0: lfs f1, 0x430(r3) @@ -1658,8 +1662,9 @@ void HinderRock::getCentreSize() * Address: 8009C2B4 * Size: 000014 */ -void HinderRock::isFinished() +bool HinderRock::isFinished() { + return false; /* .loc_0x0: lbz r0, 0x43C(r3) @@ -2266,8 +2271,9 @@ void HinderRock::stimulate(Interaction&) * Address: 8009CA0C * Size: 000018 */ -void InteractPush::actHinderRock(HinderRock*) +bool InteractPush::actHinderRock(HinderRock*) { + return true; /* .loc_0x0: lwz r0, 0x8(r3) @@ -2344,8 +2350,9 @@ void HinderRock::refresh(Graphics&) * Address: 8009CAE4 * Size: 00011C */ -void HinderRock::workable(Vector3f&) +bool HinderRock::workable(Vector3f&) { + return false; /* .loc_0x0: lfs f3, 0x3CC(r3) @@ -3143,8 +3150,9 @@ void HinderRock::startAI(int) * Address: 8009D5C8 * Size: 000154 */ -void Bridge::workable(Vector3f&) +bool Bridge::workable(Vector3f&) { + return false; /* .loc_0x0: mflr r0 @@ -4042,8 +4050,9 @@ void Bridge::doSave(RandomAccessStream&) * Address: 8009E124 * Size: 0000B0 */ -void Bridge::insideSafeArea(Vector3f&) +bool Bridge::insideSafeArea(Vector3f&) { + return false; /* .loc_0x0: mflr r0 @@ -4102,8 +4111,9 @@ void Bridge::insideSafeArea(Vector3f&) * Address: 8009E1D4 * Size: 000068 */ -void Bridge::isFinished() +bool Bridge::isFinished() { + return false; /* .loc_0x0: mflr r0 @@ -4272,8 +4282,9 @@ void Bridge::getJointIndex(int) * Address: 8009E34C * Size: 00009C */ -void Bridge::isStageFinished(int) +bool Bridge::isStageFinished(int) { + return false; /* .loc_0x0: mflr r0 @@ -5099,8 +5110,9 @@ void Bridge::getStartPos() * Address: 8009ED18 * Size: 000008 */ -void Bridge::getStageDepth() +f32 Bridge::getStageDepth() { + return 0.0f; /* .loc_0x0: lfs f1, -0x72DC(r2) @@ -5113,8 +5125,9 @@ void Bridge::getStageDepth() * Address: 8009ED20 * Size: 000008 */ -void Bridge::getStageWidth() +f32 Bridge::getStageWidth() { + return 0.0f; /* .loc_0x0: lfs f1, -0x72D8(r2) @@ -5422,8 +5435,9 @@ void Bridge::startStageFinished(int, bool) * Address: 8009F14C * Size: 0000A0 */ -void InteractBuild::actBridge(Bridge*) +bool InteractBuild::actBridge(Bridge*) { + return false; /* .loc_0x0: mflr r0 @@ -5476,8 +5490,9 @@ void InteractBuild::actBridge(Bridge*) * Address: 8009F1EC * Size: 0002E8 */ -void InteractBreak::actBridge(Bridge*) +bool InteractBreak::actBridge(Bridge*) { + return false; /* .loc_0x0: mflr r0 @@ -5725,15 +5740,16 @@ void operator*(const Vector3f&, const f32&) * Address: 8009F500 * Size: 000008 */ -u32 Bridge::isBridge() { return 0x1; } +bool Bridge::isBridge() { return true; } /* * --INFO-- * Address: 8009F508 * Size: 000014 */ -void Bridge::alwaysUpdatePlatform() +bool Bridge::alwaysUpdatePlatform() { + return false; /* .loc_0x0: lbz r0, 0x424(r3) @@ -5752,7 +5768,7 @@ void Bridge::alwaysUpdatePlatform() void Bridge::finalSetup() { // Generated from stb r0, 0x424(r3) - _424 = 3; + // _424 = 3; } /* @@ -5760,29 +5776,30 @@ void Bridge::finalSetup() * Address: 8009F528 * Size: 000008 */ -u32 WorkObject::isVisible() { return 0x1; } +bool WorkObject::isVisible() { return true; } /* * --INFO-- * Address: 8009F530 * Size: 000008 */ -u32 WorkObject::isAlive() { return 0x1; } +bool WorkObject::isAlive() { return true; } /* * --INFO-- * Address: 8009F538 * Size: 000008 */ -u32 WorkObject::isHinderRock() { return 0x0; } +bool WorkObject::isHinderRock() { return false; } /* * --INFO-- * Address: 8009F540 * Size: 000008 */ -void ItemCreature::getHeight() +f32 ItemCreature::getHeight() { + return 0.0f; /* .loc_0x0: lfs f1, -0x732C(r2) @@ -5795,7 +5812,7 @@ void ItemCreature::getHeight() * Address: 8009F548 * Size: 000008 */ -u32 HinderRock::isHinderRock() { return 0x1; } +bool HinderRock::isHinderRock() { return true; } /* * --INFO-- @@ -5859,8 +5876,9 @@ WorkObjectMgr::~WorkObjectMgr() * Address: 8009F5C4 * Size: 000008 */ -void WorkObjectMgr::getMax() +int WorkObjectMgr::getMax() { + return 0x10000; /* .loc_0x0: lis r3, 0x1 @@ -5873,25 +5891,11 @@ void WorkObjectMgr::getMax() * Address: 8009F5CC * Size: 000008 */ -u32 WorkObject::isFinished() { return 0x0; } +bool WorkObject::isFinished() { return false; } /* * --INFO-- * Address: 8009F5D4 * Size: 000008 */ -u32 WorkObject::workable(Vector3f&) { return 0x1; } - -/* - * --INFO-- - * Address: 8009F5DC - * Size: 000008 - */ -void ObjectMgr::@8 @update() -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b 0x40E78 - */ -} +bool WorkObject::workable(Vector3f&) { return true; } diff --git a/src/plugPikiYamashita/bBoardColourAnim.cpp b/src/plugPikiYamashita/bBoardColourAnim.cpp index 7a896397..ee2a9c64 100644 --- a/src/plugPikiYamashita/bBoardColourAnim.cpp +++ b/src/plugPikiYamashita/bBoardColourAnim.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/bBoardColourAnim.h" /* * --INFO-- diff --git a/src/plugPikiYamashita/gameCredits.cpp b/src/plugPikiYamashita/gameCredits.cpp index b5c8f681..dd21a4bf 100644 --- a/src/plugPikiYamashita/gameCredits.cpp +++ b/src/plugPikiYamashita/gameCredits.cpp @@ -1,12 +1,15 @@ -#include "types.h" +#include "GameCreditsSection.h" +#include "system.h" +#include "OnePlayerSection.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) +static void _Error(char* fmt, ...) { + OSPanic(__FILE__, __LINE__, fmt, "GameCreditsSection"); // UNUSED FUNCTION } @@ -27,51 +30,8 @@ static void _Print(char*, ...) */ GameCreditsSection::GameCreditsSection() { - /* - .loc_0x0: - mflr r0 - addi r4, r13, 0xFD8 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - addi r31, r3, 0 - bl -0x1668E8 - lis r3, 0x8023 - subi r0, r3, 0x71E0 - stw r0, 0x0(r31) - addi r3, r31, 0 - addi r4, r13, 0xFD8 - bl -0x15B17C - lis r3, 0x802A - addi r0, r3, 0x642C - lis r3, 0x802D - stw r0, 0x0(r31) - addi r0, r3, 0x6C54 - lis r3, 0x802D - stw r0, 0x0(r31) - addi r4, r3, 0x6BB4 - addi r3, r31, 0 - bl -0x15B1A4 - lwz r4, 0x2DEC(r13) - li r0, 0x1 - lis r3, 0x803A - stw r0, 0x14(r4) - subi r4, r3, 0x24E0 - li r0, 0 - stw r0, 0x24C(r4) - mr r3, r31 - stw r0, 0x250(r4) - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + Node::init(""); + gsys->mFrameRate = 1; + flowCont._24C = 0; + flowCont._250 = 0; } - -/* - * --INFO-- - * Address: 8019B91C - * Size: 000004 - */ -void GameCreditsSection::init() { } diff --git a/src/plugPikiYamashita/gameStageClear.cpp b/src/plugPikiYamashita/gameStageClear.cpp index fe1895f1..0f13ccbc 100644 --- a/src/plugPikiYamashita/gameStageClear.cpp +++ b/src/plugPikiYamashita/gameStageClear.cpp @@ -1,14 +1,12 @@ -#include "types.h" +#include "GameStageClearSection.h" +#include "system.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "GameStageClearSection"); } /* * --INFO-- @@ -27,46 +25,6 @@ static void _Print(char*, ...) */ GameStageClearSection::GameStageClearSection() { - /* - .loc_0x0: - mflr r0 - addi r4, r13, 0xF90 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - addi r31, r3, 0 - bl -0x166864 - lis r3, 0x8023 - subi r0, r3, 0x71E0 - stw r0, 0x0(r31) - addi r3, r31, 0 - addi r4, r13, 0xF90 - bl -0x15B0F8 - lis r3, 0x802A - addi r0, r3, 0x642C - lis r3, 0x802D - stw r0, 0x0(r31) - addi r0, r3, 0x6B24 - lis r3, 0x802D - stw r0, 0x0(r31) - addi r4, r3, 0x6A84 - addi r3, r31, 0 - bl -0x15B120 - lwz r4, 0x2DEC(r13) - li r0, 0x1 - addi r3, r31, 0 - stw r0, 0x14(r4) - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + Node::init(""); + gsys->mFrameRate = 1; } - -/* - * --INFO-- - * Address: 8019B884 - * Size: 000004 - */ -void GameStageClearSection::init() { } diff --git a/src/plugPikiYamashita/particleGenerator.cpp b/src/plugPikiYamashita/particleGenerator.cpp index f694e288..00b9f5f5 100644 --- a/src/plugPikiYamashita/particleGenerator.cpp +++ b/src/plugPikiYamashita/particleGenerator.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/particle.h" /* * --INFO-- @@ -4249,7 +4249,7 @@ void zen::particleGenerator::drawPtclOriented(Graphics&) * Address: 801A0758 * Size: 00003C */ -void zen::particleGenerator::RotAxisX(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisX(Mtx&, f32&, f32&) { /* .loc_0x0: @@ -4276,7 +4276,7 @@ void zen::particleGenerator::RotAxisX(f32 (&)[3][4], f32&, f32&) * Address: 801A0794 * Size: 00003C */ -void zen::particleGenerator::RotAxisY(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisY(Mtx&, f32&, f32&) { /* .loc_0x0: @@ -4303,7 +4303,7 @@ void zen::particleGenerator::RotAxisY(f32 (&)[3][4], f32&, f32&) * Address: 801A07D0 * Size: 00003C */ -void zen::particleGenerator::RotAxisZ(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisZ(Mtx&, f32&, f32&) { /* .loc_0x0: @@ -4330,7 +4330,7 @@ void zen::particleGenerator::RotAxisZ(f32 (&)[3][4], f32&, f32&) * Address: 801A080C * Size: 000054 */ -void zen::particleGenerator::RotAxisXY(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisXY(Mtx&, f32&, f32&) { /* .loc_0x0: @@ -4363,7 +4363,7 @@ void zen::particleGenerator::RotAxisXY(f32 (&)[3][4], f32&, f32&) * Address: 801A0860 * Size: 00005C */ -void zen::particleGenerator::RotAxisXZ(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisXZ(Mtx&, f32&, f32&) { /* .loc_0x0: @@ -4398,7 +4398,7 @@ void zen::particleGenerator::RotAxisXZ(f32 (&)[3][4], f32&, f32&) * Address: 801A08BC * Size: 00005C */ -void zen::particleGenerator::RotAxisYZ(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisYZ(Mtx&, f32&, f32&) { /* .loc_0x0: @@ -4433,7 +4433,7 @@ void zen::particleGenerator::RotAxisYZ(f32 (&)[3][4], f32&, f32&) * Address: 801A0918 * Size: 00008C */ -void zen::particleGenerator::RotAxisXYZ(f32 (&)[3][4], f32&, f32&) +void zen::particleGenerator::RotAxisXYZ(Mtx&, f32&, f32&) { /* .loc_0x0: diff --git a/src/plugPikiYamashita/particleLoader.cpp b/src/plugPikiYamashita/particleLoader.cpp index 950393f6..79f03064 100644 --- a/src/plugPikiYamashita/particleLoader.cpp +++ b/src/plugPikiYamashita/particleLoader.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/particle.h" /* * --INFO-- diff --git a/src/plugPikiYamashita/particleManager.cpp b/src/plugPikiYamashita/particleManager.cpp index 5f8090bf..a883a7ef 100644 --- a/src/plugPikiYamashita/particleManager.cpp +++ b/src/plugPikiYamashita/particleManager.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/particle.h" /* * --INFO-- diff --git a/src/plugPikiYamashita/particleMdlManager.cpp b/src/plugPikiYamashita/particleMdlManager.cpp index 7c71e963..f3e09035 100644 --- a/src/plugPikiYamashita/particleMdlManager.cpp +++ b/src/plugPikiYamashita/particleMdlManager.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "zen/particle.h" +#include "zen/bBoardColourAnim.h" /* * --INFO-- diff --git a/src/plugPikiYamashita/ptclGenPack.cpp b/src/plugPikiYamashita/ptclGenPack.cpp index 36565d60..c64bcf35 100644 --- a/src/plugPikiYamashita/ptclGenPack.cpp +++ b/src/plugPikiYamashita/ptclGenPack.cpp @@ -1,51 +1,19 @@ -#include "types.h" +#include "zen/particle.h" #include "Vector.h" -namespace zen { -struct particleGenerator { - u32 _00; - u8 filler[20]; - Vector3f* mVector_ptr; // _18 - u8 filler2[100]; - u32 mPgen_flags; // _80 - - void forceFinish(); -}; -class PtclGenPack { - u32 mLimit; // _00 - particleGenerator** mPtcl_gen_list; // _04 - - void setPtclGenPtr(u32, particleGenerator*); - void getPtclGenPtr(u32); - void setEmitPos(Vector3f&); - void setEmitPosPtr(Vector3f*); - void setEmitDir(Vector3f&); - void startGen(); - void stopGen(); - void start(); - void stop(); - void finish(); - void forceFinish(); - bool checkStopGen(); - void checkStop(); - void checkEmit(); - void checkActive(); -}; -} // namespace zen - /* * --INFO-- * Address: 801DA088 * Size: 00001C */ namespace zen { -void PtclGenPack::setPtclGenPtr(u32 param_1, particleGenerator* param_2) -{ // matching - if (param_1 >= mLimit) { +void PtclGenPack::setPtclGenPtr(u32 idx, particleGenerator* gen) +{ + if (idx >= mLimit) { return; } - mPtcl_gen_list[param_1] = param_2; - return; + + mGeneratorList[idx] = gen; }; /* @@ -53,10 +21,7 @@ void PtclGenPack::setPtclGenPtr(u32 param_1, particleGenerator* param_2) * Address: ........ * Size: 000010 */ -void PtclGenPack::getPtclGenPtr(u32) -{ - // UNUSED FUNCTION -} +particleGenerator* PtclGenPack::getPtclGenPtr(u32 idx) { return mGeneratorList[idx]; } /* * --INFO-- @@ -73,18 +38,15 @@ void PtclGenPack::setEmitPos(Vector3f&) * Address: 801DA0A4 * Size: 000034 */ -void PtclGenPack::setEmitPosPtr(Vector3f* param_1) // matching +void PtclGenPack::setEmitPosPtr(Vector3f* posPtr) { u32 i; - particleGenerator** particle_gen_list; - - particle_gen_list = mPtcl_gen_list; - for (i = 0; i < mLimit; i++, particle_gen_list++) { - if (particle_gen_list[0] != nullptr) { - (*particle_gen_list)->mVector_ptr = param_1; + particleGenerator** genList = mGeneratorList; + for (i = 0; i < mLimit; i++, genList++) { + if (*genList) { + (*genList)->mEmitPosPtr = posPtr; } } - return; } /* @@ -102,30 +64,26 @@ void PtclGenPack::setEmitDir(Vector3f&) * Address: ........ * Size: 000084 */ -// void PtclGenPack::setCallBack(zen::CallBack1*, zen::CallBack2*) -//{ -// // UNUSED FUNCTION -//} +void PtclGenPack::setCallBack(zen::CallBack1*, zen::CallBack2*) +{ + // UNUSED FUNCTION +} /* * --INFO-- * Address: 801DA0D8 * Size: 00003C */ -void PtclGenPack::startGen() // matching +void PtclGenPack::startGen() { - particleGenerator* pgen_ptr; u32 i; - particleGenerator** particle_gen_list; + particleGenerator** genList = mGeneratorList; - particle_gen_list = mPtcl_gen_list; - for (i = 0; i < mLimit; i++, particle_gen_list++) { - pgen_ptr = particle_gen_list[0]; - if (pgen_ptr != nullptr) { - pgen_ptr->mPgen_flags &= 0xFFFFFFF7; + for (i = 0; i < mLimit; i++, genList++) { + if (*genList) { + (*genList)->resetFlag(PTCLGEN_GenStopped); } } - return; } /* @@ -133,17 +91,13 @@ void PtclGenPack::startGen() // matching * Address: 801DA114 * Size: 00003C */ -void PtclGenPack::stopGen() // matching +void PtclGenPack::stopGen() { - particleGenerator* pgen_ptr; u32 i; - particleGenerator** particle_gen_list; - - particle_gen_list = mPtcl_gen_list; - for (i = 0; i < mLimit; i++, particle_gen_list++) { - pgen_ptr = particle_gen_list[0]; - if (pgen_ptr != nullptr) { - pgen_ptr->mPgen_flags |= 8; + particleGenerator** genList = mGeneratorList; + for (i = 0; i < mLimit; i++, genList++) { + if (*genList) { + (*genList)->setFlag(PTCLGEN_GenStopped); } } return; @@ -174,18 +128,14 @@ void PtclGenPack::stop() * Address: 801DA150 * Size: 000044 */ -void PtclGenPack::finish() // matching +void PtclGenPack::finish() { - particleGenerator* pgen_ptr; u32 i; - particleGenerator** particle_gen_list; - - particle_gen_list = mPtcl_gen_list; - for (i = 0; i < mLimit; i++, particle_gen_list++) { - pgen_ptr = particle_gen_list[0]; - if (pgen_ptr != nullptr) { - pgen_ptr->mPgen_flags |= 2; - particle_gen_list[0] = nullptr; + particleGenerator** genList = mGeneratorList; + for (i = 0; i < mLimit; i++, genList++) { + if (*genList) { + (*genList)->mGeneratorFlags |= 2; + *genList = nullptr; } } return; @@ -196,17 +146,16 @@ void PtclGenPack::finish() // matching * Address: 801DA194 * Size: 000078 */ -void PtclGenPack::forceFinish() // matches +void PtclGenPack::forceFinish() { u32 i; - particleGenerator** ptcl_list = &mPtcl_gen_list[0]; + particleGenerator** genList = mGeneratorList; - for (i = 0; i < mLimit; i++, ptcl_list++) { - if (!ptcl_list[0]) - continue; - - ptcl_list[0]->forceFinish(); - ptcl_list[0] = nullptr; + for (i = 0; i < mLimit; i++, genList++) { + if (*genList) { + (*genList)->forceFinish(); + (*genList) = nullptr; + } } } @@ -215,17 +164,15 @@ void PtclGenPack::forceFinish() // matches * Address: 801DA20C * Size: 000044 */ -bool PtclGenPack::checkStopGen() // matching +bool PtclGenPack::checkStopGen() { - particleGenerator* pgen_ptr; u32 i; - particleGenerator** particle_gen_list; + particleGenerator** genList = mGeneratorList; - particle_gen_list = mPtcl_gen_list; - for (i = 0; i < mLimit; i++, particle_gen_list++) { - pgen_ptr = particle_gen_list[0]; - if ((particle_gen_list[0] != nullptr) && (((*particle_gen_list)->mPgen_flags & 8) == 0)) + for (i = 0; i < mLimit; i++, genList++) { + if ((*genList) && (!(*genList)->isFlag(PTCLGEN_GenStopped))) { return false; + } } return true; } diff --git a/src/plugPikiYamashita/simpleParticle.cpp b/src/plugPikiYamashita/simpleParticle.cpp index b109303a..0d511dc1 100644 --- a/src/plugPikiYamashita/simpleParticle.cpp +++ b/src/plugPikiYamashita/simpleParticle.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/particle.h" /* * --INFO-- diff --git a/unsorted_include_todo/AIPerf.h b/unsorted_include_todo/AIPerf.h deleted file mode 100644 index eed50258..00000000 --- a/unsorted_include_todo/AIPerf.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _AIPERF_H -#define _AIPERF_H - -/* - * @brief TODO - */ -struct AIPerf { - void clearCounts(); -}; - -#endif diff --git a/unsorted_include_todo/Bridge.h b/unsorted_include_todo/Bridge.h deleted file mode 100644 index 667e04ad..00000000 --- a/unsorted_include_todo/Bridge.h +++ /dev/null @@ -1,456 +0,0 @@ -#ifndef _BRIDGE_H -#define _BRIDGE_H - -/** - * .obj __vt__6Bridge, global - * .4byte __RTTI__6Bridge - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__6BridgeFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__6BridgeFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__12ItemCreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__6BridgeFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__12ItemCreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__6BridgeFR18RandomAccessStream - * .4byte doLoad__6BridgeFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__10WorkObjectFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__10WorkObjectFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__6BridgeFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__10AICreatureFR9CollEvent - * .4byte bounceCallback__10AICreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__6BridgeFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__6BridgeFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__6BridgeFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__10WorkObjectFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__6Bridge - * .4byte 0xFFFFFD48 - * .4byte "@696@animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent" - * .4byte getCurrState__10AICreatureFv - * .4byte "setCurrState__10AICreatureFP20AState<10AICreature>" - * .4byte playSound__10AICreatureFi - * .4byte playEffect__10AICreatureFi - * .4byte startMotion__12ItemCreatureFi - * .4byte finishMotion__12ItemCreatureFv - * .4byte finishMotion__12ItemCreatureFf - * .4byte startMotion__12ItemCreatureFif - * .4byte getCurrentMotionName__12ItemCreatureFv - * .4byte getCurrentMotionCounter__12ItemCreatureFv - * .4byte getMotionSpeed__12ItemCreatureFv - * .4byte setMotionSpeed__12ItemCreatureFf - * .4byte stopMotion__12ItemCreatureFv - * .4byte animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent - * .4byte finalSetup__6BridgeFv - * .4byte isBridge__6BridgeFv - * .4byte isHinderRock__10WorkObjectFv - * .4byte isFinished__6BridgeFv - * .4byte workable__6BridgeFR8Vector3f - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void _28() = 0; // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C (weak) - virtual void _40() = 0; // _40 - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void _74() = 0; // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void _88() = 0; // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void _10C() = 0; // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct ItemCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void alwaysUpdatePlatform(); // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void getHeight(); // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void _88() = 0; // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void dump(); // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void doAI(); // _104 - virtual void doAnimation(); // _108 - virtual void _10C() = 0; // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void _120() = 0; // _120 - virtual void _124() = 0; // _124 - virtual void _128() = 0; // _128 - virtual void _12C() = 0; // _12C - virtual void startMotion(int); // _130 - virtual void finishMotion(); // _134 - virtual void finishMotion(float); // _138 - virtual void startMotion(int, float); // _13C - virtual void getCurrentMotionName(); // _140 - virtual void getCurrentMotionCounter(); // _144 - virtual void getMotionSpeed(); // _148 - virtual void setMotionSpeed(float); // _14C - virtual void stopMotion(); // _150 -}; - -struct WorkObject { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void alwaysUpdatePlatform(); // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void isVisible(); // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void dump(); // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void _120() = 0; // _120 - virtual void _124() = 0; // _124 - virtual void _128() = 0; // _128 - virtual void _12C() = 0; // _12C - virtual void _130() = 0; // _130 - virtual void _134() = 0; // _134 - virtual void _138() = 0; // _138 - virtual void _13C() = 0; // _13C - virtual void _140() = 0; // _140 - virtual void _144() = 0; // _144 - virtual void _148() = 0; // _148 - virtual void _14C() = 0; // _14C - virtual void _150() = 0; // _150 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 - virtual void isBridge(); // _15C - virtual void isHinderRock(); // _160 -}; - -struct AICreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void alwaysUpdatePlatform(); // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void _88() = 0; // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void dump(); // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void _10C() = 0; // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void getCurrState(); // _120 (weak) - virtual void setCurrState(AState*); // _124 (weak) - virtual void playSound(int); // _128 (weak) - virtual void playEffect(int); // _12C (weak) - virtual void _130() = 0; // _130 - virtual void _134() = 0; // _134 - virtual void _138() = 0; // _138 - virtual void _13C() = 0; // _13C - virtual void _140() = 0; // _140 - virtual void _144() = 0; // _144 - virtual void _148() = 0; // _148 - virtual void _14C() = 0; // _14C - virtual void _150() = 0; // _150 - virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _154 (weak) -}; - -/** - * @brief TODO - */ -struct Bridge : public RefCountable, public Creature, public ItemCreature, public WorkObject, public AICreature { - virtual void insideSafeArea(Vector3f&); // _10 - virtual void alwaysUpdatePlatform(); // _18 - virtual void startAI(int); // _34 - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void stimulate(Interaction&); // _A0 - virtual void dump(); // _C8 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void finalSetup(); // _158 - virtual void isBridge(); // _15C - virtual void isFinished(); // _164 - virtual void workable(Vector3f&); // _168 -}; - -#endif diff --git a/unsorted_include_todo/BuildingItem.h b/unsorted_include_todo/BuildingItem.h deleted file mode 100644 index 48efc295..00000000 --- a/unsorted_include_todo/BuildingItem.h +++ /dev/null @@ -1,372 +0,0 @@ -#ifndef _BUILDINGITEM_H -#define _BUILDINGITEM_H - -/** - * .obj __vt__12BuildingItem, global - * .4byte __RTTI__12BuildingItem - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__12BuildingItemFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__12ItemCreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__12BuildingItemFi - * .4byte getiMass__12BuildingItemFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__12ItemCreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__12BuildingItemFP11CreatureInf - * .4byte doRestore__12BuildingItemFP11CreatureInf - * .4byte doSave__12BuildingItemFR18RandomAccessStream - * .4byte doLoad__12BuildingItemFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__12BuildingItemFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__12BuildingItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__12BuildingItemFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__12ItemCreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__10AICreatureFR9CollEvent - * .4byte bounceCallback__10AICreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12BuildingItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12BuildingItemFR8Graphics - * .4byte refresh2d__12BuildingItemFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12BuildingItemFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__12BuildingItem - * .4byte 0xFFFFFD48 - * .4byte "@696@animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent" - * .4byte getCurrState__10AICreatureFv - * .4byte "setCurrState__10AICreatureFP20AState<10AICreature>" - * .4byte playSound__10AICreatureFi - * .4byte playEffect__12BuildingItemFi - * .4byte startMotion__12ItemCreatureFi - * .4byte finishMotion__12ItemCreatureFv - * .4byte finishMotion__12ItemCreatureFf - * .4byte startMotion__12ItemCreatureFif - * .4byte getCurrentMotionName__12ItemCreatureFv - * .4byte getCurrentMotionCounter__12ItemCreatureFv - * .4byte getMotionSpeed__12ItemCreatureFv - * .4byte setMotionSpeed__12ItemCreatureFf - * .4byte stopMotion__12ItemCreatureFv - * .4byte animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent - * .4byte finalSetup__12ItemCreatureFv - * .4byte isCompleted__12BuildingItemFv - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void _28() = 0; // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C (weak) - virtual void _40() = 0; // _40 - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 - virtual void doRestore(CreatureInf*); // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 (weak) - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void _A0() = 0; // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct ItemCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 (weak) - virtual void _3C() = 0; // _3C - virtual void getHeight(); // _40 - virtual void _44() = 0; // _44 - virtual void doStore(CreatureInf*); // _48 - virtual void doRestore(CreatureInf*); // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void needShadow(); // _90 (weak) - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void doAI(); // _104 - virtual void doAnimation(); // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void _120() = 0; // _120 - virtual void _124() = 0; // _124 - virtual void _128() = 0; // _128 - virtual void playEffect(int); // _12C - virtual void startMotion(int); // _130 - virtual void finishMotion(); // _134 - virtual void finishMotion(float); // _138 - virtual void startMotion(int, float); // _13C - virtual void getCurrentMotionName(); // _140 - virtual void getCurrentMotionCounter(); // _144 - virtual void getMotionSpeed(); // _148 - virtual void setMotionSpeed(float); // _14C - virtual void stopMotion(); // _150 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -struct AICreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 (weak) - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void doStore(CreatureInf*); // _48 - virtual void doRestore(CreatureInf*); // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void needShadow(); // _90 (weak) - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void _A0() = 0; // _A0 - virtual void _A4() = 0; // _A4 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void getCurrState(); // _120 (weak) - virtual void setCurrState(AState*); // _124 (weak) - virtual void playSound(int); // _128 (weak) - virtual void playEffect(int); // _12C - virtual void _130() = 0; // _130 - virtual void _134() = 0; // _134 - virtual void _138() = 0; // _138 - virtual void _13C() = 0; // _13C - virtual void _140() = 0; // _140 - virtual void _144() = 0; // _144 - virtual void _148() = 0; // _148 - virtual void _14C() = 0; // _14C - virtual void _150() = 0; // _150 - virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _154 (weak) -}; - -/** - * @brief TODO - */ -struct BuildingItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void insideSafeArea(Vector3f&); // _10 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 (weak) - virtual void doStore(CreatureInf*); // _48 - virtual void doRestore(CreatureInf*); // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getBoundingSphereRadius(); // _64 - virtual void isAlive(); // _88 - virtual void needShadow(); // _90 (weak) - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 - virtual void doKill(); // _10C - virtual void playEffect(int); // _12C - virtual void isCompleted(); // _15C - - BuildingItem(int, CreatureProp*, ItemShapeObject*, SimpleAI*); - void startBreakEffect(); - void stopBreakEffect(); -}; - -#endif diff --git a/unsorted_include_todo/BuildingItemProp.h b/unsorted_include_todo/BuildingItemProp.h deleted file mode 100644 index a5c0ab73..00000000 --- a/unsorted_include_todo/BuildingItemProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _BUILDINGITEMPROP_H -#define _BUILDINGITEMPROP_H - -/** - * .obj __vt__16BuildingItemProp, weak - * .4byte __RTTI__16BuildingItemProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct BuildingItemProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/DualCreature.h b/unsorted_include_todo/DualCreature.h deleted file mode 100644 index e23e61b9..00000000 --- a/unsorted_include_todo/DualCreature.h +++ /dev/null @@ -1,165 +0,0 @@ -#ifndef _DUALCREATURE_H -#define _DUALCREATURE_H - -/** - * .obj __vt__12DualCreature, global - * .4byte __RTTI__12DualCreature - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__8CreatureFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__8CreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__8CreatureFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__8CreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__8CreatureFR18RandomAccessStream - * .4byte doLoad__8CreatureFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8CreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__8CreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__8CreatureFR9CollEvent - * .4byte bounceCallback__8CreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12DualCreatureFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12DualCreatureFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8CreatureFv - * .4byte doAnimation__8CreatureFv - * .4byte doKill__12DualCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte onGround__12DualCreatureFv - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 (weak) - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void init(Vector3f&); // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 (weak) - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C (weak) - virtual void getHeight(); // _40 (weak) - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 (weak) - virtual void doLoad(RandomAccessStream&); // _54 (weak) - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void isAlive(); // _88 (weak) - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void collisionCallback(CollEvent&); // _A8 (weak) - virtual void bounceCallback(); // _AC (weak) - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void doAI(); // _104 (weak) - virtual void doAnimation(); // _108 (weak) - virtual void doKill(); // _10C - virtual void exitCourse(); // _110 (weak) -}; - -/** - * @brief TODO - */ -struct DualCreature : public RefCountable, public Creature { - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void doKill(); // _10C - virtual void onGround(); // _114 - - DualCreature(); -}; - -#endif diff --git a/unsorted_include_todo/GameCreditsSection.h b/unsorted_include_todo/GameCreditsSection.h deleted file mode 100644 index 5aa53335..00000000 --- a/unsorted_include_todo/GameCreditsSection.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef _GAMECREDITSSECTION_H -#define _GAMECREDITSSECTION_H - -/** - * .obj __vt__18GameCreditsSection, weak - * .4byte __RTTI__18GameCreditsSection - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte update__4NodeFv - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - * .4byte init__18GameCreditsSectionFv - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -struct Node { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void update(); // _10 - virtual void draw(Graphics&); // _14 - virtual void render(Graphics&); // _18 - virtual void concat(); // _1C (weak) - virtual void concat(VQS&); // _20 (weak) - virtual void concat(SRT&); // _24 (weak) - virtual void concat(Matrix4f&); // _28 (weak) - virtual void getModelMatrix(); // _2C (weak) -}; - -/** - * @brief TODO - */ -struct GameCreditsSection : public ANode, public CoreNode, public Node { - virtual void init(); // _30 (weak) - - GameCreditsSection(); -}; - -#endif diff --git a/unsorted_include_todo/HinderRock.h b/unsorted_include_todo/HinderRock.h deleted file mode 100644 index 068f893c..00000000 --- a/unsorted_include_todo/HinderRock.h +++ /dev/null @@ -1,455 +0,0 @@ -#ifndef _HINDERROCK_H -#define _HINDERROCK_H - -/** - * .obj __vt__10HinderRock, global - * .4byte __RTTI__10HinderRock - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__10HinderRockFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__12ItemCreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__10HinderRockFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__12ItemCreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__10HinderRockFR18RandomAccessStream - * .4byte doLoad__10HinderRockFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__10HinderRockFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__10WorkObjectFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__10WorkObjectFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__10HinderRockFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__10AICreatureFR9CollEvent - * .4byte bounceCallback__10AICreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__10HinderRockFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__10HinderRockFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__10WorkObjectFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__10HinderRock - * .4byte 0xFFFFFD48 - * .4byte "@696@animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent" - * .4byte getCurrState__10AICreatureFv - * .4byte "setCurrState__10AICreatureFP20AState<10AICreature>" - * .4byte playSound__10AICreatureFi - * .4byte playEffect__10AICreatureFi - * .4byte startMotion__12ItemCreatureFi - * .4byte finishMotion__12ItemCreatureFv - * .4byte finishMotion__12ItemCreatureFf - * .4byte startMotion__12ItemCreatureFif - * .4byte getCurrentMotionName__12ItemCreatureFv - * .4byte getCurrentMotionCounter__12ItemCreatureFv - * .4byte getMotionSpeed__12ItemCreatureFv - * .4byte setMotionSpeed__12ItemCreatureFf - * .4byte stopMotion__12ItemCreatureFv - * .4byte animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent - * .4byte finalSetup__10WorkObjectFv - * .4byte isBridge__10WorkObjectFv - * .4byte isHinderRock__10HinderRockFv - * .4byte isFinished__10HinderRockFv - * .4byte workable__10HinderRockFR8Vector3f - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void _28() = 0; // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C (weak) - virtual void _40() = 0; // _40 - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void _74() = 0; // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void _88() = 0; // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void _10C() = 0; // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct ItemCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void getHeight(); // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual f32 getCentreSize(); // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void _88() = 0; // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void doAI(); // _104 - virtual void doAnimation(); // _108 - virtual void _10C() = 0; // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void _120() = 0; // _120 - virtual void _124() = 0; // _124 - virtual void _128() = 0; // _128 - virtual void _12C() = 0; // _12C - virtual void startMotion(int); // _130 - virtual void finishMotion(); // _134 - virtual void finishMotion(float); // _138 - virtual void startMotion(int, float); // _13C - virtual void getCurrentMotionName(); // _140 - virtual void getCurrentMotionCounter(); // _144 - virtual void getMotionSpeed(); // _148 - virtual void setMotionSpeed(float); // _14C - virtual void stopMotion(); // _150 -}; - -struct WorkObject { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual f32 getCentreSize(); // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void isVisible(); // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void _120() = 0; // _120 - virtual void _124() = 0; // _124 - virtual void _128() = 0; // _128 - virtual void _12C() = 0; // _12C - virtual void _130() = 0; // _130 - virtual void _134() = 0; // _134 - virtual void _138() = 0; // _138 - virtual void _13C() = 0; // _13C - virtual void _140() = 0; // _140 - virtual void _144() = 0; // _144 - virtual void _148() = 0; // _148 - virtual void _14C() = 0; // _14C - virtual void _150() = 0; // _150 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 - virtual void isBridge(); // _15C -}; - -struct AICreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void _58() = 0; // _58 - virtual f32 getCentreSize(); // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void _88() = 0; // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void _10C() = 0; // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void getCurrState(); // _120 (weak) - virtual void setCurrState(AState*); // _124 (weak) - virtual void playSound(int); // _128 (weak) - virtual void playEffect(int); // _12C (weak) - virtual void _130() = 0; // _130 - virtual void _134() = 0; // _134 - virtual void _138() = 0; // _138 - virtual void _13C() = 0; // _13C - virtual void _140() = 0; // _140 - virtual void _144() = 0; // _144 - virtual void _148() = 0; // _148 - virtual void _14C() = 0; // _14C - virtual void _150() = 0; // _150 - virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _154 (weak) -}; - -/** - * @brief TODO - */ -struct HinderRock : public RefCountable, public Creature, public ItemCreature, public WorkObject, public AICreature { - virtual void insideSafeArea(Vector3f&); // _10 - virtual void startAI(int); // _34 - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual f32 getCentreSize(); // _5C - virtual void stimulate(Interaction&); // _A0 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void isHinderRock(); // _160 - virtual void isFinished(); // _164 - virtual void workable(Vector3f&); // _168 - - void beginPush(); -}; - -#endif diff --git a/unsorted_include_todo/KEffect.h b/unsorted_include_todo/KEffect.h deleted file mode 100644 index 095f85d0..00000000 --- a/unsorted_include_todo/KEffect.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _KEFFECT_H -#define _KEFFECT_H - -/** - * .obj __vt__7KEffect, weak - * .4byte __RTTI__7KEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__7KEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__7KEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte 0 - * .4byte kill__7KEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -/** - * @brief TODO - */ -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void _2C() = 0; // _2C - virtual void kill(); // _30 (weak) - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -#endif diff --git a/unsorted_include_todo/MemInfo.h b/unsorted_include_todo/MemInfo.h deleted file mode 100644 index 8fbced8c..00000000 --- a/unsorted_include_todo/MemInfo.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _MEMINFO_H -#define _MEMINFO_H - -/** - * .obj __vt__7MemInfo, weak - * .4byte __RTTI__7MemInfo - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -/** - * @brief TODO - */ -struct MemInfo : public ANode, public CoreNode { -}; - -#endif diff --git a/unsorted_include_todo/MemInfoNode.h b/unsorted_include_todo/MemInfoNode.h deleted file mode 100644 index b5154121..00000000 --- a/unsorted_include_todo/MemInfoNode.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _MEMINFONODE_H -#define _MEMINFONODE_H - -/** - * .obj __vt__11MemInfoNode, weak - * .4byte __RTTI__11MemInfoNode - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -/** - * @brief TODO - */ -struct MemInfoNode : public ANode, public CoreNode { -}; - -#endif diff --git a/unsorted_include_todo/MemStat.h b/unsorted_include_todo/MemStat.h deleted file mode 100644 index d0ee03ed..00000000 --- a/unsorted_include_todo/MemStat.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _MEMSTAT_H -#define _MEMSTAT_H - -/* - * @brief TODO - */ -struct MemStat { - MemStat(); - void reset(); - void start(char*); - void end(char*); - void print(); - void getInfo(char*); - void printInfoRec(MemInfo*, int); - void getInfoRec(char*, MemInfo*); -}; - -#endif diff --git a/unsorted_include_todo/PelCreature.h b/unsorted_include_todo/PelCreature.h deleted file mode 100644 index ea1b8ddc..00000000 --- a/unsorted_include_todo/PelCreature.h +++ /dev/null @@ -1,238 +0,0 @@ -#ifndef _PELCREATURE_H -#define _PELCREATURE_H - -/** - * .obj __vt__11PelCreature, global - * .4byte __RTTI__11PelCreature - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__8CreatureFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__11PelCreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__11PelCreatureFi - * .4byte getiMass__11PelCreatureFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__8CreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__8CreatureFR18RandomAccessStream - * .4byte doLoad__8CreatureFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__11PelCreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__8CreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__8CreatureFR9CollEvent - * .4byte bounceCallback__8CreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12DualCreatureFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12DualCreatureFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8CreatureFv - * .4byte doAnimation__8CreatureFv - * .4byte doKill__12DualCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte onGround__12DualCreatureFv - * .4byte doRender__11PelCreatureFR8GraphicsR8Matrix4f - * .4byte doCreateColls__11PelCreatureFR8Graphics - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 (weak) - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void init(Vector3f&); // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C (weak) - virtual void getHeight(); // _40 (weak) - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 (weak) - virtual void doLoad(RandomAccessStream&); // _54 (weak) - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void collisionCallback(CollEvent&); // _A8 (weak) - virtual void bounceCallback(); // _AC (weak) - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void _E0() = 0; // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void _EC() = 0; // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void doAI(); // _104 (weak) - virtual void doAnimation(); // _108 (weak) - virtual void _10C() = 0; // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct DualCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void _50() = 0; // _50 - virtual void _54() = 0; // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void _A0() = 0; // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void onGround(); // _114 -}; - -/** - * @brief TODO - */ -struct PelCreature : public RefCountable, public Creature, public DualCreature { - virtual void init(Vector3f&); // _28 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void isAlive(); // _88 - virtual void doRender(Graphics&, Matrix4f&); // _118 - virtual void doCreateColls(Graphics&); // _11C -}; - -#endif diff --git a/unsorted_include_todo/Pellet.h b/unsorted_include_todo/Pellet.h deleted file mode 100644 index 21ad41ba..00000000 --- a/unsorted_include_todo/Pellet.h +++ /dev/null @@ -1,298 +0,0 @@ -#ifndef _PELLET_H -#define _PELLET_H - -#include "types.h" -#include "Vector.h" -#include "Matrix4f.h" -#include "Graphics.h" -#include "Stream.h" -#include "Creature.h" -#include "Interactions.h" -#include "PelletConfig.h" -#include "PaniAnimator.h" - -/** - * .obj __vt__6Pellet, global - * .4byte __RTTI__6Pellet - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__8CreatureFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__6PelletFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__6PelletFi - * .4byte getiMass__6PelletFv - * .4byte getSize__6PelletFv - * .4byte getHeight__8CreatureFv - * .4byte getCylinderHeight__6PelletFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__6PelletFR18RandomAccessStream - * .4byte doLoad__6PelletFR18RandomAccessStream - * .4byte getCentre__6PelletFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__6PelletFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__6PelletFv - * .4byte isAlive__6PelletFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__6PelletFP8Creature - * .4byte isFree__6PelletFv - * .4byte stimulate__6PelletFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__6PelletFR9CollEvent - * .4byte bounceCallback__6PelletFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__6PelletFv - * .4byte finishWaterEffect__6PelletFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__6PelletFv - * .4byte postUpdate__6PelletFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__6PelletFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8CreatureFv - * .4byte doAnimation__6PelletFv - * .4byte doKill__6PelletFv - * .4byte exitCourse__8CreatureFv - * .4byte onGround__12DualCreatureFv - * .4byte doRender__6PelletFR8GraphicsR8Matrix4f - * .4byte doCreateColls__6PelletFR8Graphics - * .4byte __RTTI__6Pellet - * .4byte 0xFFFFFBC0 - * .4byte "@1088@animationKeyUpdated__6PelletFR16PaniAnimKeyEvent" - * .4byte animationKeyUpdated__6PelletFR16PaniAnimKeyEvent - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 (weak) - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void init(Vector3f&); // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void getHeight(); // _40 (weak) - virtual void getCylinderHeight(); // _44 - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 - virtual void isFree(); // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void collisionCallback(CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC - virtual void finishWaterEffect(); // _D0 - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void doAI(); // _104 (weak) - virtual void doAnimation(); // _108 - virtual void doKill(); // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct DualCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void _40() = 0; // _40 - virtual void getCylinderHeight(); // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getCentre(); // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void isVisible(); // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void ignoreAtari(Creature*); // _98 - virtual void isFree(); // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void startWaterEffect(); // _CC - virtual void finishWaterEffect(); // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void doAnimation(); // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void onGround(); // _114 -}; - -/** - * @brief TODO - */ -struct Pellet : public RefCountable, public Creature, public DualCreature { - virtual void init(Vector3f&); // _28 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void getCylinderHeight(); // _44 - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void getCentre(); // _58 - virtual void isVisible(); // _74 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void ignoreAtari(Creature*); // _98 - virtual void isFree(); // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void collisionCallback(struct CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void startWaterEffect(); // _CC - virtual void finishWaterEffect(); // _D0 - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void refresh(Graphics&); // _EC - virtual void doAnimation(); // _108 - virtual void doKill(); // _10C - virtual void doRender(Graphics&, Matrix4f&); // _118 - virtual void doCreateColls(Graphics&); // _11C - virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _12C (weak) - - Pellet(); - void isUfoPartsID(unsigned long); - void getState(); - void setTrySound(bool); - void startPick(); - void finishPick(); - void startGoal(); - void doCarry(Creature*, Vector3f&, u16); - void getBottomRadius(); - void startStickTeki(Creature*, float); - void endStickTeki(Creature*); - void winnable(int); - void stickSlot(int); - void stickOffSlot(int); - void getMinFreeSlotIndex(); - void getNearestFreeSlotIndex(Vector3f&); - void getRandomFreeSlotIndex(); - void getSlotLocalPos(int, float); - void getSlotGlobalPos(int, float); - void setSlotFlag(int); - void resetSlotFlag(int); - void isSlotFlag(int); - void initPellet(struct PelletShapeObject*, PelletConfig*); - void startCarryMotion(float); - void finishMotion(); -}; - -#endif diff --git a/unsorted_include_todo/PelletConfig.h b/unsorted_include_todo/PelletConfig.h deleted file mode 100644 index 6e50329c..00000000 --- a/unsorted_include_todo/PelletConfig.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _PELLETCONFIG_H -#define _PELLETCONFIG_H - -#include "types.h" -#include "ANode.h" -#include "Stream.h" - -/** - * .obj __vt__12PelletConfig, global - * .4byte __RTTI__12PelletConfig - * .4byte 0 - * .4byte __RTTI__12PelletConfig - * .4byte 0xFFFFFFFC - * .4byte getAgeNodeType__5ANodeFv - * .4byte "@4@read__12PelletConfigFR18RandomAccessStream" - * .4byte read__12PelletConfigFR18RandomAccessStream - */ - -/** - * @brief TODO - */ -struct PelletConfig : public ANode { - virtual void read(RandomAccessStream&); // _18 (weak) - - PelletConfig(); -}; - -#endif diff --git a/unsorted_include_todo/PelletMgr.h b/unsorted_include_todo/PelletMgr.h deleted file mode 100644 index 6e7a6cd0..00000000 --- a/unsorted_include_todo/PelletMgr.h +++ /dev/null @@ -1,140 +0,0 @@ -#ifndef _PELLETMGR_H -#define _PELLETMGR_H - -#include "types.h" -#include "Node.h" -#include "Creature.h" -#include "PelletView.h" - -/** - * .obj __vt__9PelletMgr, global - * .4byte __RTTI__9PelletMgr - * .4byte 0 - * .4byte getCreature__13MonoObjectMgrFi - * .4byte getFirst__13MonoObjectMgrFv - * .4byte getNext__13MonoObjectMgrFi - * .4byte isDone__13MonoObjectMgrFi - * .4byte __RTTI__9PelletMgr - * .4byte 0xFFFFFFF8 - * .4byte getAgeNodeType__5ANodeFv - * .4byte "@8@read__9PelletMgrFR18RandomAccessStream" - * .4byte "@8@update__13MonoObjectMgrFv" - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - * .4byte __dt__9PelletMgrFv - * .4byte update__13MonoObjectMgrFv - * .4byte postUpdate__13MonoObjectMgrFif - * .4byte stickUpdate__9ObjectMgrFv - * .4byte refresh__9PelletMgrFR8Graphics - * .4byte drawShadow__13MonoObjectMgrFR8GraphicsP7Texture - * .4byte getSize__13MonoObjectMgrFv - * .4byte getMax__13MonoObjectMgrFv - * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition - * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition - * .4byte search__13MonoObjectMgrFP9ObjectMgr - * .4byte killAll__9ObjectMgrFv - * .4byte birth__13MonoObjectMgrFv - * .4byte kill__13MonoObjectMgrFP8Creature - * .4byte createObject__9PelletMgrFv - * .4byte read__9PelletMgrFR18RandomAccessStream - */ - -struct MonoObjectMgr { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void _34() = 0; // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual ~MonoObjectMgr(); // _48 (weak) - virtual void update(); // _4C (weak) - virtual void postUpdate(int, f32); // _50 - virtual void _54() = 0; // _54 - virtual void refresh(Graphics&); // _58 - virtual void drawShadow(Graphics&, Texture*); // _5C - virtual void getSize(); // _60 (weak) - virtual void getMax(); // _64 (weak) - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void search(ObjectMgr*); // _70 - virtual void _74() = 0; // _74 - virtual void birth(); // _78 - virtual void kill(Creature*); // _7C -}; - -struct ObjectMgr { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void _34() = 0; // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual ~ObjectMgr(); // _48 (weak) - virtual void _4C() = 0; // _4C - virtual void _50() = 0; // _50 - virtual void stickUpdate(); // _54 - virtual void refresh(Graphics&); // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void findClosest(Vector3f&, f32, Condition*); // _68 - virtual void findClosest(Vector3f&, Condition*); // _6C - virtual void _70() = 0; // _70 - virtual void killAll(); // _74 -}; - -/** - * @brief TODO - */ -struct PelletMgr : public MonoObjectMgr, public ANode, public Node, public ObjectMgr { - virtual ~PelletMgr(); // _48 (weak) - virtual void refresh(Graphics&); // _58 - virtual void createObject(); // _80 - virtual void read(RandomAccessStream&); // _84 (weak) - - void getUfoIndexFromID(u32); - void getUfoIDFromIndex(int); - void decomposeNumberPellet(u32, int&, int&); - void registerUfoParts(); - void newNumberPellet(int, int); - void newPellet(u32, PelletView*); - void getShapeObject(u32); - PelletMgr(struct MapMgr*); - void addUseList(u32); - void initShapeInfos(); - void getConfigIndex(u32); - void getConfigFromIdx(int); - void getConfig(u32); - void readConfigs(RandomAccessStream&); - void readAnimInfos(RandomAccessStream&); - void initTekiNakaParts(); - void createShapeObjects(); - void refresh2d(Graphics&); -}; - -#endif diff --git a/unsorted_include_todo/PelletProp.h b/unsorted_include_todo/PelletProp.h deleted file mode 100644 index 06a783a0..00000000 --- a/unsorted_include_todo/PelletProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _PELLETPROP_H -#define _PELLETPROP_H - -/** - * .obj __vt__10PelletProp, weak - * .4byte __RTTI__10PelletProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct PelletProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/RopeCreature.h b/unsorted_include_todo/RopeCreature.h deleted file mode 100644 index e2519e9d..00000000 --- a/unsorted_include_todo/RopeCreature.h +++ /dev/null @@ -1,166 +0,0 @@ -#ifndef _ROPECREATURE_H -#define _ROPECREATURE_H - -/** - * .obj __vt__12RopeCreature, global - * .4byte __RTTI__12RopeCreature - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__8CreatureFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__8CreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__8CreatureFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__8CreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__8CreatureFR18RandomAccessStream - * .4byte doLoad__8CreatureFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8CreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__12RopeCreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__8CreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__8CreatureFR9CollEvent - * .4byte bounceCallback__8CreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12RopeCreatureFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12RopeCreatureFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8CreatureFv - * .4byte doAnimation__8CreatureFv - * .4byte 0 - * .4byte exitCourse__8CreatureFv - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 (weak) - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void init(Vector3f&); // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 (weak) - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C (weak) - virtual void getHeight(); // _40 (weak) - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 (weak) - virtual void doLoad(RandomAccessStream&); // _54 (weak) - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void isAlive(); // _88 (weak) - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 (weak) - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void collisionCallback(CollEvent&); // _A8 (weak) - virtual void bounceCallback(); // _AC (weak) - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void doAI(); // _104 (weak) - virtual void doAnimation(); // _108 (weak) - virtual void _10C() = 0; // _10C - virtual void exitCourse(); // _110 (weak) -}; - -/** - * @brief TODO - */ -struct RopeCreature : public RefCountable, public Creature { - virtual void needShadow(); // _90 (weak) - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void _10C() = 0; // _10C - - RopeCreature(CreatureProp*); - void setRope(Creature*); - void getRopePos(float); -}; - -#endif diff --git a/unsorted_include_todo/RopeItem.h b/unsorted_include_todo/RopeItem.h deleted file mode 100644 index 4411b60c..00000000 --- a/unsorted_include_todo/RopeItem.h +++ /dev/null @@ -1,230 +0,0 @@ -#ifndef _ROPEITEM_H -#define _ROPEITEM_H - -/** - * .obj __vt__8RopeItem, global - * .4byte __RTTI__8RopeItem - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__8CreatureFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__8RopeItemFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__8RopeItemFi - * .4byte getiMass__8RopeItemFv - * .4byte getSize__8RopeItemFv - * .4byte getHeight__8CreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__8CreatureFR18RandomAccessStream - * .4byte doLoad__8CreatureFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__8RopeItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8RopeItemFv - * .4byte isAlive__8RopeItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8RopeItemFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__8CreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__8CreatureFR9CollEvent - * .4byte bounceCallback__8CreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12RopeCreatureFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12RopeCreatureFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8CreatureFv - * .4byte doAnimation__8CreatureFv - * .4byte doKill__8RopeItemFv - * .4byte exitCourse__8CreatureFv - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 (weak) - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void init(Vector3f&); // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void getHeight(); // _40 (weak) - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 (weak) - virtual void doLoad(RandomAccessStream&); // _54 (weak) - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void stimulate(Interaction&); // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void collisionCallback(CollEvent&); // _A8 (weak) - virtual void bounceCallback(); // _AC (weak) - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void _E0() = 0; // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void _EC() = 0; // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void doAI(); // _104 (weak) - virtual void doAnimation(); // _108 (weak) - virtual void doKill(); // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct RopeCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void _50() = 0; // _50 - virtual void _54() = 0; // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void isVisible(); // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void needShadow(); // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void _A0() = 0; // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC -}; - -/** - * @brief TODO - */ -struct RopeItem : public RefCountable, public Creature, public RopeCreature { - virtual void init(Vector3f&); // _28 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void isVisible(); // _74 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void needShadow(); // _90 - virtual void doKill(); // _10C - - RopeItem(CreatureProp*, Shape*); -}; - -#endif diff --git a/unsorted_include_todo/RopeProp.h b/unsorted_include_todo/RopeProp.h deleted file mode 100644 index 59a0494f..00000000 --- a/unsorted_include_todo/RopeProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _ROPEPROP_H -#define _ROPEPROP_H - -/** - * .obj __vt__8RopeProp, weak - * .4byte __RTTI__8RopeProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct RopeProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/Stickers.h b/unsorted_include_todo/Stickers.h deleted file mode 100644 index 621ffe19..00000000 --- a/unsorted_include_todo/Stickers.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _STICKERS_H -#define _STICKERS_H - -/** - * .obj __vt__8Stickers, global - * .4byte __RTTI__8Stickers - * .4byte 0 - * .4byte getCreature__8StickersFi - * .4byte getFirst__8StickersFv - * .4byte getNext__8StickersFi - * .4byte isDone__8StickersFi - */ - -/** - * @brief TODO - */ -struct Stickers { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 -}; - -#endif diff --git a/unsorted_include_todo/WorkObject.h b/unsorted_include_todo/WorkObject.h deleted file mode 100644 index c7bb75a0..00000000 --- a/unsorted_include_todo/WorkObject.h +++ /dev/null @@ -1,361 +0,0 @@ -#ifndef _WORKOBJECT_H -#define _WORKOBJECT_H - -/** - * .obj __vt__10WorkObject, global - * .4byte __RTTI__10WorkObject - * .4byte 0 - * .4byte addCntCallback__12RefCountableFv - * .4byte subCntCallback__12RefCountableFv - * .4byte insideSafeArea__8CreatureFR8Vector3f - * .4byte platAttachable__8CreatureFv - * .4byte alwaysUpdatePlatform__8CreatureFv - * .4byte doDoAI__8CreatureFv - * .4byte setRouteTracer__8CreatureFP11RouteTracer - * .4byte init__8CreatureFv - * .4byte init__12ItemCreatureFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__8CreatureFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__8CreatureFv - * .4byte getHeight__12ItemCreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__8CreatureFR18RandomAccessStream - * .4byte doLoad__8CreatureFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__10WorkObjectFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__10WorkObjectFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__12ItemCreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__10AICreatureFR9CollEvent - * .4byte bounceCallback__10AICreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8CreatureFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12ItemCreatureFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12ItemCreatureFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__10WorkObjectFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__10WorkObject - * .4byte 0xFFFFFD48 - * .4byte "@696@animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent" - * .4byte getCurrState__10AICreatureFv - * .4byte "setCurrState__10AICreatureFP20AState<10AICreature>" - * .4byte playSound__10AICreatureFi - * .4byte playEffect__10AICreatureFi - * .4byte startMotion__12ItemCreatureFi - * .4byte finishMotion__12ItemCreatureFv - * .4byte finishMotion__12ItemCreatureFf - * .4byte startMotion__12ItemCreatureFif - * .4byte getCurrentMotionName__12ItemCreatureFv - * .4byte getCurrentMotionCounter__12ItemCreatureFv - * .4byte getMotionSpeed__12ItemCreatureFv - * .4byte setMotionSpeed__12ItemCreatureFf - * .4byte stopMotion__12ItemCreatureFv - * .4byte animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent - * .4byte finalSetup__10WorkObjectFv - * .4byte isBridge__10WorkObjectFv - * .4byte isHinderRock__10WorkObjectFv - * .4byte isFinished__10WorkObjectFv - * .4byte workable__10WorkObjectFR8Vector3f - */ - -struct RefCountable { - virtual void addCntCallback(); // _08 (weak) - virtual void subCntCallback(); // _0C (weak) -}; - -struct Creature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void insideSafeArea(Vector3f&); // _10 (weak) - virtual void platAttachable(); // _14 (weak) - virtual void alwaysUpdatePlatform(); // _18 - virtual void doDoAI(); // _1C (weak) - virtual void setRouteTracer(RouteTracer*); // _20 (weak) - virtual void init(); // _24 - virtual void _28() = 0; // _28 - virtual void resetPosition(Vector3f&); // _2C - virtual void initParam(int); // _30 (weak) - virtual void startAI(int); // _34 (weak) - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C (weak) - virtual void _40() = 0; // _40 - virtual void getCylinderHeight(); // _44 (weak) - virtual void doStore(CreatureInf*); // _48 (weak) - virtual void doRestore(CreatureInf*); // _4C (weak) - virtual void doSave(RandomAccessStream&); // _50 (weak) - virtual void doLoad(RandomAccessStream&); // _54 (weak) - virtual void getCentre(); // _58 - virtual f32 getCentreSize(); // _5C - virtual void getBoundingSphereCentre(); // _60 - virtual void getBoundingSphereRadius(); // _64 - virtual void getShadowPos(); // _68 (weak) - virtual void setCentre(Vector3f&); // _6C (weak) - virtual void getShadowSize(); // _70 - virtual void isVisible(); // _74 - virtual void isOrganic(); // _78 (weak) - virtual void isTerrible(); // _7C - virtual void isBuried(); // _80 (weak) - virtual void isAtari(); // _84 (weak) - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 (weak) - virtual void ignoreAtari(Creature*); // _98 (weak) - virtual void isFree(); // _9C (weak) - virtual void _A0() = 0; // _A0 - virtual void sendMsg(Msg*); // _A4 (weak) - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void jumpCallback(); // _B0 (weak) - virtual void wallCallback(Plane&, DynCollObject*); // _B4 - virtual void offwallCallback(DynCollObject*); // _B8 (weak) - virtual void stickCallback(Creature*); // _BC (weak) - virtual void offstickCallback(Creature*); // _C0 (weak) - virtual void stickToCallback(Creature*); // _C4 (weak) - virtual void dump(); // _C8 (weak) - virtual void startWaterEffect(); // _CC (weak) - virtual void finishWaterEffect(); // _D0 (weak) - virtual void isRopable(); // _D4 (weak) - virtual void mayIstick(); // _D8 (weak) - virtual void getFormationPri(); // _DC (weak) - virtual void _E0() = 0; // _E0 - virtual void postUpdate(int, float); // _E4 - virtual void stickUpdate(); // _E8 - virtual void _EC() = 0; // _EC - virtual void refresh2d(Graphics&); // _F0 (weak) - virtual void renderAtari(Graphics&); // _F4 - virtual void drawShadow(Graphics&); // _F8 - virtual void demoDraw(Graphics&, Matrix4f*); // _FC - virtual void getCatchPos(Creature*); // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void exitCourse(); // _110 (weak) -}; - -struct ItemCreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void init(Vector3f&); // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void _34() = 0; // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void getHeight(); // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void _50() = 0; // _50 - virtual void _54() = 0; // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void isVisible(); // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void stimulate(Interaction&); // _A0 - virtual void _A4() = 0; // _A4 - virtual void _A8() = 0; // _A8 - virtual void _AC() = 0; // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void update(); // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void refresh(Graphics&); // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void doAI(); // _104 - virtual void doAnimation(); // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void _120() = 0; // _120 - virtual void _124() = 0; // _124 - virtual void _128() = 0; // _128 - virtual void _12C() = 0; // _12C - virtual void startMotion(int); // _130 - virtual void finishMotion(); // _134 - virtual void finishMotion(float); // _138 - virtual void startMotion(int, float); // _13C - virtual void getCurrentMotionName(); // _140 - virtual void getCurrentMotionCounter(); // _144 - virtual void getMotionSpeed(); // _148 - virtual void setMotionSpeed(float); // _14C - virtual void stopMotion(); // _150 -}; - -struct AICreature { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void _34() = 0; // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual void _48() = 0; // _48 - virtual void _4C() = 0; // _4C - virtual void _50() = 0; // _50 - virtual void _54() = 0; // _54 - virtual void _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void _68() = 0; // _68 - virtual void _6C() = 0; // _6C - virtual void _70() = 0; // _70 - virtual void isVisible(); // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void _94() = 0; // _94 - virtual void _98() = 0; // _98 - virtual void _9C() = 0; // _9C - virtual void _A0() = 0; // _A0 - virtual void _A4() = 0; // _A4 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void bounceCallback(); // _AC - virtual void _B0() = 0; // _B0 - virtual void _B4() = 0; // _B4 - virtual void _B8() = 0; // _B8 - virtual void _BC() = 0; // _BC - virtual void _C0() = 0; // _C0 - virtual void _C4() = 0; // _C4 - virtual void _C8() = 0; // _C8 - virtual void _CC() = 0; // _CC - virtual void _D0() = 0; // _D0 - virtual void _D4() = 0; // _D4 - virtual void _D8() = 0; // _D8 - virtual void _DC() = 0; // _DC - virtual void _E0() = 0; // _E0 - virtual void _E4() = 0; // _E4 - virtual void _E8() = 0; // _E8 - virtual void _EC() = 0; // _EC - virtual void _F0() = 0; // _F0 - virtual void _F4() = 0; // _F4 - virtual void _F8() = 0; // _F8 - virtual void _FC() = 0; // _FC - virtual void _100() = 0; // _100 - virtual void _104() = 0; // _104 - virtual void _108() = 0; // _108 - virtual void doKill(); // _10C - virtual void _110() = 0; // _110 - virtual void _114() = 0; // _114 - virtual void _118() = 0; // _118 - virtual void _11C() = 0; // _11C - virtual void getCurrState(); // _120 (weak) - virtual void setCurrState(AState*); // _124 (weak) - virtual void playSound(int); // _128 (weak) - virtual void playEffect(int); // _12C (weak) - virtual void _130() = 0; // _130 - virtual void _134() = 0; // _134 - virtual void _138() = 0; // _138 - virtual void _13C() = 0; // _13C - virtual void _140() = 0; // _140 - virtual void _144() = 0; // _144 - virtual void _148() = 0; // _148 - virtual void _14C() = 0; // _14C - virtual void _150() = 0; // _150 - virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _154 (weak) -}; - -/** - * @brief TODO - */ -struct WorkObject : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 - virtual void doKill(); // _10C - virtual void finalSetup(); // _158 - virtual void isBridge(); // _15C - virtual void isHinderRock(); // _160 - virtual void isFinished(); // _164 - virtual void workable(Vector3f&); // _168 -}; - -#endif diff --git a/unsorted_include_todo/WorkObjectMgr.h b/unsorted_include_todo/WorkObjectMgr.h deleted file mode 100644 index 1096f3b0..00000000 --- a/unsorted_include_todo/WorkObjectMgr.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef _WORKOBJECTMGR_H -#define _WORKOBJECTMGR_H - -/** - * .obj __vt__13WorkObjectMgr, global - * .4byte __RTTI__13WorkObjectMgr - * .4byte 0 - * .4byte getCreature__13WorkObjectMgrFi - * .4byte getFirst__13WorkObjectMgrFv - * .4byte getNext__13WorkObjectMgrFi - * .4byte isDone__13WorkObjectMgrFi - * .4byte __RTTI__13WorkObjectMgr - * .4byte 0xFFFFFFF8 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte "@8@update__9ObjectMgrFv" - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - * .4byte __dt__13WorkObjectMgrFv - * .4byte update__9ObjectMgrFv - * .4byte postUpdate__9ObjectMgrFif - * .4byte stickUpdate__9ObjectMgrFv - * .4byte refresh__9ObjectMgrFR8Graphics - * .4byte drawShadow__9ObjectMgrFR8GraphicsP7Texture - * .4byte getSize__13WorkObjectMgrFv - * .4byte getMax__13WorkObjectMgrFv - * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition - * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition - * .4byte search__9ObjectMgrFP9ObjectMgr - * .4byte killAll__9ObjectMgrFv - */ - -struct ANode { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void getAgeNodeType(); // _20 (weak) -}; - -struct CoreNode { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void read(RandomAccessStream&); // _24 (weak) -}; - -struct Node { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void draw(Graphics&); // _2C - virtual void render(Graphics&); // _30 - virtual void concat(); // _34 (weak) - virtual void concat(VQS&); // _38 (weak) - virtual void concat(SRT&); // _3C (weak) - virtual void concat(Matrix4f&); // _40 (weak) - virtual void getModelMatrix(); // _44 (weak) -}; - -struct ObjectMgr { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void _34() = 0; // _34 - virtual void _38() = 0; // _38 - virtual void _3C() = 0; // _3C - virtual void _40() = 0; // _40 - virtual void _44() = 0; // _44 - virtual ~ObjectMgr(); // _48 - virtual void update(); // _4C - virtual void postUpdate(int, float); // _50 - virtual void stickUpdate(); // _54 - virtual void refresh(Graphics&); // _58 - virtual void drawShadow(Graphics&, Texture*); // _5C - virtual void getSize(); // _60 - virtual void getMax(); // _64 - virtual void findClosest(Vector3f&, float, Condition*); // _68 - virtual void findClosest(Vector3f&, Condition*); // _6C - virtual void search(ObjectMgr*); // _70 - virtual void killAll(); // _74 -}; - -/** - * @brief TODO - */ -struct WorkObjectMgr : public ANode, public CoreNode, public Node, public ObjectMgr { - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 - virtual ~WorkObjectMgr(); // _48 - virtual void getSize(); // _60 - virtual void getMax(); // _64 -}; - -#endif diff --git a/unsorted_include_todo/WorkObjectNode.h b/unsorted_include_todo/WorkObjectNode.h deleted file mode 100644 index 61d4d2a9..00000000 --- a/unsorted_include_todo/WorkObjectNode.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _WORKOBJECTNODE_H -#define _WORKOBJECTNODE_H - -/** - * .obj __vt__14WorkObjectNode, weak - * .4byte __RTTI__14WorkObjectNode - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -/** - * @brief TODO - */ -struct WorkObjectNode : public ANode, public CoreNode { -}; - -#endif diff --git a/unsorted_include_todo/zen.h b/unsorted_include_todo/zen.h deleted file mode 100644 index 4d47438b..00000000 --- a/unsorted_include_todo/zen.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ZEN_H -#define _ZEN_H - -#include "types.h" -#include "Vector.h" -#include "Matrix3f.h" - -/* - * @brief TODO - */ -namespace zen { - void ogCheckInsCard(); - void calcPuruPuruScale(f32); - void setNumberTag(P2DScreen*, u32, int*, int); - void setTextColor(P2DTextBox*, P2DPicture*); - void getStringCVS(char*, char*, s16); - void getSpecialNumber(int); - void setSpecialNumber(int, int); - void cnvSpecialNumber(char*); - void cnvSpecialNumberHyphen(char*); - void getDistPointAndLine(Vector3f, Vector3f, Vector3f, f32&); - void makeRotMatrix(Vector3f&, Matrix3f&); - void makePathName(const char*, const char*, char*); - void loadTexExp(const char*, bool, bool); -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/PCRData.h b/unsorted_include_todo/zen/PCRData.h deleted file mode 100644 index 85811ac1..00000000 --- a/unsorted_include_todo/zen/PCRData.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ZEN_PCRDATA_H -#define _ZEN_PCRDATA_H - -/** - * .obj __vt__Q23zen7PCRData, weak - * .4byte __RTTI__Q23zen7PCRData - * .4byte 0 - * .4byte insertAfter__Q23zen7zenListFPQ23zen7zenList - * .4byte remove__Q23zen7zenListFv - */ - -namespace zen { -struct zenList { - virtual void insertAfter(zenList*); // _08 - virtual void remove(); // _0C -}; -} // namespace zen - -namespace zen { -/** - * @brief TODO - */ -struct PCRData : public zenList { -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/PtclGenPack.h b/unsorted_include_todo/zen/PtclGenPack.h deleted file mode 100644 index c217317e..00000000 --- a/unsorted_include_todo/zen/PtclGenPack.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _ZEN_PTCLGENPACK_H -#define _ZEN_PTCLGENPACK_H - -/* - * @brief TODO - */ -namespace zen { -struct PtclGenPack { - void setPtclGenPtr(unsigned long, zen::particleGenerator*); - void setEmitPosPtr(Vector3f*); - void startGen(); - void stopGen(); - void finish(); - void forceFinish(); - void checkStopGen(); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/bBoardColourAnim.h b/unsorted_include_todo/zen/bBoardColourAnim.h deleted file mode 100644 index cbc92266..00000000 --- a/unsorted_include_todo/zen/bBoardColourAnim.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_BBOARDCOLOURANIM_H -#define _ZEN_BBOARDCOLOURANIM_H - -/* - * @brief TODO - */ -namespace zen { -struct bBoardColourAnim { - void update(float, Colour*, Colour*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/bBoardColourAnimData.h b/unsorted_include_todo/zen/bBoardColourAnimData.h deleted file mode 100644 index 3001e83d..00000000 --- a/unsorted_include_todo/zen/bBoardColourAnimData.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ZEN_BBOARDCOLOURANIMDATA_H -#define _ZEN_BBOARDCOLOURANIMDATA_H - -#include "types.h" - -/* - * @brief TODO - */ -namespace zen { -struct bBoardColourAnimData { - void set(u8*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleChildMdl.h b/unsorted_include_todo/zen/particleChildMdl.h deleted file mode 100644 index a6aa6878..00000000 --- a/unsorted_include_todo/zen/particleChildMdl.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ZEN_PARTICLECHILDMDL_H -#define _ZEN_PARTICLECHILDMDL_H - -/** - * .obj __vt__Q23zen16particleChildMdl, weak - * .4byte __RTTI__Q23zen16particleChildMdl - * .4byte 0 - * .4byte insertAfter__Q23zen7zenListFPQ23zen7zenList - * .4byte remove__Q23zen16particleChildMdlFv - */ - -namespace zen { -struct zenList { - virtual void insertAfter(zenList*); // _08 -}; -} // namespace zen - -namespace zen { -/** - * @brief TODO - */ -struct particleChildMdl : public zenList { - virtual void remove(); // _0C -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleGenerator.h b/unsorted_include_todo/zen/particleGenerator.h deleted file mode 100644 index fd2cba11..00000000 --- a/unsorted_include_todo/zen/particleGenerator.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ZEN_PARTICLEGENERATOR_H -#define _ZEN_PARTICLEGENERATOR_H - -/** - * .obj __vt__Q23zen17particleGenerator, weak - * .4byte __RTTI__Q23zen17particleGenerator - * .4byte 0 - * .4byte insertAfter__Q23zen7zenListFPQ23zen7zenList - * .4byte remove__Q23zen17particleGeneratorFv - */ - -namespace zen { -struct zenList { - virtual void insertAfter(zenList*); // _08 -}; -} // namespace zen - -namespace zen { -/** - * @brief TODO - */ -struct particleGenerator : public zenList { - virtual void remove(); // _0C -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleLoader.h b/unsorted_include_todo/zen/particleLoader.h deleted file mode 100644 index f39b832f..00000000 --- a/unsorted_include_todo/zen/particleLoader.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _ZEN_PARTICLELOADER_H -#define _ZEN_PARTICLELOADER_H - -/* - * @brief TODO - */ -namespace zen { -struct particleLoader { - void load(char*, bool); - void pmFind(char*); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleManager.h b/unsorted_include_todo/zen/particleManager.h deleted file mode 100644 index 458b0d2a..00000000 --- a/unsorted_include_todo/zen/particleManager.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ZEN_PARTICLEMANAGER_H -#define _ZEN_PARTICLEMANAGER_H - -#include "types.h" - -/* - * @brief TODO - */ -namespace zen { -struct particleManager { - void init(u32, u32, u32, f32); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleMdl.h b/unsorted_include_todo/zen/particleMdl.h deleted file mode 100644 index 49487ed4..00000000 --- a/unsorted_include_todo/zen/particleMdl.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ZEN_PARTICLEMDL_H -#define _ZEN_PARTICLEMDL_H - -/** - * .obj __vt__Q23zen11particleMdl, weak - * .4byte __RTTI__Q23zen11particleMdl - * .4byte 0 - * .4byte insertAfter__Q23zen7zenListFPQ23zen7zenList - * .4byte remove__Q23zen11particleMdlFv - */ - -namespace zen { -struct zenList { - virtual void insertAfter(zenList*); // _08 -}; -} // namespace zen - -namespace zen { -/** - * @brief TODO - */ -struct particleMdl : public zenList { - virtual void remove(); // _0C -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleMdlBase.h b/unsorted_include_todo/zen/particleMdlBase.h deleted file mode 100644 index 2c81f5cb..00000000 --- a/unsorted_include_todo/zen/particleMdlBase.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ZEN_PARTICLEMDLBASE_H -#define _ZEN_PARTICLEMDLBASE_H - -/** - * .obj __vt__Q23zen15particleMdlBase, weak - * .4byte __RTTI__Q23zen15particleMdlBase - * .4byte 0 - * .4byte insertAfter__Q23zen7zenListFPQ23zen7zenList - * .4byte remove__Q23zen15particleMdlBaseFv - */ - -namespace zen { -struct zenList { - virtual void insertAfter(zenList*); // _08 -}; -} // namespace zen - -namespace zen { -/** - * @brief TODO - */ -struct particleMdlBase : public zenList { - virtual void remove(); // _0C -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/particleMdlManager.h b/unsorted_include_todo/zen/particleMdlManager.h deleted file mode 100644 index f4515f1a..00000000 --- a/unsorted_include_todo/zen/particleMdlManager.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ZEN_PARTICLEMDLMANAGER_H -#define _ZEN_PARTICLEMDLMANAGER_H - -/* - * @brief TODO - */ -namespace zen { -struct particleMdlManager { - void init(unsigned long, unsigned long); -}; -} // namespace zen - -#endif diff --git a/unsorted_include_todo/zen/simplePtclManager.h b/unsorted_include_todo/zen/simplePtclManager.h deleted file mode 100644 index 35371a62..00000000 --- a/unsorted_include_todo/zen/simplePtclManager.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ZEN_SIMPLEPTCLMANAGER_H -#define _ZEN_SIMPLEPTCLMANAGER_H - -/* - * @brief TODO - */ -namespace zen { -struct simplePtclManager { - void update(float); - void draw(Graphics&); - void forceFinish(); -}; -} // namespace zen - -#endif