From 54cbb371060170ff446dd38bb3fea29fecdfd2fb Mon Sep 17 00:00:00 2001 From: Dean Southwood Date: Wed, 18 Sep 2024 19:22:52 +1000 Subject: [PATCH] misc Kando/Nakata/Nishimura --- configure.py | 6 +- include/Actor.h | 4 +- include/Animator.h | 4 +- include/BaseInf.h | 189 ++++ include/BombItem.h | 45 + include/Boss.h | 24 + include/BossConditions.h | 67 ++ include/Controller.h | 7 +- include/Creature.h | 3 +- include/CreatureNode.h | 5 + include/DoorItem.h | 45 + include/FishItem.h | 33 + include/GemItem.h | 46 + include/Geometry.h | 8 + include/HmRumble.h | 20 - include/ItemMgr.h | 46 +- include/ItemObject.h | 90 ++ include/KMath.h | 11 + include/KeyItem.h | 42 + include/Kontroller.h | 34 + include/KusaItem.h | 64 ++ include/MizuItem.h | 36 + include/ObjectMgr.h | 13 +- include/PaniAnimator.h | 31 + include/PaniTestSection.h | 43 + include/Pellet.h | 20 +- include/Piki.h | 5 +- include/PikiAI.h | 19 + include/PikiHeadItem.h | 68 ++ include/PikiMgr.h | 66 ++ include/RumbleMgr.h | 95 ++ include/SearchSystem.h | 15 +- include/SeedItem.h | 47 + include/TekiAnimationManager.h | 22 + include/TekiParameters.h | 20 + .../TekiPersonality.h | 16 +- include/UfoItem.h | 33 +- include/WeedsItem.h | 118 +++ include/Win.h | 46 +- include/teki.h | 27 +- src/plugPikiKando/actorMgr.cpp | 2 +- src/plugPikiKando/aiAttack.cpp | 1 + src/plugPikiKando/aiTable.cpp | 4 + src/plugPikiKando/bombItem.cpp | 15 +- src/plugPikiKando/fishItem.cpp | 3 +- src/plugPikiKando/gmWin.cpp | 5 +- src/plugPikiKando/itemGem.cpp | 15 +- src/plugPikiKando/itemMgr.cpp | 53 +- src/plugPikiKando/itemObject.cpp | 30 +- src/plugPikiKando/keyItem.cpp | 33 +- src/plugPikiKando/kmath.cpp | 4 +- src/plugPikiKando/kontroller.cpp | 139 +-- src/plugPikiKando/kusaItem.cpp | 28 +- src/plugPikiKando/mapParts.cpp | 8 +- src/plugPikiKando/mizuItem.cpp | 9 +- src/plugPikiKando/navi.cpp | 4 +- src/plugPikiKando/objectMgr.cpp | 5 +- src/plugPikiKando/paniItemAnimator.cpp | 4 +- src/plugPikiKando/paniPlantAnimator.cpp | 4 +- src/plugPikiKando/panipikianimator.cpp | 4 +- src/plugPikiKando/pelletMgr.cpp | 2 +- src/plugPikiKando/pikiInf.cpp | 816 ++---------------- src/plugPikiKando/pikiMgr.cpp | 83 +- src/plugPikiKando/pikiheadItem.cpp | 19 +- src/plugPikiKando/searchSystem.cpp | 10 +- src/plugPikiKando/seedItem.cpp | 15 +- src/plugPikiKando/ufoAnim.cpp | 44 +- src/plugPikiKando/weedsItem.cpp | 36 +- src/plugPikiNakata/genteki.cpp | 7 +- src/plugPikiNakata/panianimator.cpp | 4 +- src/plugPikiNakata/panipikianimmgr.cpp | 4 +- src/plugPikiNakata/panitekianimator.cpp | 4 +- src/plugPikiNakata/panitestsection.cpp | 16 +- src/plugPikiNakata/teki.cpp | 165 +--- src/plugPikiNakata/tekianimationmanager.cpp | 2 +- src/plugPikiNakata/tekibteki.cpp | 2 +- src/plugPikiNakata/tekiinteraction.cpp | 15 +- src/plugPikiNakata/tekimgr.cpp | 20 +- src/plugPikiNakata/tekinakata.cpp | 9 +- src/plugPikiNakata/tekinteki.cpp | 19 +- src/plugPikiNakata/tekiparameters.cpp | 2 +- src/plugPikiNakata/tekipersonality.cpp | 2 +- src/plugPikiNishimura/Boss.cpp | 2 +- src/plugPikiNishimura/BossAnimMgr.cpp | 64 +- src/plugPikiNishimura/BossCnd.cpp | 12 +- src/plugPikiNishimura/BossMgr.cpp | 30 +- src/plugPikiNishimura/HmRumbleMgr.cpp | 4 +- src/plugPikiNishimura/HmRumbleSample.cpp | 29 +- src/plugPikiNishimura/genBoss.cpp | 4 +- src/plugPikiOgawa/ogSub.cpp | 2 +- unsorted_include_todo/BPikiInf.h | 35 - unsorted_include_todo/BPikiInfMgr.h | 31 - unsorted_include_todo/BaseInf.h | 35 - unsorted_include_todo/BoBaseItem.h | 359 -------- unsorted_include_todo/BombGenItem.h | 414 --------- unsorted_include_todo/BombItem.h | 366 -------- unsorted_include_todo/BombItemProp.h | 21 - unsorted_include_todo/BossAnimationManager.h | 50 -- unsorted_include_todo/BossNode.h | 27 - unsorted_include_todo/CndBossCollKill.h | 18 - unsorted_include_todo/CndBossFlick.h | 18 - unsorted_include_todo/CndIsAlive.h | 18 - unsorted_include_todo/CndStickBossKill.h | 18 - unsorted_include_todo/CndStickMouthKill.h | 18 - unsorted_include_todo/CreatureInf.h | 46 - unsorted_include_todo/CreatureInfMgr.h | 31 - unsorted_include_todo/DoorItem.h | 361 -------- unsorted_include_todo/DoorProp.h | 21 - unsorted_include_todo/Fish.h | 11 - unsorted_include_todo/FishGenerator.h | 357 -------- unsorted_include_todo/Fulcrum.h | 410 --------- unsorted_include_todo/GemItem.h | 12 - unsorted_include_todo/GrassGen.h | 358 -------- unsorted_include_todo/InfMgr.h | 26 - unsorted_include_todo/ItemBall.h | 354 -------- unsorted_include_todo/KeyItem.h | 170 ---- unsorted_include_todo/KeyProp.h | 21 - unsorted_include_todo/Kontroller.h | 51 -- unsorted_include_todo/KusaItem.h | 363 -------- unsorted_include_todo/KusaItemProp.h | 21 - unsorted_include_todo/MeltingPotMgr.h | 148 ---- unsorted_include_todo/MizuItem.h | 357 -------- unsorted_include_todo/MizuItemProp.h | 21 - unsorted_include_todo/MonoInfMgr.h | 28 - unsorted_include_todo/NaviDemoSunsetGoal.h | 410 --------- unsorted_include_todo/NaviDemoSunsetStart.h | 410 --------- unsorted_include_todo/PaniTestNode.h | 55 -- unsorted_include_todo/PaniTestSection.h | 50 -- unsorted_include_todo/PelletMgr/UseNode.h | 29 - unsorted_include_todo/PikiHeadItem.h | 363 -------- unsorted_include_todo/PikiHeadItemProp.h | 21 - unsorted_include_todo/PikiHeadMgr.h | 156 ---- unsorted_include_todo/PikiMgr.h | 147 ---- unsorted_include_todo/PikiProp.h | 18 - unsorted_include_todo/RockGen.h | 362 -------- unsorted_include_todo/RumbleSample.h | 13 - unsorted_include_todo/SeedItem.h | 171 ---- unsorted_include_todo/SeedProp.h | 21 - unsorted_include_todo/TekiAnimationManager.h | 46 - unsorted_include_todo/TekiNakata.h | 12 - unsorted_include_todo/TekiParameters.h | 46 - unsorted_include_todo/TopAction.h | 84 -- unsorted_include_todo/UfoShapeObject.h | 11 - unsorted_include_todo/Weed.h | 358 -------- unsorted_include_todo/WeedsGen.h | 354 -------- 145 files changed, 1857 insertions(+), 9221 deletions(-) create mode 100644 include/BaseInf.h create mode 100644 include/BombItem.h create mode 100644 include/BossConditions.h create mode 100644 include/DoorItem.h create mode 100644 include/FishItem.h create mode 100644 include/GemItem.h delete mode 100644 include/HmRumble.h create mode 100644 include/ItemObject.h create mode 100644 include/KeyItem.h create mode 100644 include/Kontroller.h create mode 100644 include/KusaItem.h create mode 100644 include/MizuItem.h create mode 100644 include/PaniTestSection.h create mode 100644 include/PikiHeadItem.h create mode 100644 include/PikiMgr.h create mode 100644 include/RumbleMgr.h create mode 100644 include/SeedItem.h create mode 100644 include/TekiAnimationManager.h create mode 100644 include/TekiParameters.h rename {unsorted_include_todo => include}/TekiPersonality.h (57%) create mode 100644 include/WeedsItem.h create mode 100644 src/plugPikiKando/aiTable.cpp delete mode 100644 unsorted_include_todo/BPikiInf.h delete mode 100644 unsorted_include_todo/BPikiInfMgr.h delete mode 100644 unsorted_include_todo/BaseInf.h delete mode 100644 unsorted_include_todo/BoBaseItem.h delete mode 100644 unsorted_include_todo/BombGenItem.h delete mode 100644 unsorted_include_todo/BombItem.h delete mode 100644 unsorted_include_todo/BombItemProp.h delete mode 100644 unsorted_include_todo/BossAnimationManager.h delete mode 100644 unsorted_include_todo/BossNode.h delete mode 100644 unsorted_include_todo/CndBossCollKill.h delete mode 100644 unsorted_include_todo/CndBossFlick.h delete mode 100644 unsorted_include_todo/CndIsAlive.h delete mode 100644 unsorted_include_todo/CndStickBossKill.h delete mode 100644 unsorted_include_todo/CndStickMouthKill.h delete mode 100644 unsorted_include_todo/CreatureInf.h delete mode 100644 unsorted_include_todo/CreatureInfMgr.h delete mode 100644 unsorted_include_todo/DoorItem.h delete mode 100644 unsorted_include_todo/DoorProp.h delete mode 100644 unsorted_include_todo/Fish.h delete mode 100644 unsorted_include_todo/FishGenerator.h delete mode 100644 unsorted_include_todo/Fulcrum.h delete mode 100644 unsorted_include_todo/GemItem.h delete mode 100644 unsorted_include_todo/GrassGen.h delete mode 100644 unsorted_include_todo/InfMgr.h delete mode 100644 unsorted_include_todo/ItemBall.h delete mode 100644 unsorted_include_todo/KeyItem.h delete mode 100644 unsorted_include_todo/KeyProp.h delete mode 100644 unsorted_include_todo/Kontroller.h delete mode 100644 unsorted_include_todo/KusaItem.h delete mode 100644 unsorted_include_todo/KusaItemProp.h delete mode 100644 unsorted_include_todo/MeltingPotMgr.h delete mode 100644 unsorted_include_todo/MizuItem.h delete mode 100644 unsorted_include_todo/MizuItemProp.h delete mode 100644 unsorted_include_todo/MonoInfMgr.h delete mode 100644 unsorted_include_todo/NaviDemoSunsetGoal.h delete mode 100644 unsorted_include_todo/NaviDemoSunsetStart.h delete mode 100644 unsorted_include_todo/PaniTestNode.h delete mode 100644 unsorted_include_todo/PaniTestSection.h delete mode 100644 unsorted_include_todo/PelletMgr/UseNode.h delete mode 100644 unsorted_include_todo/PikiHeadItem.h delete mode 100644 unsorted_include_todo/PikiHeadItemProp.h delete mode 100644 unsorted_include_todo/PikiHeadMgr.h delete mode 100644 unsorted_include_todo/PikiMgr.h delete mode 100644 unsorted_include_todo/PikiProp.h delete mode 100644 unsorted_include_todo/RockGen.h delete mode 100644 unsorted_include_todo/RumbleSample.h delete mode 100644 unsorted_include_todo/SeedItem.h delete mode 100644 unsorted_include_todo/SeedProp.h delete mode 100644 unsorted_include_todo/TekiAnimationManager.h delete mode 100644 unsorted_include_todo/TekiNakata.h delete mode 100644 unsorted_include_todo/TekiParameters.h delete mode 100644 unsorted_include_todo/TopAction.h delete mode 100644 unsorted_include_todo/UfoShapeObject.h delete mode 100644 unsorted_include_todo/Weed.h delete mode 100644 unsorted_include_todo/WeedsGen.h diff --git a/configure.py b/configure.py index 102b7cf3..1780ee2a 100755 --- a/configure.py +++ b/configure.py @@ -479,7 +479,7 @@ def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: Object(NonMatching, "plugPikiKando/aiShoot.cpp"), Object(NonMatching, "plugPikiKando/aiWatch.cpp"), Object(NonMatching, "plugPikiKando/aiWeed.cpp"), - Object(NonMatching, "plugPikiKando/aiTable.cpp"), + Object(Matching, "plugPikiKando/aiTable.cpp"), Object(NonMatching, "plugPikiKando/aiAction.cpp"), Object(NonMatching, "plugPikiKando/pikiInf.cpp"), Object(NonMatching, "plugPikiKando/piki.cpp"), @@ -606,7 +606,7 @@ def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: "objects": [ Object(NonMatching, "plugPikiNishimura/genBoss.cpp"), Object(NonMatching, "plugPikiNishimura/Boss.cpp"), - Object(NonMatching, "plugPikiNishimura/BossAnimMgr.cpp"), + Object(Matching, "plugPikiNishimura/BossAnimMgr.cpp"), Object(NonMatching, "plugPikiNishimura/BossCnd.cpp"), Object(NonMatching, "plugPikiNishimura/BossMgr.cpp"), Object(NonMatching, "plugPikiNishimura/BossShapeObj.cpp"), @@ -909,7 +909,7 @@ def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: "mw_version": "GC/1.2.5", "cflags": cflags_base, "objects": [ - Object(NonMatching, "Runtime/PPCEABI/H/__mem.o"), + Object(NonMatching, "Runtime/PPCEABI/H/__mem.c"), Object(NonMatching, "Runtime/PPCEABI/H/__va_arg.c"), Object(NonMatching, "Runtime/PPCEABI/H/global_destructor_chain.c"), Object(NonMatching, "Runtime/PPCEABI/H/CPlusLibPPC.cp"), diff --git a/include/Actor.h b/include/Actor.h index 5bea0226..d83d133f 100644 --- a/include/Actor.h +++ b/include/Actor.h @@ -49,12 +49,12 @@ struct ActorMgr : public MonoObjectMgr { // unused/inlined: ~ActorMgr(); - void createObject(); + Creature* createObject(); // _00 = VTBL // _00-_1C = MonoObjectMgr? // TODO: members? - u8 _28[0x40 - 0x28]; // _28, unknown + u8 _38[0x40 - 0x38]; // _38, unknown PikiShapeObject** _40; // _40 CreatureProp** _44; // _44 SimpleAI** _48; // _48 diff --git a/include/Animator.h b/include/Animator.h index 50d62215..836c0a6d 100644 --- a/include/Animator.h +++ b/include/Animator.h @@ -240,6 +240,8 @@ struct Animator { /** * @brief TODO + * + * @note Size: 0xB8. */ struct AnimMgr : public CoreNode { AnimMgr(Shape*, char*, int, char*); @@ -255,7 +257,7 @@ struct AnimMgr : public CoreNode { // _00 = VTBL // _00-_14 = CoreNode - // TODO: members + u8 _14[0xB8 - 0x14]; // _14, unknown }; /** diff --git a/include/BaseInf.h b/include/BaseInf.h new file mode 100644 index 00000000..49e9c26f --- /dev/null +++ b/include/BaseInf.h @@ -0,0 +1,189 @@ +#ifndef _PIKIINF_H +#define _PIKIINF_H + +#include "types.h" +#include "CoreNode.h" +#include "ObjType.h" +#include "Vector.h" + +struct Creature; +struct CreatureInf; +struct Piki; +struct RandomAccessStream; + +typedef CreatureInf* (*InfFuncType1)(Creature*); // rename later to something sensible +typedef Creature* (*InfFuncType2)(CreatureInf*); // rename later to something sensible + +/** + * @brief TODO + */ +struct BaseInf : public CoreNode { + BaseInf(); // unused/inlined + + virtual void doStore(Creature*) { } // _10 + virtual void doRestore(Creature*) { } // _14 + virtual void saveCard(RandomAccessStream&); // _18 + virtual void loadCard(RandomAccessStream&); // _1C + + void store(Creature*); + void restore(Creature*); + + // _00 = VTBL + // _00-_14 = CoreNode + Vector3f mPosition; // _14 + Vector3f _20; // _20 +}; + +/** + * @brief TODO + * + * @note Size: 0x30. + */ +struct BPikiInf : public BaseInf { + BPikiInf(); // unused/inlined + + virtual void doStore(Creature*); // _10 + virtual void doRestore(Creature*); // _14 + virtual void saveCard(RandomAccessStream&); // _18 + virtual void loadCard(RandomAccessStream&); // _1C + + // _00 = VTBL + // _00-_2C = BaseInf + u8 mPikiColor; // _2C + u8 mPikiHappa; // _2D +}; + +/** + * @brief TODO + * + * @note Size: 0x4C. + */ +struct CreatureInf : public BaseInf { + CreatureInf(); // unused/inlined + + virtual void doStore(Creature*); // _10 + virtual void doRestore(Creature*); // _14 + + // _00 = VTBL + // _00-_2C = BaseInf + EObjType mObjType; // _2C + u32 _30; // _30, unknown + u32 _34; // _34, unknown + u8 _38[0x14]; // _38, unknown +}; + +/** + * @brief TODO + */ +struct StageInf { + void init(); + void initGame(); + void saveCard(RandomAccessStream&); + void loadCard(RandomAccessStream&); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct InfMgr { + virtual void init(int) { } // _08 + virtual BaseInf* getFreeInf() = 0; // _0C + virtual void delInf(BaseInf*) = 0; // _10 + virtual int getFreeNum() = 0; // _14 + virtual int getActiveNum() = 0; // _18 + + // _00 = VTBL +}; + +/** + * @brief TODO + * + * @note Size: 0x64. + */ +struct MonoInfMgr : public InfMgr { + MonoInfMgr(); + + virtual void init(int); // _08 + virtual BaseInf* getFreeInf(); // _0C + virtual void delInf(BaseInf*); // _10 + virtual int getFreeNum(); // _14 + virtual int getActiveNum(); // _18 + virtual BaseInf* newInf() = 0; // _1C + + void loadCard(RandomAccessStream&); + + // unused/inlined: + void saveCard(RandomAccessStream&); + + // _00 = VTBL + // _00-_04 = InfMgr + int mInfCount; // _04 + BaseInf** mInfs; // _08 + BaseInf mActiveList; // _0C + BaseInf mFreeList; // _38 +}; + +/** + * @brief TODO + */ +struct BPikiInfMgr : public MonoInfMgr { + virtual BPikiInf* newInf(); // _1C + + int getPikiCount(int color); + + // unused/inlined: + void initGame(); + + // _00 = VTBL + // _00-_64 = MonoInfMgr + // TODO: members +}; + +/** + * @brief TODO + */ +struct CreatureInfMgr : public MonoInfMgr { + virtual CreatureInf* newInf(); // _1C + + // unused/inlined: + void beginRegister(int); + void registerType(int, InfFuncType1, InfFuncType2); + void endRegister(); + void getStoreFun(int); + void getRestoreFun(int); + void updateUseList(); + void restoreAll(); + + // _00 = VTBL + // _00-_64 = MonoInfMgr + // TODO: members +}; + +/** + * @brief TODO + * + * @note Size: 0x24. + */ +struct PikiInfMgr { + PikiInfMgr(); // unused/inlined + + void initGame(); + void saveCard(RandomAccessStream&); + void loadCard(RandomAccessStream&); + void incPiki(Piki*); + void incPiki(int, int); + void decPiki(Piki*); + void clear(); + + // unused/inlined: + void getTotal(); + + // TODO: members + int mPikiCounts[3][3]; // _00, indexed by color and happa maybe? +}; + +extern PikiInfMgr pikiInfMgr; + +#endif diff --git a/include/BombItem.h b/include/BombItem.h new file mode 100644 index 00000000..2dafe2a0 --- /dev/null +++ b/include/BombItem.h @@ -0,0 +1,45 @@ +#ifndef _BOMBITEM_H +#define _BOMBITEM_H + +#include "types.h" +#include "ItemMgr.h" +#include "CreatureProp.h" + +struct SimpleAI; + +/** + * @brief TODO + */ +struct BombItemProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct BombItem : public ItemCreature { + BombItem(CreatureProp*, ItemShapeObject*, SimpleAI*); + + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + virtual bool needShadow(); // _90 + virtual void collisionCallback(CollEvent&); // _A8 + virtual void dump(); // _C8 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void refresh2d(Graphics&); // _F0 + virtual void renderTimer(Graphics&); // _15C + virtual void renderBlast(Graphics&); // _160 + + // _00 = VTBL + // _00-_3C8 = ItemCreature? + // TODO: members +}; + +#endif diff --git a/include/Boss.h b/include/Boss.h index 6349d7e4..dba1aa05 100644 --- a/include/Boss.h +++ b/include/Boss.h @@ -10,6 +10,7 @@ #include "SearchSystem.h" #include "Vector.h" +struct BirthInfo; struct GenObjectBoss; /** @@ -188,6 +189,17 @@ struct Boss : public Creature { SearchData mSearchData[3]; // _394 }; +/** + * @brief TODO + */ +struct BossNode : public CoreNode { + BossNode(); + + // _00 = VTBL + // _00-_14 = CoreNode + // TODO: members +}; + /** * @brief TODO */ @@ -237,6 +249,18 @@ struct BossMgr : public ObjectMgr { // TODO: members }; +/** + * @brief TODO + */ +struct BossAnimationManager : public Node { + BossAnimationManager(BossMgr*); + + // _00 = VTBL + // _00-_20 = Node + BossMgr* mBossMgr; // _20 + // TODO: members +}; + extern BossMgr* bossMgr; #endif diff --git a/include/BossConditions.h b/include/BossConditions.h new file mode 100644 index 00000000..611e5d74 --- /dev/null +++ b/include/BossConditions.h @@ -0,0 +1,67 @@ +#ifndef _BOSSCONDITIONS_H +#define _BOSSCONDITIONS_H + +#include "types.h" +#include "Condition.h" + +/** + * @brief TODO + */ +struct CndIsAlive : public Condition { + + virtual bool satisfy(Creature*); // _08 + + // _00 = VTBL + // _00-_04 = Condition + // TODO: members +}; + +/** + * @brief TODO + */ +struct CndBossFlick : public Condition { + + virtual bool satisfy(Creature*); // _08 + + // _00 = VTBL + // _00-_04 = Condition + // TODO: members +}; + +/** + * @brief TODO + */ +struct CndStickBossKill : public Condition { + + virtual bool satisfy(Creature*); // _08 + + // _00 = VTBL + // _00-_04 = Condition + // TODO: members +}; + +/** + * @brief TODO + */ +struct CndStickMouthKill : public Condition { + + virtual bool satisfy(Creature*); // _08 + + // _00 = VTBL + // _00-_04 = Condition + // TODO: members +}; + +/** + * @brief TODO + */ +struct CndBossCollKill : public Condition { + + virtual bool satisfy(Creature*); // _08 + + // _00 = VTBL + // _00-_04 = Condition + // TODO: members +}; + +#endif diff --git a/include/Controller.h b/include/Controller.h index 59cf7f3c..d8bb2fca 100644 --- a/include/Controller.h +++ b/include/Controller.h @@ -52,6 +52,12 @@ struct Controller : public Node { reset(1); } + Controller(int p1) + : Node("") + { + reset(p1); + } + void reset(u32); void updateCont(u32 keyStatus); void update(); @@ -62,7 +68,6 @@ struct Controller : public Node { // _00 = VTBL // _00-_20 = Node - u32 mCurrentInput; // _20 u32 mPrevInput; // _24 u32 mInputPressed; // _28 diff --git a/include/Creature.h b/include/Creature.h index 3e5bb717..00315b81 100644 --- a/include/Creature.h +++ b/include/Creature.h @@ -198,7 +198,8 @@ struct Creature : public RefCountable, public EventTalker { u8 _58[0x6C - 0x58]; // _58, TODO: work out members EObjType mObjType; // _6C, object type Vector3f _70; // _70 - u8 _7C[0x94 - 0x7C]; // _7C, TODO: work out members + u8 _7C[0x88 - 0x7C]; // _7C, TODO: work out members + Vector3f _88; // _88 Vector3f mPosition; // _94 f32 mDirection; // _A0 u8 _A4[0xC8 - 0xA4]; // _A4, TODO: work out members diff --git a/include/CreatureNode.h b/include/CreatureNode.h index 8fc59bbd..fc74ad8c 100644 --- a/include/CreatureNode.h +++ b/include/CreatureNode.h @@ -25,6 +25,11 @@ struct CreatureNodeMgr : public ObjectMgr { virtual ~CreatureNodeMgr(); // _48 virtual int getSize(); // _60 virtual int getMax(); // _64 + + // _00 = VTBL 1 + // _08 = VTBL 2 + // _00-_28 = ObjectMgr + // TODO: members }; #endif diff --git a/include/DoorItem.h b/include/DoorItem.h new file mode 100644 index 00000000..b5614ee5 --- /dev/null +++ b/include/DoorItem.h @@ -0,0 +1,45 @@ +#ifndef _DOORITEM_H +#define _DOORITEM_H + +#include "types.h" +#include "ItemMgr.h" +#include "CreatureProp.h" + +/** + * @brief TODO + */ +struct DoorProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct DoorItem : public ItemCreature { + DoorItem(int p1, CreatureProp* props, Shape* shape); + + virtual void init(Vector3f&); // _28 + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual f32 getHeight(); // _40 + virtual bool isVisible(); // _74 + virtual bool isAtari(); // _84 + virtual bool isAlive(); // _88 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + void disappear(); + + // unused/inlined: + void becomeGate(); + + // _00 = VTBL + // _00-_??? = ItemCreature + // TODO: members +}; + +#endif diff --git a/include/FishItem.h b/include/FishItem.h new file mode 100644 index 00000000..3246ba70 --- /dev/null +++ b/include/FishItem.h @@ -0,0 +1,33 @@ +#ifndef _FISHITEM_H +#define _FISHITEM_H + +#include "types.h" +#include "ItemMgr.h" + +/* + * @brief TODO + */ +struct Fish { + Fish(); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct FishGenerator : public ItemCreature { + FishGenerator(); + + virtual void startAI(int); // _34 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + void moveFish(Fish*); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +#endif diff --git a/include/GemItem.h b/include/GemItem.h new file mode 100644 index 00000000..3630fa9a --- /dev/null +++ b/include/GemItem.h @@ -0,0 +1,46 @@ +#ifndef _GEMITEM_H +#define _GEMITEM_H + +#include "types.h" +#include "ItemMgr.h" + +struct SimpleAI; + +/* + * @brief TODO + * + * @note Virtual table is stripped (so no RTTI) - inheritance is a guess. + */ +struct GemItem : public ItemCreature { + GemItem(CreatureProp*, int, Shape**, Shape**, Shape**, SimpleAI*, f32, int, int); + + virtual void setRouteTracer(RouteTracer*); // _20, stripped + virtual void initParam(int); // _30, stripped + virtual void startAI(int); // _34, stripped + virtual f32 getiMass(); // _38, stripped + virtual f32 getSize(); // _3C, stripped + virtual void doStore(CreatureInf*); // _48, stripped + virtual void doRestore(CreatureInf*); // _4C, stripped + virtual bool isAlive(); // _88, stripped + virtual bool ignoreAtari(Creature*); // _98, stripped + virtual void bounceCallback(); // _AC, stripped + virtual void update(); // _E0, stripped + virtual void refresh(Graphics&); // _EC, stripped + virtual void doKill(); // _10C, stripped + + void setColorType(int); + void split(); + + // unused/inlined: + void setAtariFree(); + void reachCapacity(); + void updateLiftup(); + void startPick(f32); + void finishPick(); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +#endif diff --git a/include/Geometry.h b/include/Geometry.h index bc4a3a3b..3654cb7c 100644 --- a/include/Geometry.h +++ b/include/Geometry.h @@ -18,6 +18,14 @@ struct Cylinder { // TODO: members }; +/** + * @brief TODO + */ +struct RectArea { + + // TODO: members +}; + /** * @brief TODO */ diff --git a/include/HmRumble.h b/include/HmRumble.h deleted file mode 100644 index 4f018350..00000000 --- a/include/HmRumble.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _HMRUMBLE_H -#define _HMRUMBLE_H - -#include "types.h" - -typedef class RumbleSample; - -extern "C" void PADControlMotor(int, int); - -class RumbleSample { - f32 _00; // _00 - f32 _04; // _04 - int _08; // _08 - - RumbleSample(int); - void simpleStop(); - void simpleStart(f32); -}; - -#endif diff --git a/include/ItemMgr.h b/include/ItemMgr.h index 2c8ac171..f43448e1 100644 --- a/include/ItemMgr.h +++ b/include/ItemMgr.h @@ -4,14 +4,24 @@ #include "types.h" #include "AICreature.h" #include "ObjectMgr.h" +#include "CreatureNode.h" struct PelletShapeObject; +/** + * @brief TODO. + */ +struct ItemShapeObject { + ItemShapeObject(Shape*, char*, char*); + + // TODO: members +}; + /** * @brief TODO. */ struct ItemCreature : public AICreature { - ItemCreature(int, CreatureProp*, Shape*); + ItemCreature(int objType, CreatureProp*, Shape*); virtual void init(Vector3f&); // _28 virtual f32 getHeight(); // _40 @@ -37,22 +47,6 @@ struct ItemCreature : public AICreature { // TODO: members }; -/** - * @brief TODO. - */ -struct ItemObject : public ItemCreature { - ItemObject(int, Shape*); // unused/inlined - - virtual bool isAtari(); // _84 - virtual bool needShadow(); // _90 - virtual void update(); // _E0 - virtual void postUpdate(int, f32); // _E4 - - // _00 = VTBL - // _00-_304 = ItemCreature? - // TOD0: members -}; - /** * @brief TODO. */ @@ -97,4 +91,22 @@ struct ItemMgr : public PolyObjectMgr { // TODO: members }; +/** + * @brief TODO. + */ +struct MeltingPotMgr : public CreatureNodeMgr { + MeltingPotMgr(ItemMgr*); + + virtual ~MeltingPotMgr(); // _48 (weak) + + void finalSetup(); + void prepare(int); + void birth(int); + + // _00 = VTBL 1 + // _08 = VTBL 2 + // _00-_28 = CreatureNodeMgr? + // TODO: members +}; + #endif diff --git a/include/ItemObject.h b/include/ItemObject.h new file mode 100644 index 00000000..a1b00dd7 --- /dev/null +++ b/include/ItemObject.h @@ -0,0 +1,90 @@ +#ifndef _ITEMOBJECT_H +#define _ITEMOBJECT_H + +#include "types.h" +#include "ItemMgr.h" + +/** + * @brief TODO. + */ +struct ItemBall : public ItemCreature { + ItemBall(Shape*, CreatureProp*); + + virtual void startAI(int); // _34 + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TOD0: members +}; + +/** + * @brief TODO. + */ +struct ItemObject : public ItemCreature { + ItemObject(int, Shape*); // unused/inlined + + virtual bool isAtari(); // _84 + virtual bool needShadow(); // _90 + virtual void update(); // _E0 + virtual void postUpdate(int, f32); // _E4 + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TOD0: members +}; + +/** + * @brief TODO. + */ +struct Fulcrum : public ItemObject { + Fulcrum(); + + // _00 = VTBL + // _00-_304 = ItemObject? + // TOD0: members +}; + +/** + * @brief TODO. + */ +struct BombGenItem : public ItemObject { + BombGenItem(Shape*); + + virtual bool isVisible(); // _74 + virtual bool isAtari(); // _84 + virtual bool isAlive(); // _88 + virtual bool needFlick(Creature*); // _94 + + void pickable(); + void pick(); + + // _00 = VTBL + // _00-_304 = ItemObject? + // TOD0: members +}; + +/** + * @brief TODO. + */ +struct NaviDemoSunsetStart : public ItemObject { + NaviDemoSunsetStart(); + + // _00 = VTBL + // _00-_304 = ItemObject? + // TOD0: members +}; + +/** + * @brief TODO. + */ +struct NaviDemoSunsetGoal : public ItemObject { + NaviDemoSunsetGoal(); + + // _00 = VTBL + // _00-_304 = ItemObject? + // TOD0: members +}; + +#endif diff --git a/include/KMath.h b/include/KMath.h index 91f88b3d..cc0174c2 100644 --- a/include/KMath.h +++ b/include/KMath.h @@ -4,6 +4,8 @@ #include "types.h" #include "Vector.h" +struct Matrix4f; + /** * @brief TODO */ @@ -36,4 +38,13 @@ struct KSegment { // TODO: members }; +// Global utility functions: +bool isNan(f32); +void makePostureMatrix(Vector3f&, Vector3f&, Vector3f&, Matrix4f&); +void calcImpulse(Vector3f&, f32, Vector3f&, Matrix4f&, Vector3f&, Vector3f&); +void CRSpline(f32, Vector3f*); +void CRSplineTangent(f32, Vector3f*); +void getThrowVelocity(Vector3f&, f32, Vector3f&, Vector3f&); +void getCameraSafeAngle(Vector3f&, f32, f32); + #endif diff --git a/include/KeyItem.h b/include/KeyItem.h new file mode 100644 index 00000000..132f3798 --- /dev/null +++ b/include/KeyItem.h @@ -0,0 +1,42 @@ +#ifndef _KEYITEM_H +#define _KEYITEM_H + +#include "types.h" +#include "Creature.h" +#include "CreatureProp.h" + +struct Shape; + +/** + * @brief TODO + */ +struct KeyProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct KeyItem : public Creature { + KeyItem(CreatureProp*, Shape*); + + virtual void init(Vector3f&); // _28 + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual f32 getHeight(); // _40 + virtual bool isVisible(); // _74 + virtual void collisionCallback(CollEvent&); // _A8 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void doKill(); // _10C + + // _00 = VTBL + // _00-_2B8 = Creature + // TODO: members +}; + +#endif diff --git a/include/Kontroller.h b/include/Kontroller.h new file mode 100644 index 00000000..c144277f --- /dev/null +++ b/include/Kontroller.h @@ -0,0 +1,34 @@ +#ifndef _KONTROLLER_H +#define _KONTROLLER_H + +#include "types.h" +#include "Controller.h" + +/** + * @brief TODO + */ +struct Kontroller : public Controller { + Kontroller(int); + + virtual void read(RandomAccessStream&); // _0C + virtual void update(); // _10 + + void save(RamStream*, int); + void load(RamStream*, int); + void write(RandomAccessStream&); + + static int getSaveSize(int); + + // unused/inlined: + void stop(); + + // _00 = VTBL + // _00-_50 = Controller + int _50; // _50 + int _54; // _54 + RamStream* _58; // _58 +}; + +extern RamStream* controllerBuffer; + +#endif diff --git a/include/KusaItem.h b/include/KusaItem.h new file mode 100644 index 00000000..98b48746 --- /dev/null +++ b/include/KusaItem.h @@ -0,0 +1,64 @@ +#ifndef _KUSAITEM_H +#define _KUSAITEM_H + +#include "types.h" +#include "ItemMgr.h" +#include "CreatureProp.h" + +struct InteractBuild; + +/* + * @brief TODO + */ +struct KusaItemProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/* + * @brief TODO + */ +struct KusaItem : public ItemCreature { + KusaItem(CreatureProp*, Shape*); + + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual void doSave(RandomAccessStream&); // _50 + virtual void doLoad(RandomAccessStream&); // _54 + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + virtual bool ignoreAtari(Creature*); // _98 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +/* + * @brief TODO + */ +struct BoBaseItem : public ItemCreature { + BoBaseItem(CreatureProp*, Shape*); + + virtual void startAI(int); // _34 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + virtual bool ignoreAtari(Creature*); // _98 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + void interactBuild(InteractBuild&); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +#endif diff --git a/include/MizuItem.h b/include/MizuItem.h new file mode 100644 index 00000000..285b9b81 --- /dev/null +++ b/include/MizuItem.h @@ -0,0 +1,36 @@ +#ifndef _MIZUITEM_H +#define _MIZUITEM_H + +#include "types.h" +#include "ItemMgr.h" +#include "CreatureProp.h" + +struct SimpleAI; + +/** + * @brief TODO + */ +struct MizuItemProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct MizuItem : public ItemCreature { + MizuItem(int, CreatureProp*, ItemShapeObject*, SimpleAI*); + + virtual void startAI(int); // _34 + virtual bool isAlive(); // _88 + virtual bool needFlick(Creature*); // _94 + virtual void update(); // _E0 + + // _00 = VTBL + // _00-_??? = ItemCreature + // TODO: members +}; + +#endif diff --git a/include/ObjectMgr.h b/include/ObjectMgr.h index 9d00191f..a362e8cf 100644 --- a/include/ObjectMgr.h +++ b/include/ObjectMgr.h @@ -21,7 +21,7 @@ struct ObjectMgr : public Traversable, public Node { virtual int getFirst() = 0; // _0C virtual int getNext(int) = 0; // _10 virtual bool isDone(int) = 0; // _14 - virtual ~ObjectMgr(); // _48 + virtual ~ObjectMgr() { } // _48 virtual void update(); // _4C virtual void postUpdate(int, f32); // _50 virtual void stickUpdate(); // _54 @@ -57,7 +57,7 @@ struct MonoObjectMgr : public ObjectMgr { virtual int getFirst(); // _0C virtual int getNext(int); // _10 virtual bool isDone(int); // _14 - virtual ~MonoObjectMgr(); // _48 (weak) + virtual ~MonoObjectMgr() { } // _48 (weak) virtual void update(); // _4C (weak) virtual void postUpdate(int, float); // _50 virtual void refresh(Graphics&); // _58 @@ -67,7 +67,7 @@ struct MonoObjectMgr : public ObjectMgr { virtual void search(ObjectMgr*); // _70 virtual Creature* birth(); // _78 virtual void kill(Creature*); // _7C - virtual void createObject() = 0; // _80 + virtual Creature* createObject() = 0; // _80 void create(int); void searchSelf(); @@ -78,8 +78,11 @@ struct MonoObjectMgr : public ObjectMgr { // _00 = VTBL 1 // _08 = VTBL 2 - // _00-_28 = ObjectMgr? - // TODO: members + // _00-_28 = ObjectMgr + u32 _28; // _28, array of something, maybe Creature* + int _2C; // _2C + u32 _30; // _30, unknown + int* _34; // _34 }; /** diff --git a/include/PaniAnimator.h b/include/PaniAnimator.h index e3e90334..b8aa19d5 100644 --- a/include/PaniAnimator.h +++ b/include/PaniAnimator.h @@ -44,6 +44,9 @@ struct PaniAnimator : public Animator { void finishAnimation(); void getKeyValueByKeyType(int); + // unused/inlined: + void checkCounter_4DEBUG(); + // _30 = VTBL // _00-_34 = Animator // TODO: members @@ -53,6 +56,10 @@ struct PaniAnimator : public Animator { * @brief TODO */ struct PaniItemAnimator : public PaniAnimator { + PaniItemAnimator(); + + PaniMotionTable* createMotionTable(); + // _30 = VTBL // _00-_34 = PaniAnimator // TODO: members @@ -76,6 +83,10 @@ struct PaniPelletAnimator : public PaniAnimator { * @brief TODO */ struct PaniPikiAnimator : public PaniAnimator { + PaniPikiAnimator(); + + PaniMotionTable* createMotionTable(); + // _30 = VTBL // _00-_34 = PaniAnimator // TODO: members @@ -85,6 +96,10 @@ struct PaniPikiAnimator : public PaniAnimator { * @brief TODO */ struct PaniPlantAnimator : public PaniAnimator { + PaniPlantAnimator(); + + PaniMotionTable* createMotionTable(); + // _30 = VTBL // _00-_34 = PaniAnimator // TODO: members @@ -96,6 +111,8 @@ struct PaniPlantAnimator : public PaniAnimator { struct PaniTekiAnimator : public PaniAnimator { PaniTekiAnimator(); + PaniMotionTable* createMotionTable(); + // _30 = VTBL // _00-_34 = PaniAnimator // TODO: members @@ -105,6 +122,10 @@ struct PaniTekiAnimator : public PaniAnimator { * @brief TODO */ struct PaniUfoAnimator : public PaniAnimator { + PaniUfoAnimator(); + + PaniMotionTable* createMotionTable(); + // _30 = VTBL // _00-_34 = PaniAnimator // TODO: members @@ -152,6 +173,7 @@ struct PaniMotionInfo { */ struct PaniMotion { PaniMotion(int); + PaniMotion(int, int); // unused/inlined void init(int, int); @@ -171,4 +193,13 @@ struct PaniMotionTable { PaniMotion** _04; // _04 }; +/** + * @brief TODO + */ +struct PaniSoundTable { + PaniSoundTable(int); + + // TODO: members +}; + #endif diff --git a/include/PaniTestSection.h b/include/PaniTestSection.h new file mode 100644 index 00000000..1d46aa01 --- /dev/null +++ b/include/PaniTestSection.h @@ -0,0 +1,43 @@ +#ifndef _PANITESTSECTION_H +#define _PANITESTSECTION_H + +#include "types.h" +#include "Section.h" + +struct PaniAnimKeyEvent; +struct Teki; +struct ViewPiki; + +/** + * @brief TODO + */ +struct PaniTestNode : public Node { + PaniTestNode(); + + virtual void update(); // _10 + virtual void draw(Graphics&); // _14 + virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _3C + + void setTestMode(int); + void updatePikis(); + void updateTekis(); + void drawPiki(ViewPiki*, Graphics&); + void drawTeki(Teki*, Graphics&); + + // _00 = VTBL + // _00-_20 = Node + // TODO: members +}; + +/** + * @brief TODO + */ +struct PaniTestSection : public Section { + virtual void init(); // _30 + + // _00 = VTBL + // _00-_20 = Section? + // TODO: members +}; + +#endif diff --git a/include/Pellet.h b/include/Pellet.h index b098e1ae..d50ad1e3 100644 --- a/include/Pellet.h +++ b/include/Pellet.h @@ -28,7 +28,11 @@ struct PelletConfig : public Parameters, public CoreNode { PelletConfig(); virtual void read(RandomAccessStream&); // _18 (weak) - // TODO: members + + // _04 = VTBL + // _00-_04 = Parameters + // _04-_18 = CoreNode + // TODO: members }; /** @@ -56,7 +60,7 @@ struct Pellet : public DualCreature { virtual void startWaterEffect(); // _CC virtual void finishWaterEffect(); // _D0 virtual void update(); // _E0 - virtual void postUpdate(int, float); // _E4 + virtual void postUpdate(int, f32); // _E4 virtual void refresh(Graphics&); // _EC virtual void doAnimation(); // _108 virtual void doKill(); // _10C @@ -104,11 +108,21 @@ struct Pellet : public DualCreature { * @brief TODO */ struct PelletMgr : public MonoObjectMgr { + + /** + * @brief TODO + */ + struct UseNode : public CoreNode { + // _00 = VTBL + // _00-_14 = CoreNode + // TODO: members + }; + PelletMgr(MapMgr*); virtual ~PelletMgr(); // _48 (weak) virtual void refresh(Graphics&); // _58 - virtual void createObject(); // _80 + virtual Pellet* createObject(); // _80 virtual void read(RandomAccessStream&); // _84 (weak) void getUfoIndexFromID(u32); diff --git a/include/Piki.h b/include/Piki.h index 70b79201..dbbedff6 100644 --- a/include/Piki.h +++ b/include/Piki.h @@ -120,7 +120,10 @@ struct Piki : public Creature, public PaniAnimKeyListener { // _00 = VTBL // _00-_2B8 = Creature // _2B8 = PaniAnimKeyListener - u8 _2BC[0x4F8 - 0x2BC]; // _2BC, TODO: work out members + u8 _2BC[0x3CC - 0x2BC]; // _2BC, TODO: work out members + int _3CC; // _3CC, piki color? + int _3D0; // _3D0, piki happa? + u8 _3D4[0x4F8 - 0x3D4]; // _3D4, unknown TopAction* _4F8; // _4F8, may be just Action* u8 _4FC[0x585 - 0x4FC]; // _4FC, TODO: work out members }; diff --git a/include/PikiAI.h b/include/PikiAI.h index ad3120c5..210d85e2 100644 --- a/include/PikiAI.h +++ b/include/PikiAI.h @@ -1294,4 +1294,23 @@ struct ActWeed : public Action, public PaniAnimKeyListener { // TODO: members }; +/** + * @brief Almost completely stripped, uniqueInstance gets set to nullptr in pikiMgr. + */ +struct AiTable { + + /** + * @brief Completely stripped. Static member shows up stripped in map. + */ + struct Row { + static u32 numInputs; + + // TODO: members + }; + + static AiTable* uniqueInstance; + + // TODO: members +}; + #endif diff --git a/include/PikiHeadItem.h b/include/PikiHeadItem.h new file mode 100644 index 00000000..4e103317 --- /dev/null +++ b/include/PikiHeadItem.h @@ -0,0 +1,68 @@ +#ifndef _PIKIHEADITEM_H +#define _PIKIHEADITEM_H + +#include "types.h" +#include "ItemMgr.h" +#include "CreatureProp.h" + +struct InteractBikkuri; +struct InteractSwallow; +struct SimpleAI; + +/** + * @brief TODO + */ +struct PikiHeadItemProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct PikiHeadItem : public ItemCreature { + PikiHeadItem(CreatureProp*, ItemShapeObject*, SimpleAI*); + + 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 startWaterEffect(); // _CC + virtual void finishWaterEffect(); // _D0 + virtual void refresh(Graphics&); // _EC + virtual void doKill(); // _10C + virtual void playSound(int); // _128 + + void canPullout(); + void setPermanentEffects(bool); + void setColor(int); + void interactBikkuri(InteractBikkuri&); + void interactSwallow(InteractSwallow&); + + // _00 = VTBL + // _00-_3C8 = ItemCreature? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PikiHeadMgr : public MonoObjectMgr { + PikiHeadMgr(ItemMgr*); + + virtual ~PikiHeadMgr(); // _48 (weak) + virtual Creature* birth(); // _78 + virtual PikiHeadItem* createObject(); // _80 + + // _00 = VTBL 1 + // _08 = VTBL 2 + // _00-_28 = MonoObjectMgr? + // TODO: members +}; + +#endif diff --git a/include/PikiMgr.h b/include/PikiMgr.h new file mode 100644 index 00000000..083087e1 --- /dev/null +++ b/include/PikiMgr.h @@ -0,0 +1,66 @@ +#ifndef _PIKIMGR_H +#define _PIKIMGR_H + +#include "types.h" +#include "ObjectMgr.h" +#include "CreatureProp.h" +#include "ViewPiki.h" + +struct Navi; + +/** + * @brief TODO + */ +struct PikiProp : public CreatureProp { + PikiProp() { mCreatureProps.mFriction.mValue = 0.1f; } + + /** + * @brief TODO + * + * @note Offsets are relative to PikiProp for convenience. + */ + struct Parms : public Parameters { + Parms(); + + // _58-_5C = Parameters + // TODO: members + }; + + virtual void read(RandomAccessStream&); // _08 + + // _54 = VTBL + // _00-_58 = CreatureProp + Parms mPikiParms; // _58 +}; + +/** + * @brief TODO + */ +struct PikiMgr : public MonoObjectMgr { + PikiMgr(Navi*); + + virtual ~PikiMgr(); // _48 + virtual void update(); // _4C + virtual void refresh(Graphics&); // _58 + virtual Creature* birth(); // _78 + virtual ViewPiki* createObject(); // _80 + virtual void read(RandomAccessStream&); // _84 + + void init(); + void dumpAll(); + + // unused/inlined: + void getFormationPikis(); + void lostAllPikis(); + void refresh2d(Graphics&); + + // _00 = VTBL 1 + // _08 = VTBL 2 + // _00-_28 = MonoObjectMgr? + u8 _28[0x68 - sizeof(MonoObjectMgr)]; // _28, update/remove once size of MonoObjectMgr is known + PikiProp* mParms; // _68 + Navi* mNavi; // _6C + // TODO: members +}; + +#endif diff --git a/include/RumbleMgr.h b/include/RumbleMgr.h new file mode 100644 index 00000000..1da70978 --- /dev/null +++ b/include/RumbleMgr.h @@ -0,0 +1,95 @@ +#ifndef _HMRUMBLE_H +#define _HMRUMBLE_H + +#include "types.h" + +struct Vector3f; + +/* + * @brief TODO + */ +struct RumbleSample { + RumbleSample(int); + + void simpleStop(); + void simpleStart(f32); + + // unused/inlined: + void init(); + + f32 _00; // _00 + f32 _04; // _04 + int mChannel; // _08 +}; + +/* + * @brief TODO + */ +struct ChannelDataMgr { + ChannelDataMgr(); // unused/inlined + + // unused/inlined: + void init(); + void getChannelDataTbl(int); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct ChannelMgr { + ChannelMgr(); + + void start(int, f32*); + void update(); + + // unused/inlined: + void init(ChannelDataMgr*); + void reset(); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct ControlerMgr { + ControlerMgr(); // unused/inlined + + void start(int, f32*); + + // unused/inlined: + void init(); + void reset(); + void stop(); + void stop(int); + void update(); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct RumbleMgr { + RumbleMgr(bool, bool, bool, bool); + + void reset(); + void start(int, int, f32*); + void start(int, int, Vector3f&); + void stop(); + void stop(int, int); + void update(); + void rumbleOption(bool); + + // unused/inlined: + void init(); + void rumblePause(bool); + + // TODO: members +}; + +extern RumbleMgr* rumbleMgr; + +#endif diff --git a/include/SearchSystem.h b/include/SearchSystem.h index 279b9cf8..5250b4d1 100644 --- a/include/SearchSystem.h +++ b/include/SearchSystem.h @@ -2,6 +2,7 @@ #define _SEARCHSYSTEM_H #include "types.h" +#include "Traversable.h" struct Creature; @@ -19,13 +20,13 @@ struct SearchData { /** * @brief TODO */ -struct SearchBuffer { +struct SearchBuffer : public Traversable { SearchBuffer(); - virtual void getCreature(int); // _08 - virtual void getFirst(); // _0C - virtual void getNext(int); // _10 - virtual void isDone(int); // _14 + virtual Creature* getCreature(int); // _08 + virtual int getFirst(); // _0C + virtual int getNext(int); // _10 + virtual bool isDone(int); // _14 void init(SearchData*, int); void clear(); @@ -35,10 +36,12 @@ struct SearchBuffer { // unused/inlined: void operator=(SearchBuffer&); - void getIndex(); + void getIndex(Creature*); void reset(); void update(); + // _00 = VTBL + // _00-_08 = Traversable // TODO: members }; diff --git a/include/SeedItem.h b/include/SeedItem.h new file mode 100644 index 00000000..446e4f66 --- /dev/null +++ b/include/SeedItem.h @@ -0,0 +1,47 @@ +#ifndef _SEEDITEM_H +#define _SEEDITEM_H + +#include "types.h" +#include "Creature.h" +#include "CreatureProp.h" + +struct Shape; + +/** + * @brief TODO + */ +struct SeedProp : public CreatureProp { + + // _54 = VTBL + // _00-_58 = CreatureProp + // TODO: members +}; + +/** + * @brief TODO + */ +struct SeedItem : public Creature { + SeedItem(CreatureProp*, Shape**); + + virtual void init(Vector3f&); // _28 + virtual f32 getiMass(); // _38 + virtual f32 getSize(); // _3C + virtual f32 getHeight(); // _40 + virtual bool isVisible(); // _74 + virtual bool isAtari(); // _84 + virtual void stimulate(Interaction&); // _A0 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + virtual void doAI(); // _104 + virtual void doKill(); // _10C + + // unused/inlined: + void startBirth(); + void startSown(); + + // _00 = VTBL + // _00-_2B8 = Creature + // TODO: members +}; + +#endif diff --git a/include/TekiAnimationManager.h b/include/TekiAnimationManager.h new file mode 100644 index 00000000..77f8bdd0 --- /dev/null +++ b/include/TekiAnimationManager.h @@ -0,0 +1,22 @@ +#ifndef _TEKIANIMATIONMANAGER_H +#define _TEKIANIMATIONMANAGER_H + +#include "types.h" +#include "Node.h" + +struct TekiMgr; + +/** + * @brief TODO + */ +struct TekiAnimationManager : public Node { + TekiAnimationManager(TekiMgr*); + + virtual void read(RandomAccessStream&); // _0C + + // _00 = VTBL + // _00-_20 = Section? + // TODO: members +}; + +#endif diff --git a/include/TekiParameters.h b/include/TekiParameters.h new file mode 100644 index 00000000..dde8e301 --- /dev/null +++ b/include/TekiParameters.h @@ -0,0 +1,20 @@ +#ifndef _TEKIPARAMETERS_H +#define _TEKIPARAMETERS_H + +#include "types.h" +#include "Node.h" + +/** + * @brief TODO + */ +struct TekiParameters : public Node { + TekiParameters(int, int); + + virtual void read(RandomAccessStream&); // _0C + + // _00 = VTBL + // _00-_20 = Node + // TODO: members +}; + +#endif diff --git a/unsorted_include_todo/TekiPersonality.h b/include/TekiPersonality.h similarity index 57% rename from unsorted_include_todo/TekiPersonality.h rename to include/TekiPersonality.h index 51a57527..02310248 100644 --- a/unsorted_include_todo/TekiPersonality.h +++ b/include/TekiPersonality.h @@ -1,24 +1,24 @@ #ifndef _TEKIPERSONALITY_H #define _TEKIPERSONALITY_H -/** - * .obj __vt__15TekiPersonality, global - * .4byte __RTTI__15TekiPersonality - * .4byte 0 - * .4byte read__15TekiPersonalityFR18RandomAccessStreami - * .4byte write__15TekiPersonalityFR18RandomAccessStream - */ +#include "types.h" + +struct RandomAccessStream; /** * @brief TODO */ struct TekiPersonality { + TekiPersonality(); + virtual void read(RandomAccessStream&, int); // _08 virtual void write(RandomAccessStream&); // _0C - TekiPersonality(); void reset(); void input(TekiPersonality&); + + // _00 = VTBL + // TODO: members }; #endif diff --git a/include/UfoItem.h b/include/UfoItem.h index ae729c4d..32b19546 100644 --- a/include/UfoItem.h +++ b/include/UfoItem.h @@ -5,10 +5,21 @@ #include "Suckable.h" #include "CreatureProp.h" -struct UfoShapeObject; struct Piki; struct SimpleAI; +/** + * @brief TODO + */ +struct UfoShapeObject { + UfoShapeObject(Shape*); + + // TODO: members + Shape* mShape; // _00 + AnimMgr* mAnimMgr; // _04 + AnimContext* mAnimContexts; // _08, array of 8 contexts +}; + /** * @brief TODO */ @@ -95,4 +106,24 @@ struct UfoItem : public Suckable { // TODO: members }; +/** + * @brief TODO + */ +struct UfoAnimator { + UfoAnimator(); + + void init(UfoShapeObject*, PaniMotionTable*); + void startMotion(int, PaniMotionInfo*); + void setMotionSpeed(int, f32); + void getMotionIndex(int); + void stopAllMotions(); + void initFlagMotions(int); + void startFlagMotions(int); + void setMotionLastFrame(int); + void updateAnimation(); + void updateContext(); + + // TODO: members +}; + #endif diff --git a/include/WeedsItem.h b/include/WeedsItem.h new file mode 100644 index 00000000..d03e8bee --- /dev/null +++ b/include/WeedsItem.h @@ -0,0 +1,118 @@ +#ifndef _WEEDSITEM_H +#define _WEEDSITEM_H + +#include "types.h" +#include "ItemMgr.h" + +/* + * @brief TODO + */ +struct Grass { + Grass(); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct Pebble { + Pebble(); + + // TODO: members +}; + +/* + * @brief TODO + */ +struct GrassGen : public ItemCreature { + GrassGen(Shape*, CreatureProp*); + + virtual void startAI(int); // _34 + virtual f32 getSize(); // _3C + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + virtual bool needFlick(Creature*); // _94 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + void workable(); + void startWork(); + void finishWork(); + void resolve(); + void create(int, f32, int); + void setSizeAndNum(f32, int); + void getRandomGrass(); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +/* + * @brief TODO + */ +struct RockGen : public ItemCreature { + RockGen(Shape*, CreatureProp*); + + virtual void startAI(int); // _34 + virtual f32 getSize(); // _3C + virtual void doSave(RandomAccessStream&); // _50 + virtual void doLoad(RandomAccessStream&); // _54 + virtual bool isVisible(); // _74 + virtual bool isAlive(); // _88 + virtual bool needFlick(Creature*); // _94 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + void workable(); + void startWork(); + void finishWork(); + void resolve(); + void create(int, f32, int); + void setSizeAndNum(f32, int); + void killPebble(); + void getRandomPebble(); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +/* + * @brief TODO + */ +struct WeedsGen : public ItemCreature { + WeedsGen(Shape*, CreatureProp*); + + virtual void startAI(int); // _34 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +/* + * @brief TODO + */ +struct Weed : public ItemCreature { + Weed(); + + virtual void startAI(int); // _34 + virtual bool isVisible(); // _74 + virtual bool isAtari(); // _84 + virtual bool isAlive(); // _88 + virtual bool needFlick(Creature*); // _94 + virtual void update(); // _E0 + virtual void refresh(Graphics&); // _EC + + void interactPullout(Creature*); + + // _00 = VTBL + // _00-_304 = ItemCreature? + // TODO: members +}; + +#endif diff --git a/include/Win.h b/include/Win.h index 922f2467..06a3c413 100644 --- a/include/Win.h +++ b/include/Win.h @@ -4,7 +4,10 @@ #include "types.h" #include "CoreNode.h" +struct Graphics; +struct RectArea; struct Texture; +struct Vector2i; /** * @brief TODO @@ -27,22 +30,23 @@ struct GmWin : public CoreNode { void open(); void close(); - void render(struct Graphics&); + void render(Graphics&); void placeCentre(); void print(Graphics&, int, int, char*); void printcentre(Graphics&, int, char*); void printright(Graphics&, int, char*); void printleft(Graphics&, int, char*); void printStart(Graphics&); - void texture(Graphics&, Texture*, int, int, int, int, struct RectArea); - void texturecentre(Graphics&, Texture*, int, int, int, struct RectArea); - void textureleft(Graphics&, Texture*, int, int, int, struct RectArea); - void textureright(Graphics&, Texture*, int, int, int, struct RectArea); + void texture(Graphics&, Texture*, int, int, int, int, RectArea); + void texturecentre(Graphics&, Texture*, int, int, int, RectArea); + void textureleft(Graphics&, Texture*, int, int, int, RectArea); + void textureright(Graphics&, Texture*, int, int, int, RectArea); // unused/inlined: void setRect(int, int); - void moveHome(struct Vector2i&); + void moveHome(Vector2i&); void doRender(Graphics&); + void update(); // _00 = VTBL? // _00-_14 = CoreNode? @@ -63,7 +67,37 @@ struct ContainerWin { // _00 = VTBL }; + // unused/inlined: + void doRender(Graphics&); + void setWin(int, int, Listener*); + void update(); void open(); + void close(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ResultWin { + // unused/inlined: + void doRender(Graphics&); + void update(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct GmWinMgr { + GmWinMgr(); + + void addWindow(GmWin*); + void update(); + void render(Graphics&); + void getWindow(u32); // TODO: members }; diff --git a/include/teki.h b/include/teki.h index f831b0b5..c69b87e6 100644 --- a/include/teki.h +++ b/include/teki.h @@ -8,9 +8,27 @@ #include "PelletView.h" #include "Interactions.h" +struct NTeki; struct Teki; +struct TekiMgr; struct CollEvent; +namespace TekiNakata { +// Teki-making utility functions +void makeTekiParameters(TekiMgr*); +void makeTekis(TekiMgr*); + +} // namespace TekiNakata + +/** + * @brief TODO + */ +struct TekiInteractionKey { + TekiInteractionKey(int, Interaction*); + + // TODO: members +}; + /** * @brief TODO * @@ -32,13 +50,18 @@ struct TekiEvent { */ struct TekiShapeObject { TekiShapeObject(Shape*); - u32 _00; + + u32 _00; // _00 + // TODO: members? }; /** * @brief TODO */ struct TekiMessage { + TekiMessage(int, NTeki*); + + // TODO: members }; /** @@ -277,7 +300,7 @@ struct TekiMgr : public MonoObjectMgr { virtual ~TekiMgr(); // _48 virtual void update(); // _4C virtual void refresh(Graphics&); // _58 - virtual void createObject(); // _80 + virtual Teki* createObject(); // _80 void startStage(); void newTeki(int); diff --git a/src/plugPikiKando/actorMgr.cpp b/src/plugPikiKando/actorMgr.cpp index fc606727..6f30ecd5 100644 --- a/src/plugPikiKando/actorMgr.cpp +++ b/src/plugPikiKando/actorMgr.cpp @@ -37,7 +37,7 @@ ActorMgr::ActorMgr(MapMgr*) * Address: ........ * Size: 000050 */ -void ActorMgr::createObject() +Creature* ActorMgr::createObject() { // UNUSED FUNCTION } diff --git a/src/plugPikiKando/aiAttack.cpp b/src/plugPikiKando/aiAttack.cpp index 691ec49a..65a56780 100644 --- a/src/plugPikiKando/aiAttack.cpp +++ b/src/plugPikiKando/aiAttack.cpp @@ -26,6 +26,7 @@ static void _Print(char*, ...) * Size: 0000C8 */ ActAttack::ActAttack(Piki* piki) + : AndAction(piki) { /* .loc_0x0: diff --git a/src/plugPikiKando/aiTable.cpp b/src/plugPikiKando/aiTable.cpp new file mode 100644 index 00000000..b6339b53 --- /dev/null +++ b/src/plugPikiKando/aiTable.cpp @@ -0,0 +1,4 @@ +#include "PikiAI.h" + +AiTable* AiTable::uniqueInstance; // used once in pikiMgr, just to be set to nullptr lol. +u32 AiTable::Row::numInputs; // stripped diff --git a/src/plugPikiKando/bombItem.cpp b/src/plugPikiKando/bombItem.cpp index ab685ef5..b318986e 100644 --- a/src/plugPikiKando/bombItem.cpp +++ b/src/plugPikiKando/bombItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "BombItem.h" /* * --INFO-- @@ -83,7 +83,7 @@ void BombItem::collisionCallback(CollEvent&) * Address: 800EA238 * Size: 000058 */ -void BombItem::isVisible() +bool BombItem::isVisible() { /* .loc_0x0: @@ -123,14 +123,14 @@ void BombItem::isVisible() * Address: 800EA290 * Size: 000008 */ -u32 BombItem::needShadow() { return 0x0; } +bool BombItem::needShadow() { return false; } /* * --INFO-- * Address: 800EA298 * Size: 000058 */ -void BombItem::isAlive() +bool BombItem::isAlive() { /* .loc_0x0: @@ -170,7 +170,8 @@ void BombItem::isAlive() * Address: 800EA2F0 * Size: 0000AC */ -BombItem::BombItem(CreatureProp*, ItemShapeObject*, SimpleAI*) +BombItem::BombItem(CreatureProp* props, ItemShapeObject*, SimpleAI*) + : ItemCreature(0, props, nullptr) { /* .loc_0x0: @@ -295,7 +296,7 @@ void BombItem::startAI(int) * Address: 800EA484 * Size: 000008 */ -void BombItem::getSize() +f32 BombItem::getSize() { /* .loc_0x0: @@ -309,7 +310,7 @@ void BombItem::getSize() * Address: 800EA48C * Size: 000008 */ -void BombItem::getiMass() +f32 BombItem::getiMass() { /* .loc_0x0: diff --git a/src/plugPikiKando/fishItem.cpp b/src/plugPikiKando/fishItem.cpp index 6f537fd1..1086a972 100644 --- a/src/plugPikiKando/fishItem.cpp +++ b/src/plugPikiKando/fishItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "FishItem.h" /* * --INFO-- @@ -26,6 +26,7 @@ static void _Print(char*, ...) * Size: 0000B0 */ FishGenerator::FishGenerator() + : ItemCreature(0, nullptr, nullptr) { /* .loc_0x0: diff --git a/src/plugPikiKando/gmWin.cpp b/src/plugPikiKando/gmWin.cpp index 07836462..019ec88e 100644 --- a/src/plugPikiKando/gmWin.cpp +++ b/src/plugPikiKando/gmWin.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Win.h" +#include "Geometry.h" /* * --INFO-- @@ -58,7 +59,7 @@ void GmWin::moveHome(Vector2i&) void GmWin::open() { // Generated from stw r0, 0x28(r3) - _28 = 4096; + // _28 = 4096; } /* diff --git a/src/plugPikiKando/itemGem.cpp b/src/plugPikiKando/itemGem.cpp index 942dfd1a..ac3f9cdc 100644 --- a/src/plugPikiKando/itemGem.cpp +++ b/src/plugPikiKando/itemGem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "GemItem.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: ........ * Size: 00003C */ -void GemItem::ignoreAtari(Creature*) +bool GemItem::ignoreAtari(Creature*) { // UNUSED FUNCTION } @@ -55,7 +55,8 @@ void GemItem::bounceCallback() * Address: ........ * Size: 000108 */ -GemItem::GemItem(CreatureProp*, int, Shape**, Shape**, Shape**, SimpleAI*, f32, int, int) +GemItem::GemItem(CreatureProp* props, int p2, Shape** shapes, Shape**, Shape**, SimpleAI*, f32, int, int) + : ItemCreature(p2, props, shapes[0]) { // UNUSED FUNCTION } @@ -212,7 +213,7 @@ void GemItem::finishPick() * Address: ........ * Size: 000018 */ -void GemItem::getSize() +f32 GemItem::getSize() { // UNUSED FUNCTION } @@ -222,7 +223,7 @@ void GemItem::getSize() * Address: ........ * Size: 000008 */ -void GemItem::getiMass() +f32 GemItem::getiMass() { // UNUSED FUNCTION } @@ -423,7 +424,7 @@ void GemItem::doKill() * Address: ........ * Size: 000008 */ -void GemItem::isAlive() +bool GemItem::isAlive() { // UNUSED FUNCTION } @@ -446,5 +447,5 @@ void GemItem::setRouteTracer(RouteTracer*) void ItemCreature::finalSetup() { // Generated from stb r0, 0x3C4(r3) - _3C4 = 1; + // _3C4 = 1; } diff --git a/src/plugPikiKando/itemMgr.cpp b/src/plugPikiKando/itemMgr.cpp index 8b1de813..94a9d127 100644 --- a/src/plugPikiKando/itemMgr.cpp +++ b/src/plugPikiKando/itemMgr.cpp @@ -1,5 +1,7 @@ -#include "types.h" -#include "Vector.h" +#include "ItemMgr.h" +#include "BuildingItem.h" +#include "Interactions.h" +#include "PikiHeadItem.h" /* * --INFO-- @@ -26,7 +28,7 @@ static void _Print(char*, ...) * Address: 800F2978 * Size: 000040 */ -void BuildingItem::insideSafeArea(Vector3f&) +bool BuildingItem::insideSafeArea(Vector3f&) { /* .loc_0x0: @@ -1337,6 +1339,7 @@ void ItemMgr::addUseList(int) * Size: 0009D8 */ ItemMgr::ItemMgr() + : PolyObjectMgr(0) { /* .loc_0x0: @@ -3702,7 +3705,8 @@ void ItemMgr::initialise() * Address: 800F58AC * Size: 0000C8 */ -ItemCreature::ItemCreature(int, CreatureProp*, Shape*) +ItemCreature::ItemCreature(int objType, CreatureProp* props, Shape*) + : AICreature(props) { /* .loc_0x0: @@ -4348,7 +4352,7 @@ void ItemCreature::stimulate(Interaction&) * Address: 800F5F0C * Size: 000040 */ -void InteractBuild::actItem(ItemCreature*) +bool InteractBuild::actItem(ItemCreature*) { /* .loc_0x0: @@ -4380,7 +4384,7 @@ void InteractBuild::actItem(ItemCreature*) * Address: 800F5F4C * Size: 000040 */ -void InteractBikkuri::actItem(ItemCreature*) +bool InteractBikkuri::actItem(ItemCreature*) { /* .loc_0x0: @@ -4412,7 +4416,7 @@ void InteractBikkuri::actItem(ItemCreature*) * Address: 800F5F8C * Size: 000034 */ -void InteractFlick::actItem(ItemCreature*) +bool InteractFlick::actItem(ItemCreature*) { /* .loc_0x0: @@ -4439,7 +4443,7 @@ void InteractFlick::actItem(ItemCreature*) * Address: 800F5FC0 * Size: 000040 */ -void InteractSwallow::actItem(ItemCreature*) +bool InteractSwallow::actItem(ItemCreature*) { /* .loc_0x0: @@ -4471,7 +4475,7 @@ void InteractSwallow::actItem(ItemCreature*) * Address: 800F6000 * Size: 000040 */ -void InteractPullout::actItem(ItemCreature*) +bool InteractPullout::actItem(ItemCreature*) { /* .loc_0x0: @@ -4503,7 +4507,7 @@ void InteractPullout::actItem(ItemCreature*) * Address: 800F6040 * Size: 0002D4 */ -void InteractBomb::actItem(ItemCreature*) +bool InteractBomb::actItem(ItemCreature*) { /* .loc_0x0: @@ -4772,7 +4776,7 @@ void BuildingItem::playEffect(int) * Address: 800F6374 * Size: 000270 */ -void InteractAttack::actItem(ItemCreature*) +bool InteractAttack::actItem(ItemCreature*) { /* .loc_0x0: @@ -4970,7 +4974,8 @@ void InteractAttack::actItem(ItemCreature*) * Address: 800F65E4 * Size: 000144 */ -BuildingItem::BuildingItem(int, CreatureProp*, ItemShapeObject*, SimpleAI*) +BuildingItem::BuildingItem(int p1, CreatureProp* props, ItemShapeObject*, SimpleAI*) + : ItemCreature(p1, props, nullptr) { /* .loc_0x0: @@ -5800,7 +5805,7 @@ void BuildingItem::doRestore(CreatureInf*) * Address: 800F6FF4 * Size: 000068 */ -void ItemMgr::birth(int) +Creature* ItemMgr::birth(int) { /* .loc_0x0: @@ -6267,7 +6272,7 @@ PikiHeadMgr::PikiHeadMgr(ItemMgr*) * Address: 800F7568 * Size: 0000A0 */ -void PikiHeadMgr::birth() +Creature* PikiHeadMgr::birth() { /* .loc_0x0: @@ -6325,7 +6330,7 @@ void PikiHeadMgr::birth() * Address: 800F7608 * Size: 000060 */ -void PikiHeadMgr::createObject() +PikiHeadItem* PikiHeadMgr::createObject() { /* .loc_0x0: @@ -6629,7 +6634,7 @@ MeltingPotMgr::~MeltingPotMgr() * Address: 800F7940 * Size: 000008 */ -void BuildingItem::getiMass() +f32 BuildingItem::getiMass() { /* .loc_0x0: @@ -6643,18 +6648,4 @@ void BuildingItem::getiMass() * Address: 800F7948 * Size: 000008 */ -u32 BuildingItem::needShadow() { return 0x0; } - -/* - * --INFO-- - * Address: 800F7950 - * Size: 000008 - */ -void ItemMgr::@8 @update() -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x68C - */ -} +bool BuildingItem::needShadow() { return false; } diff --git a/src/plugPikiKando/itemObject.cpp b/src/plugPikiKando/itemObject.cpp index 825cf423..13907f7b 100644 --- a/src/plugPikiKando/itemObject.cpp +++ b/src/plugPikiKando/itemObject.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "ItemObject.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: ........ * Size: 000074 */ -ItemBall::ItemBall(Shape*, CreatureProp*) +ItemBall::ItemBall(Shape* shape, CreatureProp* props) + : ItemCreature(0, props, shape) { // UNUSED FUNCTION } @@ -62,21 +63,22 @@ void ItemBall::startAI(int) * Address: 800F7994 * Size: 000008 */ -u32 ItemBall::isAlive() { return 0x1; } +bool ItemBall::isAlive() { return true; } /* * --INFO-- * Address: 800F799C * Size: 000008 */ -u32 ItemBall::isVisible() { return 0x1; } +bool ItemBall::isVisible() { return true; } /* * --INFO-- * Address: ........ * Size: 00005C */ -ItemObject::ItemObject(int, Shape*) +ItemObject::ItemObject(int p1, Shape* shape) + : ItemCreature(p1, nullptr, shape) { // UNUSED FUNCTION } @@ -93,7 +95,8 @@ void ItemObject::update() { } * Address: 800F79A8 * Size: 00007C */ -BombGenItem::BombGenItem(Shape*) +BombGenItem::BombGenItem(Shape* shape) + : ItemObject(0, shape) { /* .loc_0x0: @@ -216,6 +219,7 @@ void BombGenItem::pick() * Size: 00006C */ Fulcrum::Fulcrum() + : ItemObject(0, nullptr) { /* .loc_0x0: @@ -255,6 +259,7 @@ Fulcrum::Fulcrum() * Size: 00006C */ NaviDemoSunsetStart::NaviDemoSunsetStart() + : ItemObject(0, nullptr) { /* .loc_0x0: @@ -294,6 +299,7 @@ NaviDemoSunsetStart::NaviDemoSunsetStart() * Size: 00006C */ NaviDemoSunsetGoal::NaviDemoSunsetGoal() + : ItemObject(0, nullptr) { /* .loc_0x0: @@ -332,7 +338,7 @@ NaviDemoSunsetGoal::NaviDemoSunsetGoal() * Address: 800F7C04 * Size: 000008 */ -u32 ItemObject::needShadow() { return 0x0; } +bool ItemObject::needShadow() { return false; } /* * --INFO-- @@ -346,14 +352,14 @@ void ItemObject::postUpdate(int, f32) { } * Address: 800F7C10 * Size: 000008 */ -u32 ItemObject::isAtari() { return 0x0; } +bool ItemObject::isAtari() { return false; } /* * --INFO-- * Address: 800F7C18 * Size: 000030 */ -void BombGenItem::isAtari() +bool BombGenItem::isAtari() { /* .loc_0x0: @@ -381,14 +387,14 @@ void BombGenItem::isAtari() * Address: 800F7C48 * Size: 000008 */ -u32 BombGenItem::needFlick(Creature*) { return 0x0; } +bool BombGenItem::needFlick(Creature*) { return false; } /* * --INFO-- * Address: 800F7C50 * Size: 000030 */ -void BombGenItem::isVisible() +bool BombGenItem::isVisible() { /* .loc_0x0: @@ -416,7 +422,7 @@ void BombGenItem::isVisible() * Address: 800F7C80 * Size: 000030 */ -void BombGenItem::isAlive() +bool BombGenItem::isAlive() { /* .loc_0x0: diff --git a/src/plugPikiKando/keyItem.cpp b/src/plugPikiKando/keyItem.cpp index 41c682f1..0b00909d 100644 --- a/src/plugPikiKando/keyItem.cpp +++ b/src/plugPikiKando/keyItem.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "KeyItem.h" +#include "DoorItem.h" /* * --INFO-- @@ -25,7 +26,8 @@ static void _Print(char*, ...) * Address: 800ED204 * Size: 0000A8 */ -KeyItem::KeyItem(CreatureProp*, Shape*) +KeyItem::KeyItem(CreatureProp* props, Shape*) + : Creature(props) { /* .loc_0x0: @@ -79,7 +81,7 @@ KeyItem::KeyItem(CreatureProp*, Shape*) * Address: 800ED2AC * Size: 000008 */ -void KeyItem::getSize() +f32 KeyItem::getSize() { /* .loc_0x0: @@ -129,7 +131,7 @@ void KeyItem::init(Vector3f&) void KeyItem::startAI(int) { // Generated from stw r0, 0x2B8(r3) - _2B8 = 0; + // _2B8 = 0; } /* @@ -137,7 +139,7 @@ void KeyItem::startAI(int) * Address: 800ED314 * Size: 000020 */ -void KeyItem::isVisible() +bool KeyItem::isVisible() { /* .loc_0x0: @@ -274,7 +276,7 @@ void KeyItem::collisionCallback(CollEvent&) { } * Address: 800ED480 * Size: 000008 */ -void KeyItem::getiMass() +f32 KeyItem::getiMass() { /* .loc_0x0: @@ -387,7 +389,8 @@ void KeyItem::refresh(Graphics&) * Address: 800ED5D4 * Size: 000060 */ -DoorItem::DoorItem(int, CreatureProp*, Shape*) +DoorItem::DoorItem(int p1, CreatureProp* props, Shape* shape) + : ItemCreature(p1, props, shape) { /* .loc_0x0: @@ -453,7 +456,7 @@ void DoorItem::becomeGate() * Address: 800ED654 * Size: 00001C */ -void DoorItem::getSize() +f32 DoorItem::getSize() { /* .loc_0x0: @@ -512,7 +515,7 @@ void DoorItem::init(Vector3f&) void DoorItem::startAI(int) { // Generated from stw r0, 0x3CC(r3) - _3CC = 0; + // _3CC = 0; } /* @@ -578,7 +581,7 @@ void DoorItem::update() * Address: 800ED778 * Size: 000020 */ -void DoorItem::isVisible() +bool DoorItem::isVisible() { /* .loc_0x0: @@ -598,7 +601,7 @@ void DoorItem::isVisible() * Address: 800ED798 * Size: 000008 */ -void DoorItem::getiMass() +f32 DoorItem::getiMass() { /* .loc_0x0: @@ -612,7 +615,7 @@ void DoorItem::getiMass() * Address: 800ED7A0 * Size: 000020 */ -void DoorItem::isAtari() +bool DoorItem::isAtari() { /* .loc_0x0: @@ -773,14 +776,14 @@ void DoorItem::refresh(Graphics&) * Address: 800ED9C4 * Size: 000008 */ -u32 DoorItem::isAlive() { return 0x1; } +bool DoorItem::isAlive() { return true; } /* * --INFO-- * Address: 800ED9CC * Size: 000008 */ -void DoorItem::getHeight() +f32 DoorItem::getHeight() { /* .loc_0x0: @@ -794,7 +797,7 @@ void DoorItem::getHeight() * Address: 800ED9D4 * Size: 000008 */ -void KeyItem::getHeight() +f32 KeyItem::getHeight() { /* .loc_0x0: diff --git a/src/plugPikiKando/kmath.cpp b/src/plugPikiKando/kmath.cpp index 9067095a..3443a122 100644 --- a/src/plugPikiKando/kmath.cpp +++ b/src/plugPikiKando/kmath.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "KMath.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 801126C4 * Size: 00005C */ -void isNan(f32) +bool isNan(f32) { /* .loc_0x0: diff --git a/src/plugPikiKando/kontroller.cpp b/src/plugPikiKando/kontroller.cpp index 88608650..bb912050 100644 --- a/src/plugPikiKando/kontroller.cpp +++ b/src/plugPikiKando/kontroller.cpp @@ -1,14 +1,14 @@ -#include "types.h" +#include "Kontroller.h" +#include "Dolphin/os.h" + +RamStream* controllerBuffer; /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "Kontroller"); } /* * --INFO-- @@ -25,62 +25,12 @@ static void _Print(char*, ...) * Address: 80115B8C * Size: 0000CC */ -Kontroller::Kontroller(int) +Kontroller::Kontroller(int p1) + : Controller(p1) { - /* - .loc_0x0: - mflr r0 - lis r5, 0x8022 - stw r0, 0x4(r1) - addi r0, r5, 0x738C - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - stw r30, 0x18(r1) - li r30, 0 - stw r29, 0x14(r1) - addi r29, r4, 0 - stw r28, 0x10(r1) - addi r28, r3, 0 - lis r3, 0x8022 - stw r0, 0x0(r28) - addi r0, r3, 0x737C - lis r3, 0x802C - stw r0, 0x0(r28) - addi r31, r3, 0x2D9C - addi r3, r28, 0 - stw r30, 0x10(r28) - addi r4, r31, 0 - stw r30, 0xC(r28) - stw r30, 0x8(r28) - bl -0xF0D14 - lis r3, 0x8023 - subi r0, r3, 0x71E0 - stw r0, 0x0(r28) - addi r3, r28, 0 - addi r4, r31, 0 - bl -0xD54C4 - lis r3, 0x8023 - subi r0, r3, 0x714C - stw r0, 0x0(r28) - addi r3, r28, 0 - addi r4, r29, 0 - bl -0xD5268 - lis r3, 0x802C - addi r0, r3, 0x2E24 - stw r0, 0x0(r28) - mr r3, r28 - stw r30, 0x50(r28) - stw r30, 0x54(r28) - stw r30, 0x58(r28) - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - lwz r30, 0x18(r1) - lwz r29, 0x14(r1) - lwz r28, 0x10(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + _50 = 0; + _54 = 0; + _58 = nullptr; } /* @@ -88,31 +38,12 @@ Kontroller::Kontroller(int) * Address: 80115C58 * Size: 000050 */ -void Kontroller::save(RamStream*, int) +void Kontroller::save(RamStream* stream, int p2) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - mr r31, r3 - stw r5, 0x54(r3) - mr r3, r4 - stw r4, 0x58(r31) - li r4, 0 - lwz r12, 0x4(r3) - lwz r12, 0x5C(r12) - mtlr r12 - blrl - li r0, 0x1 - stw r0, 0x50(r31) - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + _54 = p2; + _58 = stream; + stream->setPosition(0); + _50 = 1; } /* @@ -120,31 +51,12 @@ void Kontroller::save(RamStream*, int) * Address: 80115CA8 * Size: 000050 */ -void Kontroller::load(RamStream*, int) +void Kontroller::load(RamStream* stream, int p2) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - mr r31, r3 - stw r5, 0x54(r3) - mr r3, r4 - stw r4, 0x58(r31) - li r4, 0 - lwz r12, 0x4(r3) - lwz r12, 0x5C(r12) - mtlr r12 - blrl - li r0, 0x2 - stw r0, 0x50(r31) - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + _54 = p2; + _58 = stream; + stream->setPosition(0); + _50 = 2; } /* @@ -164,6 +76,8 @@ void Kontroller::stop() */ void Kontroller::update() { + switch (_50) { + } /* .loc_0x0: mflr r0 @@ -276,14 +190,7 @@ void Kontroller::update() * Address: 80115E60 * Size: 000008 */ -void Kontroller::getSaveSize(int) -{ - /* - .loc_0x0: - mulli r3, r3, 0xC - blr - */ -} +int Kontroller::getSaveSize(int p1) { return p1 * 12; } /* * --INFO-- diff --git a/src/plugPikiKando/kusaItem.cpp b/src/plugPikiKando/kusaItem.cpp index f82f61b1..9ebeb6e3 100644 --- a/src/plugPikiKando/kusaItem.cpp +++ b/src/plugPikiKando/kusaItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "KusaItem.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800E5DD8 * Size: 0000A4 */ -KusaItem::KusaItem(CreatureProp*, Shape*) +KusaItem::KusaItem(CreatureProp* props, Shape* shape) + : ItemCreature(0, props, shape) { /* .loc_0x0: @@ -226,7 +227,7 @@ void KusaItem::doSave(RandomAccessStream&) * Address: 800E602C * Size: 00001C */ -void KusaItem::ignoreAtari(Creature*) +bool KusaItem::ignoreAtari(Creature*) { /* .loc_0x0: @@ -247,7 +248,7 @@ void KusaItem::ignoreAtari(Creature*) * Address: 800E6048 * Size: 000008 */ -void KusaItem::getSize() +f32 KusaItem::getSize() { /* .loc_0x0: @@ -261,7 +262,7 @@ void KusaItem::getSize() * Address: 800E6050 * Size: 000008 */ -void KusaItem::getiMass() +f32 KusaItem::getiMass() { /* .loc_0x0: @@ -394,7 +395,8 @@ void KusaItem::refresh(Graphics&) * Address: 800E61D4 * Size: 0000D8 */ -BoBaseItem::BoBaseItem(CreatureProp*, Shape*) +BoBaseItem::BoBaseItem(CreatureProp* props, Shape* shape) + : ItemCreature(0, props, shape) { /* .loc_0x0: @@ -517,7 +519,7 @@ void BoBaseItem::startAI(int) * Address: 800E6358 * Size: 000030 */ -void BoBaseItem::ignoreAtari(Creature*) +bool BoBaseItem::ignoreAtari(Creature*) { /* .loc_0x0: @@ -545,7 +547,7 @@ void BoBaseItem::ignoreAtari(Creature*) * Address: 800E6388 * Size: 000008 */ -void BoBaseItem::getSize() +f32 BoBaseItem::getSize() { /* .loc_0x0: @@ -559,7 +561,7 @@ void BoBaseItem::getSize() * Address: 800E6390 * Size: 000008 */ -void BoBaseItem::getiMass() +f32 BoBaseItem::getiMass() { /* .loc_0x0: @@ -797,7 +799,7 @@ void BoBaseItem::interactBuild(InteractBuild&) * Address: 800E6648 * Size: 000008 */ -void BoBaseItem::isAlive() +bool BoBaseItem::isAlive() { /* .loc_0x0: @@ -811,18 +813,18 @@ void BoBaseItem::isAlive() * Address: 800E6650 * Size: 000008 */ -u32 BoBaseItem::isVisible() { return 0x1; } +bool BoBaseItem::isVisible() { return true; } /* * --INFO-- * Address: 800E6658 * Size: 000008 */ -u32 KusaItem::isVisible() { return 0x1; } +bool KusaItem::isVisible() { return true; } /* * --INFO-- * Address: 800E6660 * Size: 000008 */ -u32 KusaItem::isAlive() { return 0x1; } +bool KusaItem::isAlive() { return true; } diff --git a/src/plugPikiKando/mapParts.cpp b/src/plugPikiKando/mapParts.cpp index 82b56f92..f9a3d68c 100644 --- a/src/plugPikiKando/mapParts.cpp +++ b/src/plugPikiKando/mapParts.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "MapMgr.h" /* * --INFO-- @@ -78,7 +78,8 @@ void MapParts::applyVelocity(Plane&, Vector3f&, Vector3f&) * Address: 8011851C * Size: 000078 */ -MapEntity::MapEntity(Shape*) +MapEntity::MapEntity(Shape* shape) + : MapParts(shape) { /* .loc_0x0: @@ -196,7 +197,8 @@ void MapEntity::update() * Address: 80118694 * Size: 0000D0 */ -MapSlider::MapSlider(Shape*, int, int, f32, f32, f32, int) +MapSlider::MapSlider(Shape* shape, int, int, f32, f32, f32, int) + : MapParts(shape) { /* .loc_0x0: diff --git a/src/plugPikiKando/mizuItem.cpp b/src/plugPikiKando/mizuItem.cpp index 26634b4a..1f3ebbd5 100644 --- a/src/plugPikiKando/mizuItem.cpp +++ b/src/plugPikiKando/mizuItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "MizuItem.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800F7CB0 * Size: 000068 */ -MizuItem::MizuItem(int, CreatureProp*, ItemShapeObject*, SimpleAI*) +MizuItem::MizuItem(int p1, CreatureProp* props, ItemShapeObject*, SimpleAI*) + : ItemCreature(p1, props, nullptr) { /* .loc_0x0: @@ -105,7 +106,7 @@ void MizuItem::update() * Address: 800F7D88 * Size: 000008 */ -u32 MizuItem::needFlick(Creature*) { return 0x0; } +bool MizuItem::needFlick(Creature*) { return false; } /* * --INFO-- @@ -166,7 +167,7 @@ void MizuItem::startAI(int) * Address: 800F7E20 * Size: 00006C */ -void MizuItem::isAlive() +bool MizuItem::isAlive() { /* .loc_0x0: diff --git a/src/plugPikiKando/navi.cpp b/src/plugPikiKando/navi.cpp index f06ae671..32debecf 100644 --- a/src/plugPikiKando/navi.cpp +++ b/src/plugPikiKando/navi.cpp @@ -2781,7 +2781,7 @@ void Navi::reset() * Address: 800FA690 * Size: 00000C */ -void Navi::getSize() +f32 Navi::getSize() { /* .loc_0x0: @@ -11201,7 +11201,7 @@ bool Navi::mayIstick() { return 0x0; } * Address: 80101104 * Size: 000008 */ -void Navi::getShadowSize() +f32 Navi::getShadowSize() { /* .loc_0x0: diff --git a/src/plugPikiKando/objectMgr.cpp b/src/plugPikiKando/objectMgr.cpp index b96c1b13..cb3adb71 100644 --- a/src/plugPikiKando/objectMgr.cpp +++ b/src/plugPikiKando/objectMgr.cpp @@ -1,3 +1,4 @@ +#include "ObjectMgr.h" #include "CreatureNode.h" /* @@ -1620,7 +1621,7 @@ void MonoObjectMgr::getIndex(Creature*) * Address: 800E1474 * Size: 0000AC */ -void MonoObjectMgr::birth() +Creature* MonoObjectMgr::birth() { /* .loc_0x0: @@ -3057,7 +3058,7 @@ void PolyObjectMgr::get(int) * Address: 800E2420 * Size: 00011C */ -void PolyObjectMgr::birth(int) +Creature* PolyObjectMgr::birth(int) { /* .loc_0x0: diff --git a/src/plugPikiKando/paniItemAnimator.cpp b/src/plugPikiKando/paniItemAnimator.cpp index c540a72e..f2ad4349 100644 --- a/src/plugPikiKando/paniItemAnimator.cpp +++ b/src/plugPikiKando/paniItemAnimator.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniAnimator.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 800F7E8C * Size: 000268 */ -void PaniItemAnimator::createMotionTable() +PaniMotionTable* PaniItemAnimator::createMotionTable() { /* .loc_0x0: diff --git a/src/plugPikiKando/paniPlantAnimator.cpp b/src/plugPikiKando/paniPlantAnimator.cpp index 71c1db78..53c7d5ed 100644 --- a/src/plugPikiKando/paniPlantAnimator.cpp +++ b/src/plugPikiKando/paniPlantAnimator.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniAnimator.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 8011B148 * Size: 000148 */ -void PaniPlantAnimator::createMotionTable() +PaniMotionTable* PaniPlantAnimator::createMotionTable() { /* .loc_0x0: diff --git a/src/plugPikiKando/panipikianimator.cpp b/src/plugPikiKando/panipikianimator.cpp index 3caeb711..b563ef98 100644 --- a/src/plugPikiKando/panipikianimator.cpp +++ b/src/plugPikiKando/panipikianimator.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniAnimator.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 80118D04 * Size: 000CD0 */ -void PaniPikiAnimator::createMotionTable() +PaniMotionTable* PaniPikiAnimator::createMotionTable() { /* .loc_0x0: diff --git a/src/plugPikiKando/pelletMgr.cpp b/src/plugPikiKando/pelletMgr.cpp index 9487815e..0f3ef977 100644 --- a/src/plugPikiKando/pelletMgr.cpp +++ b/src/plugPikiKando/pelletMgr.cpp @@ -5314,7 +5314,7 @@ void PelletMgr::getShapeObject(u32) * Address: 80098798 * Size: 000054 */ -void PelletMgr::createObject() +Pellet* PelletMgr::createObject() { /* .loc_0x0: diff --git a/src/plugPikiKando/pikiInf.cpp b/src/plugPikiKando/pikiInf.cpp index 3fa4a58f..d6118eea 100644 --- a/src/plugPikiKando/pikiInf.cpp +++ b/src/plugPikiKando/pikiInf.cpp @@ -1,12 +1,18 @@ -#include "types.h" +#include "BaseInf.h" +#include "Piki.h" +#include "Dolphin/os.h" +#include "sysNew.h" + +PikiInfMgr pikiInfMgr; /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) +static void _Error(char* fmt, ...) { + OSPanic(__FILE__, __LINE__, fmt); // UNUSED FUNCTION } @@ -27,7 +33,9 @@ static void _Print(char*, ...) */ PikiInfMgr::PikiInfMgr() { - // UNUSED FUNCTION + for (int i = 0; i < 3; i++) { + mPikiCounts[0][i] = mPikiCounts[1][i] = mPikiCounts[2][i] = 0; + } } /* @@ -35,22 +43,7 @@ PikiInfMgr::PikiInfMgr() * Address: 800C56D4 * Size: 000028 */ -void PikiInfMgr::initGame() -{ - /* - .loc_0x0: - mflr r0 - lis r3, 0x803D - stw r0, 0x4(r1) - addi r3, r3, 0x1DF0 - stwu r1, -0x8(r1) - bl 0x180 - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} +void PikiInfMgr::initGame() { pikiInfMgr.clear(); } /* * --INFO-- @@ -255,6 +248,9 @@ void PikiInfMgr::getTotal() */ BaseInf::BaseInf() { + initCore("baseInf"); + mPosition.set(0.0f, 0.0f, 0.0f); + _20.set(0.0f, 0.0f, 0.0f); // UNUSED FUNCTION } @@ -263,135 +259,35 @@ BaseInf::BaseInf() * Address: 800C5894 * Size: 00005C */ -void BaseInf::store(Creature*) +void BaseInf::store(Creature* owner) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r5, 0x94(r4) - lwz r0, 0x98(r4) - stw r5, 0x14(r3) - stw r0, 0x18(r3) - lwz r0, 0x9C(r4) - stw r0, 0x1C(r3) - lwz r5, 0x88(r4) - lwz r0, 0x8C(r4) - stw r5, 0x20(r3) - stw r0, 0x24(r3) - lwz r0, 0x90(r4) - stw r0, 0x28(r3) - lwz r12, 0x0(r3) - lwz r12, 0x10(r12) - mtlr r12 - blrl - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ + mPosition = owner->mPosition; + _20 = owner->_88; + doStore(owner); } -/* - * --INFO-- - * Address: 800C58F0 - * Size: 000004 - */ -void BaseInf::doStore(Creature*) { } - /* * --INFO-- * Address: 800C58F4 * Size: 00005C */ -void BaseInf::restore(Creature*) +void BaseInf::restore(Creature* owner) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r5, 0x14(r3) - lwz r0, 0x18(r3) - stw r5, 0x94(r4) - stw r0, 0x98(r4) - lwz r0, 0x1C(r3) - stw r0, 0x9C(r4) - lwz r5, 0x20(r3) - lwz r0, 0x24(r3) - stw r5, 0x88(r4) - stw r0, 0x8C(r4) - lwz r0, 0x28(r3) - stw r0, 0x90(r4) - lwz r12, 0x0(r3) - lwz r12, 0x14(r12) - mtlr r12 - blrl - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ + owner->mPosition = mPosition; + owner->_88 = _20; + doRestore(owner); } -/* - * --INFO-- - * Address: 800C5950 - * Size: 000004 - */ -void BaseInf::doRestore(Creature*) { } - /* * --INFO-- * Address: 800C5954 * Size: 0000A0 */ -void BaseInf::saveCard(RandomAccessStream&) +void BaseInf::saveCard(RandomAccessStream& card) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x30(r1) - stw r31, 0x2C(r1) - addi r31, r4, 0 - stw r30, 0x28(r1) - mr r30, r3 - lfs f0, 0x14(r3) - addi r3, r31, 0 - lwz r12, 0x4(r31) - fctiwz f0, f0 - lwz r12, 0x2C(r12) - stfd f0, 0x20(r1) - mtlr r12 - lwz r4, 0x24(r1) - blrl - lfs f0, 0x18(r30) - mr r3, r31 - lwz r12, 0x4(r31) - fctiwz f0, f0 - lwz r12, 0x2C(r12) - stfd f0, 0x18(r1) - mtlr r12 - lwz r4, 0x1C(r1) - blrl - lfs f0, 0x1C(r30) - mr r3, r31 - lwz r12, 0x4(r31) - fctiwz f0, f0 - lwz r12, 0x2C(r12) - stfd f0, 0x10(r1) - mtlr r12 - lwz r4, 0x14(r1) - blrl - lwz r0, 0x34(r1) - lwz r31, 0x2C(r1) - lwz r30, 0x28(r1) - addi r1, r1, 0x30 - mtlr r0 - blr - */ + card.writeShort(mPosition.x); + card.writeShort(mPosition.y); + card.writeShort(mPosition.z); } /* @@ -399,72 +295,12 @@ void BaseInf::saveCard(RandomAccessStream&) * Address: 800C59F4 * Size: 0000F4 */ -void BaseInf::loadCard(RandomAccessStream&) +void BaseInf::loadCard(RandomAccessStream& card) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x38(r1) - stw r31, 0x34(r1) - stw r30, 0x30(r1) - addi r30, r4, 0 - stw r29, 0x2C(r1) - addi r29, r3, 0 - addi r3, r30, 0 - lwz r12, 0x4(r30) - lwz r12, 0x10(r12) - mtlr r12 - blrl - extsh r0, r3 - lfd f1, -0x6A50(r2) - xoris r0, r0, 0x8000 - stw r0, 0x24(r1) - lis r31, 0x4330 - addi r3, r30, 0 - stw r31, 0x20(r1) - lfd f0, 0x20(r1) - fsubs f0, f0, f1 - stfs f0, 0x14(r29) - lwz r12, 0x4(r30) - lwz r12, 0x10(r12) - mtlr r12 - blrl - extsh r0, r3 - lfd f1, -0x6A50(r2) - xoris r0, r0, 0x8000 - stw r0, 0x1C(r1) - mr r3, r30 - stw r31, 0x18(r1) - lfd f0, 0x18(r1) - fsubs f0, f0, f1 - stfs f0, 0x18(r29) - lwz r12, 0x4(r30) - lwz r12, 0x10(r12) - mtlr r12 - blrl - extsh r0, r3 - lfd f1, -0x6A50(r2) - xoris r0, r0, 0x8000 - stw r0, 0x14(r1) - stw r31, 0x10(r1) - lfd f0, 0x10(r1) - fsubs f0, f0, f1 - stfs f0, 0x1C(r29) - lfs f0, -0x4318(r13) - stfs f0, 0x20(r29) - lfs f0, -0x4314(r13) - stfs f0, 0x24(r29) - lfs f0, -0x4310(r13) - stfs f0, 0x28(r29) - lwz r0, 0x3C(r1) - lwz r31, 0x34(r1) - lwz r30, 0x30(r1) - lwz r29, 0x2C(r1) - addi r1, r1, 0x38 - mtlr r0 - blr - */ + mPosition.x = card.readShort(); + mPosition.y = card.readShort(); + mPosition.z = card.readShort(); + _20.set(0.0f, 0.0f, 0.0f); } /* @@ -474,6 +310,7 @@ void BaseInf::loadCard(RandomAccessStream&) */ BPikiInf::BPikiInf() { + mPikiColor = mPikiHappa = 0; // UNUSED FUNCTION } @@ -482,60 +319,11 @@ BPikiInf::BPikiInf() * Address: 800C5AE8 * Size: 0000C4 */ -void BPikiInf::saveCard(RandomAccessStream&) +void BPikiInf::saveCard(RandomAccessStream& card) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x30(r1) - stw r31, 0x2C(r1) - addi r31, r4, 0 - stw r30, 0x28(r1) - mr r30, r3 - lfs f0, 0x14(r3) - addi r3, r31, 0 - lwz r12, 0x4(r31) - fctiwz f0, f0 - lwz r12, 0x2C(r12) - stfd f0, 0x20(r1) - mtlr r12 - lwz r4, 0x24(r1) - blrl - lfs f0, 0x18(r30) - mr r3, r31 - lwz r12, 0x4(r31) - fctiwz f0, f0 - lwz r12, 0x2C(r12) - stfd f0, 0x18(r1) - mtlr r12 - lwz r4, 0x1C(r1) - blrl - lfs f0, 0x1C(r30) - mr r3, r31 - lwz r12, 0x4(r31) - fctiwz f0, f0 - lwz r12, 0x2C(r12) - stfd f0, 0x10(r1) - mtlr r12 - lwz r4, 0x14(r1) - blrl - lwz r12, 0x4(r31) - mr r3, r31 - lbz r4, 0x2D(r30) - lwz r12, 0x28(r12) - lbz r0, 0x2C(r30) - rlwinm r4,r4,2,0,29 - mtlr r12 - or r4, r4, r0 - blrl - lwz r0, 0x34(r1) - lwz r31, 0x2C(r1) - lwz r30, 0x28(r1) - addi r1, r1, 0x30 - mtlr r0 - blr - */ + BaseInf::saveCard(card); + u8 byte = (mPikiHappa << 2) | mPikiColor; + card.writeByte(byte); } /* @@ -543,81 +331,12 @@ void BPikiInf::saveCard(RandomAccessStream&) * Address: 800C5BAC * Size: 000118 */ -void BPikiInf::loadCard(RandomAccessStream&) +void BPikiInf::loadCard(RandomAccessStream& card) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x38(r1) - stw r31, 0x34(r1) - stw r30, 0x30(r1) - addi r30, r4, 0 - stw r29, 0x2C(r1) - addi r29, r3, 0 - addi r3, r30, 0 - lwz r12, 0x4(r30) - lwz r12, 0x10(r12) - mtlr r12 - blrl - extsh r0, r3 - lfd f1, -0x6A50(r2) - xoris r0, r0, 0x8000 - stw r0, 0x24(r1) - lis r31, 0x4330 - addi r3, r30, 0 - stw r31, 0x20(r1) - lfd f0, 0x20(r1) - fsubs f0, f0, f1 - stfs f0, 0x14(r29) - lwz r12, 0x4(r30) - lwz r12, 0x10(r12) - mtlr r12 - blrl - extsh r0, r3 - lfd f1, -0x6A50(r2) - xoris r0, r0, 0x8000 - stw r0, 0x1C(r1) - mr r3, r30 - stw r31, 0x18(r1) - lfd f0, 0x18(r1) - fsubs f0, f0, f1 - stfs f0, 0x18(r29) - lwz r12, 0x4(r30) - lwz r12, 0x10(r12) - mtlr r12 - blrl - extsh r0, r3 - lfd f1, -0x6A50(r2) - xoris r0, r0, 0x8000 - stw r0, 0x14(r1) - mr r3, r30 - stw r31, 0x10(r1) - lfd f0, 0x10(r1) - fsubs f0, f0, f1 - stfs f0, 0x1C(r29) - lfs f0, -0x4318(r13) - stfs f0, 0x20(r29) - lfs f0, -0x4314(r13) - stfs f0, 0x24(r29) - lfs f0, -0x4310(r13) - stfs f0, 0x28(r29) - lwz r12, 0x4(r30) - lwz r12, 0xC(r12) - mtlr r12 - blrl - rlwinm r0,r3,0,30,31 - stb r0, 0x2C(r29) - rlwinm r0,r3,30,26,31 - stb r0, 0x2D(r29) - lwz r0, 0x3C(r1) - lwz r31, 0x34(r1) - lwz r30, 0x30(r1) - lwz r29, 0x2C(r1) - addi r1, r1, 0x38 - mtlr r0 - blr - */ + BaseInf::loadCard(card); + u8 byte = card.readByte(); + mPikiColor = byte & 0x3; + mPikiHappa = (byte >> 2) & 0x3F; } /* @@ -625,16 +344,10 @@ void BPikiInf::loadCard(RandomAccessStream&) * Address: 800C5CC4 * Size: 000014 */ -void BPikiInf::doStore(Creature*) +void BPikiInf::doStore(Creature* piki) { - /* - .loc_0x0: - lwz r0, 0x3CC(r4) - stb r0, 0x2C(r3) - lwz r0, 0x3D0(r4) - stb r0, 0x2D(r3) - blr - */ + mPikiColor = static_cast(piki)->_3CC; + mPikiHappa = static_cast(piki)->_3D0; } /* @@ -642,16 +355,10 @@ void BPikiInf::doStore(Creature*) * Address: 800C5CD8 * Size: 000014 */ -void BPikiInf::doRestore(Creature*) +void BPikiInf::doRestore(Creature* piki) { - /* - .loc_0x0: - lbz r0, 0x2C(r3) - stw r0, 0x3CC(r4) - lbz r0, 0x2D(r3) - stw r0, 0x3D0(r4) - blr - */ + static_cast(piki)->_3CC = mPikiColor; + static_cast(piki)->_3D0 = mPikiHappa; } /* @@ -659,171 +366,24 @@ void BPikiInf::doRestore(Creature*) * Address: 800C5CEC * Size: 000170 */ -MonoInfMgr::MonoInfMgr() -{ - /* - .loc_0x0: - mflr r0 - lis r4, 0x802C - stw r0, 0x4(r1) - subi r0, r4, 0x7C7C - stwu r1, -0x30(r1) - stmw r25, 0x14(r1) - addi r25, r3, 0 - lis r3, 0x802C - li r28, 0 - stw r0, 0x0(r25) - subi r0, r3, 0x7C9C - lis r3, 0x8022 - stw r0, 0x0(r25) - addi r26, r3, 0x738C - lis r3, 0x8022 - stw r26, 0xC(r25) - addi r27, r3, 0x737C - lis r3, 0x802C - stw r27, 0xC(r25) - subi r29, r3, 0x7DC4 - addi r4, r29, 0 - stw r28, 0x1C(r25) - addi r3, r25, 0xC - stw r28, 0x18(r25) - stw r28, 0x14(r25) - bl -0xA0E7C - lis r3, 0x802C - subi r30, r3, 0x7C18 - stw r30, 0xC(r25) - subi r31, r13, 0x4320 - addi r4, r29, 0 - lfs f0, -0x6A58(r2) - addi r3, r25, 0x38 - stfs f0, 0x28(r25) - stfs f0, 0x24(r25) - stfs f0, 0x20(r25) - stfs f0, 0x34(r25) - stfs f0, 0x30(r25) - stfs f0, 0x2C(r25) - stw r28, 0x1C(r25) - stw r28, 0x18(r25) - stw r28, 0x14(r25) - stw r31, 0x10(r25) - lfs f0, -0x4338(r13) - stfs f0, 0x20(r25) - lfs f0, -0x4334(r13) - stfs f0, 0x24(r25) - lfs f0, -0x4330(r13) - stfs f0, 0x28(r25) - lfs f0, -0x432C(r13) - stfs f0, 0x2C(r25) - lfs f0, -0x4328(r13) - stfs f0, 0x30(r25) - lfs f0, -0x4324(r13) - stfs f0, 0x34(r25) - stw r26, 0x38(r25) - stw r27, 0x38(r25) - stw r28, 0x48(r25) - stw r28, 0x44(r25) - stw r28, 0x40(r25) - bl -0xA0F08 - stw r30, 0x38(r25) - mr r3, r25 - lfs f0, -0x6A58(r2) - stfs f0, 0x54(r25) - stfs f0, 0x50(r25) - stfs f0, 0x4C(r25) - stfs f0, 0x60(r25) - stfs f0, 0x5C(r25) - stfs f0, 0x58(r25) - stw r28, 0x48(r25) - stw r28, 0x44(r25) - stw r28, 0x40(r25) - stw r31, 0x3C(r25) - lfs f0, -0x4338(r13) - stfs f0, 0x4C(r25) - lfs f0, -0x4334(r13) - stfs f0, 0x50(r25) - lfs f0, -0x4330(r13) - stfs f0, 0x54(r25) - lfs f0, -0x432C(r13) - stfs f0, 0x58(r25) - lfs f0, -0x4328(r13) - stfs f0, 0x5C(r25) - lfs f0, -0x4324(r13) - stfs f0, 0x60(r25) - stw r28, 0x8(r25) - lwz r0, 0x34(r1) - lmw r25, 0x14(r1) - addi r1, r1, 0x30 - mtlr r0 - blr - */ -} +MonoInfMgr::MonoInfMgr() { mInfs = nullptr; } /* * --INFO-- * Address: 800C5E5C * Size: 0000D0 */ -void MonoInfMgr::init(int) +void MonoInfMgr::init(int count) { - /* - .loc_0x0: - mflr r0 - lis r5, 0x802C - stw r0, 0x4(r1) - subi r5, r5, 0x7DB8 - stwu r1, -0x28(r1) - stw r31, 0x24(r1) - li r31, 0 - stw r30, 0x20(r1) - stw r29, 0x1C(r1) - mr r29, r4 - stw r28, 0x18(r1) - addi r28, r3, 0 - stw r31, 0x1C(r3) - lis r3, 0x802C - subi r0, r3, 0x7DAC - stw r31, 0x18(r28) - stw r31, 0x14(r28) - stw r5, 0x10(r28) - stw r31, 0x48(r28) - stw r31, 0x44(r28) - stw r31, 0x40(r28) - stw r0, 0x3C(r28) - stw r29, 0x4(r28) - lwz r0, 0x4(r28) - rlwinm r3,r0,2,0,29 - bl -0x7EEBC - stw r3, 0x8(r28) - li r30, 0 - b .loc_0xA8 - - .loc_0x74: - mr r3, r28 - lwz r12, 0x0(r28) - lwz r12, 0x1C(r12) - mtlr r12 - blrl - lwz r4, 0x8(r28) - stwx r3, r4, r31 - addi r3, r28, 0x38 - lwz r4, 0x8(r28) - lwzx r4, r4, r31 - bl -0x85920 - addi r31, r31, 0x4 - addi r30, r30, 0x1 + mActiveList.initCore("activeList"); + mFreeList.initCore("freeList"); + mInfCount = count; + mInfs = new BaseInf*[mInfCount]; - .loc_0xA8: - cmpw r30, r29 - blt+ .loc_0x74 - lwz r0, 0x2C(r1) - lwz r31, 0x24(r1) - lwz r30, 0x20(r1) - lwz r29, 0x1C(r1) - lwz r28, 0x18(r1) - addi r1, r1, 0x28 - mtlr r0 - blr - */ + for (int i = 0; i < count; i++) { + mInfs[i] = newInf(); + mFreeList.add(mInfs[i]); + } } /* @@ -831,35 +391,14 @@ void MonoInfMgr::init(int) * Address: 800C5F2C * Size: 000058 */ -void MonoInfMgr::getFreeInf() +BaseInf* MonoInfMgr::getFreeInf() { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - stw r30, 0x10(r1) - mr r30, r3 - lwz r0, 0x48(r3) - cmplwi r0, 0 - mr r31, r0 - beq- .loc_0x3C - mr r3, r31 - bl -0x85948 - addi r3, r30, 0xC - addi r4, r31, 0 - bl -0x8598C - - .loc_0x3C: - mr r3, r31 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - lwz r30, 0x10(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + BaseInf* inf = static_cast(mFreeList.mChild); + if (inf) { + inf->del(); + mActiveList.add(inf); + } + return inf; } /* @@ -867,29 +406,10 @@ void MonoInfMgr::getFreeInf() * Address: 800C5F84 * Size: 000048 */ -void MonoInfMgr::delInf(BaseInf*) +void MonoInfMgr::delInf(BaseInf* inf) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - addi r31, r4, 0 - stw r30, 0x10(r1) - addi r30, r3, 0 - addi r3, r31, 0 - bl -0x85994 - addi r3, r30, 0x38 - addi r4, r31, 0 - bl -0x859D8 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - lwz r30, 0x10(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + inf->del(); + mFreeList.add(inf); } /* @@ -897,42 +417,14 @@ void MonoInfMgr::delInf(BaseInf*) * Address: 800C5FCC * Size: 000024 */ -void MonoInfMgr::getActiveNum() -{ - /* - .loc_0x0: - mflr r0 - addi r3, r3, 0xC - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - bl -0x8595C - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} +int MonoInfMgr::getActiveNum() { return mActiveList.getChildCount(); } /* * --INFO-- * Address: 800C5FF0 * Size: 000024 */ -void MonoInfMgr::getFreeNum() -{ - /* - .loc_0x0: - mflr r0 - addi r3, r3, 0x38 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - bl -0x85980 - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} +int MonoInfMgr::getFreeNum() { mFreeList.getChildCount(); } /* * --INFO-- @@ -1018,65 +510,7 @@ void MonoInfMgr::loadCard(RandomAccessStream&) * Address: 800C60D8 * Size: 0000CC */ -void BPikiInfMgr::newInf() -{ - /* - .loc_0x0: - mflr r0 - li r3, 0x30 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - bl -0x7F0E8 - addi r31, r3, 0 - mr. r3, r31 - beq- .loc_0xB4 - lis r4, 0x802C - subi r4, r4, 0x7DC4 - bl -0x9114C - lis r3, 0x802C - subi r0, r3, 0x7C18 - stw r0, 0x0(r31) - lis r3, 0x802C - li r5, 0 - lfs f0, -0x6A58(r2) - subi r4, r13, 0x4320 - subi r0, r3, 0x7C38 - stfs f0, 0x1C(r31) - stfs f0, 0x18(r31) - stfs f0, 0x14(r31) - stfs f0, 0x28(r31) - stfs f0, 0x24(r31) - stfs f0, 0x20(r31) - stw r5, 0x10(r31) - stw r5, 0xC(r31) - stw r5, 0x8(r31) - stw r4, 0x4(r31) - lfs f0, -0x4338(r13) - stfs f0, 0x14(r31) - lfs f0, -0x4334(r13) - stfs f0, 0x18(r31) - lfs f0, -0x4330(r13) - stfs f0, 0x1C(r31) - lfs f0, -0x432C(r13) - stfs f0, 0x20(r31) - lfs f0, -0x4328(r13) - stfs f0, 0x24(r31) - lfs f0, -0x4324(r13) - stfs f0, 0x28(r31) - stw r0, 0x0(r31) - stb r5, 0x2D(r31) - stb r5, 0x2C(r31) - - .loc_0xB4: - mr r3, r31 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ -} +BPikiInf* BPikiInfMgr::newInf() { return new BPikiInf(); } /* * --INFO-- @@ -1093,28 +527,17 @@ void BPikiInfMgr::initGame() * Address: 800C61A4 * Size: 00002C */ -void BPikiInfMgr::getPikiCount(int) +int BPikiInfMgr::getPikiCount(int color) { - /* - .loc_0x0: - lwz r5, 0x1C(r3) - li r3, 0 - b .loc_0x20 - - .loc_0xC: - lbz r0, 0x2C(r5) - cmpw r0, r4 - bne- .loc_0x1C - addi r3, r3, 0x1 - - .loc_0x1C: - lwz r5, 0xC(r5) + int count = 0; + FOREACH_NODE(BPikiInf, mActiveList.mChild, currInf) + { + if (currInf->mPikiColor == color) { + count++; + } + } - .loc_0x20: - cmplwi r5, 0 - bne+ .loc_0xC - blr - */ + return count; } /* @@ -1132,7 +555,7 @@ void CreatureInfMgr::beginRegister(int) * Address: ........ * Size: 000038 */ -void CreatureInfMgr::registerType(int, CreatureInf* (*)(Creature*), Creature* (*)(CreatureInf*)) +void CreatureInfMgr::registerType(int, InfFuncType1, InfFuncType2) { // UNUSED FUNCTION } @@ -1174,6 +597,8 @@ void CreatureInfMgr::getRestoreFun(int) */ CreatureInf::CreatureInf() { + mObjType = OBJTYPE_INVALID; + _30 = _34 = 0; // UNUSED FUNCTION } @@ -1182,75 +607,19 @@ CreatureInf::CreatureInf() * Address: 800C61D0 * Size: 0000D4 */ -void CreatureInfMgr::newInf() -{ - /* - .loc_0x0: - mflr r0 - li r3, 0x4C - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - bl -0x7F1E0 - addi r31, r3, 0 - mr. r3, r31 - beq- .loc_0xBC - lis r4, 0x802C - subi r4, r4, 0x7DC4 - bl -0x91244 - lis r3, 0x802C - subi r0, r3, 0x7C18 - stw r0, 0x0(r31) - lis r3, 0x802C - li r5, 0 - lfs f0, -0x6A58(r2) - subi r4, r13, 0x4320 - subi r3, r3, 0x7D58 - stfs f0, 0x1C(r31) - li r0, -0x1 - stfs f0, 0x18(r31) - stfs f0, 0x14(r31) - stfs f0, 0x28(r31) - stfs f0, 0x24(r31) - stfs f0, 0x20(r31) - stw r5, 0x10(r31) - stw r5, 0xC(r31) - stw r5, 0x8(r31) - stw r4, 0x4(r31) - lfs f0, -0x4338(r13) - stfs f0, 0x14(r31) - lfs f0, -0x4334(r13) - stfs f0, 0x18(r31) - lfs f0, -0x4330(r13) - stfs f0, 0x1C(r31) - lfs f0, -0x432C(r13) - stfs f0, 0x20(r31) - lfs f0, -0x4328(r13) - stfs f0, 0x24(r31) - lfs f0, -0x4324(r13) - stfs f0, 0x28(r31) - stw r3, 0x0(r31) - stw r0, 0x2C(r31) - stw r5, 0x34(r31) - stw r5, 0x30(r31) - - .loc_0xBC: - mr r3, r31 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ -} +CreatureInf* CreatureInfMgr::newInf() { return new CreatureInf(); } /* * --INFO-- * Address: 800C62A4 * Size: 0000E0 */ -void CreatureInf::doStore(Creature*) +void CreatureInf::doStore(Creature* owner) { + mObjType = owner->mObjType; + // something + owner->doStore(this); + // more something /* .loc_0x0: mflr r0 @@ -1511,13 +880,6 @@ void StageInf::loadCard(RandomAccessStream&) */ } -/* - * --INFO-- - * Address: 800C6520 - * Size: 000004 - */ -void InfMgr::init(int) { } - /* * --INFO-- * Address: 800C6524 diff --git a/src/plugPikiKando/pikiMgr.cpp b/src/plugPikiKando/pikiMgr.cpp index a2a2fed8..b71b937f 100644 --- a/src/plugPikiKando/pikiMgr.cpp +++ b/src/plugPikiKando/pikiMgr.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "PikiMgr.h" +#include "sysNew.h" /* * --INFO-- @@ -25,7 +26,7 @@ static void _Print(char*, ...) * Address: 800CDCD0 * Size: 0000BC */ -void PikiMgr::birth() +Creature* PikiMgr::birth() { /* .loc_0x0: @@ -104,8 +105,10 @@ void PikiMgr::getFormationPikis() * Address: 800CDD8C * Size: 000258 */ -PikiMgr::PikiMgr(Navi*) +PikiMgr::PikiMgr(Navi* navi) { + mNavi = navi; + mParms = new PikiProp(); /* .loc_0x0: mflr r0 @@ -1168,7 +1171,7 @@ void PikiMgr::init() * Address: 800CED8C * Size: 00007C */ -void PikiMgr::createObject() +ViewPiki* PikiMgr::createObject() { /* .loc_0x0: @@ -1454,74 +1457,4 @@ void PikiMgr::dumpAll() * Address: 800CF054 * Size: 000084 */ -PikiMgr::~PikiMgr() -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr. r31, r3 - beq- .loc_0x6C - lis r3, 0x802C - subi r3, r3, 0x746C - stw r3, 0x0(r31) - addi r0, r3, 0x18 - stw r0, 0x8(r31) - beq- .loc_0x5C - lis r3, 0x802C - subi r3, r3, 0x5038 - stw r3, 0x0(r31) - addi r0, r3, 0x18 - stw r0, 0x8(r31) - beq- .loc_0x5C - lis r3, 0x802C - subi r3, r3, 0x4F80 - stw r3, 0x0(r31) - addi r0, r3, 0x18 - stw r0, 0x8(r31) - - .loc_0x5C: - extsh. r0, r4 - ble- .loc_0x6C - mr r3, r31 - bl -0x87F10 - - .loc_0x6C: - mr r3, r31 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ -} - -/* - * --INFO-- - * Address: 800CF0D8 - * Size: 000008 - */ -void PikiMgr::@8 @read(RandomAccessStream&) -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x294 - */ -} - -/* - * --INFO-- - * Address: 800CF0E0 - * Size: 000008 - */ -void PikiMgr::@8 @update() -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x2DC - */ -} +PikiMgr::~PikiMgr() { } diff --git a/src/plugPikiKando/pikiheadItem.cpp b/src/plugPikiKando/pikiheadItem.cpp index 68b4b352..574b927c 100644 --- a/src/plugPikiKando/pikiheadItem.cpp +++ b/src/plugPikiKando/pikiheadItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PikiHeadItem.h" /* * --INFO-- @@ -172,14 +172,14 @@ void PikiHeadItem::canPullout() * Address: 800EC624 * Size: 000008 */ -u32 PikiHeadItem::isVisible() { return 0x1; } +bool PikiHeadItem::isVisible() { return true; } /* * --INFO-- * Address: 800EC62C * Size: 000068 */ -void PikiHeadItem::needShadow() +bool PikiHeadItem::needShadow() { /* .loc_0x0: @@ -227,14 +227,15 @@ void PikiHeadItem::needShadow() * Address: 800EC694 * Size: 000008 */ -u32 PikiHeadItem::isAlive() { return 0x1; } +bool PikiHeadItem::isAlive() { return true; } /* * --INFO-- * Address: 800EC69C * Size: 00018C */ -PikiHeadItem::PikiHeadItem(CreatureProp*, ItemShapeObject*, SimpleAI*) +PikiHeadItem::PikiHeadItem(CreatureProp* props, ItemShapeObject*, SimpleAI*) + : ItemCreature(0, props, nullptr) { /* .loc_0x0: @@ -543,7 +544,7 @@ void PikiHeadItem::doKill() * Address: 800ECA90 * Size: 000008 */ -void PikiHeadItem::getSize() +f32 PikiHeadItem::getSize() { /* .loc_0x0: @@ -557,7 +558,7 @@ void PikiHeadItem::getSize() * Address: 800ECA98 * Size: 000008 */ -void PikiHeadItem::getiMass() +f32 PikiHeadItem::getiMass() { /* .loc_0x0: @@ -574,7 +575,7 @@ void PikiHeadItem::getiMass() void PikiHeadItem::setColor(int a1) { // Generated from stw r4, 0x3CC(r3) - _3CC = a1; + // _3CC = a1; } /* @@ -1119,4 +1120,4 @@ void PikiHeadItem::interactSwallow(InteractSwallow&) * Address: 800ED1FC * Size: 000008 */ -u32 PikiHeadItem::isAtari() { return 0x0; } +bool PikiHeadItem::isAtari() { return false; } diff --git a/src/plugPikiKando/searchSystem.cpp b/src/plugPikiKando/searchSystem.cpp index 91124035..31bcc37e 100644 --- a/src/plugPikiKando/searchSystem.cpp +++ b/src/plugPikiKando/searchSystem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "SearchSystem.h" /* * --INFO-- @@ -1598,7 +1598,7 @@ void SearchBuffer::update() * Address: 800E42E0 * Size: 00002C */ -void SearchBuffer::getCreature(int) +Creature* SearchBuffer::getCreature(int) { /* .loc_0x0: @@ -1625,14 +1625,14 @@ void SearchBuffer::getCreature(int) * Address: 800E430C * Size: 000008 */ -u32 SearchBuffer::getFirst() { return 0x0; } +int SearchBuffer::getFirst() { return 0; } /* * --INFO-- * Address: 800E4314 * Size: 000008 */ -void SearchBuffer::getNext(int) +int SearchBuffer::getNext(int) { /* .loc_0x0: @@ -1646,7 +1646,7 @@ void SearchBuffer::getNext(int) * Address: 800E431C * Size: 00001C */ -void SearchBuffer::isDone(int) +bool SearchBuffer::isDone(int) { /* .loc_0x0: diff --git a/src/plugPikiKando/seedItem.cpp b/src/plugPikiKando/seedItem.cpp index 705d2b7b..38c16469 100644 --- a/src/plugPikiKando/seedItem.cpp +++ b/src/plugPikiKando/seedItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "SeedItem.h" /* * --INFO-- @@ -25,7 +25,8 @@ static void _Print(char*, ...) * Address: 800EDDD0 * Size: 0000DC */ -SeedItem::SeedItem(CreatureProp*, Shape**) +SeedItem::SeedItem(CreatureProp* props, Shape**) + : Creature(props) { /* .loc_0x0: @@ -92,7 +93,7 @@ SeedItem::SeedItem(CreatureProp*, Shape**) * Address: 800EDEAC * Size: 000008 */ -void SeedItem::getSize() +f32 SeedItem::getSize() { /* .loc_0x0: @@ -155,7 +156,7 @@ void SeedItem::startSown() * Address: 800EDEF8 * Size: 000014 */ -void SeedItem::isVisible() +bool SeedItem::isVisible() { /* .loc_0x0: @@ -172,7 +173,7 @@ void SeedItem::isVisible() * Address: 800EDF0C * Size: 000008 */ -u32 SeedItem::isAtari() { return 0x0; } +bool SeedItem::isAtari() { return false; } /* * --INFO-- @@ -510,7 +511,7 @@ void SeedItem::stimulate(Interaction&) * Address: 800EE310 * Size: 000008 */ -void SeedItem::getHeight() +f32 SeedItem::getHeight() { /* .loc_0x0: @@ -524,7 +525,7 @@ void SeedItem::getHeight() * Address: 800EE318 * Size: 000008 */ -void SeedItem::getiMass() +f32 SeedItem::getiMass() { /* .loc_0x0: diff --git a/src/plugPikiKando/ufoAnim.cpp b/src/plugPikiKando/ufoAnim.cpp index 67c923b8..5d09197d 100644 --- a/src/plugPikiKando/ufoAnim.cpp +++ b/src/plugPikiKando/ufoAnim.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "UfoItem.h" +#include "sysNew.h" +#include "Shape.h" /* * --INFO-- @@ -25,8 +27,22 @@ static void _Print(char*, ...) * Address: 800E97AC * Size: 000158 */ -UfoShapeObject::UfoShapeObject(Shape*) +UfoShapeObject::UfoShapeObject(Shape* shape) { + mAnimContexts = new AnimContext[8]; + mShape = shape; + char* path = "objects/ufo/ufo0705.bin"; + mAnimMgr = new AnimMgr(shape, path, 0x8000, nullptr); + mAnimMgr->setName("ufo shape"); + + mShape->overrideAnim(0, &mAnimContexts[0]); + mShape->overrideAnim(38, &mAnimContexts[1]); + mShape->overrideAnim(36, &mAnimContexts[2]); + mShape->overrideAnim(19, &mAnimContexts[3]); + mShape->overrideAnim(32, &mAnimContexts[4]); + mShape->overrideAnim(37, &mAnimContexts[5]); + mShape->overrideAnim(29, &mAnimContexts[6]); + mShape->overrideAnim(53, &mAnimContexts[7]); /* .loc_0x0: mflr r0 @@ -120,34 +136,12 @@ UfoShapeObject::UfoShapeObject(Shape*) */ } -/* - * --INFO-- - * Address: 800E9904 - * Size: 000028 - */ -AnimContext::AnimContext() -{ - /* - .loc_0x0: - lis r4, 0x8023 - subi r0, r4, 0x7730 - stw r0, 0xC(r3) - li r0, 0 - stw r0, 0x0(r3) - lfs f0, -0x65F0(r2) - stfs f0, 0x4(r3) - lfs f0, -0x65EC(r2) - stfs f0, 0x8(r3) - blr - */ -} - /* * --INFO-- * Address: 800E992C * Size: 0002B0 */ -void PaniUfoAnimator::createMotionTable() +PaniMotionTable* PaniUfoAnimator::createMotionTable() { /* .loc_0x0: diff --git a/src/plugPikiKando/weedsItem.cpp b/src/plugPikiKando/weedsItem.cpp index 33b5b2dc..4d49d258 100644 --- a/src/plugPikiKando/weedsItem.cpp +++ b/src/plugPikiKando/weedsItem.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "WeedsItem.h" /* * --INFO-- @@ -495,7 +495,8 @@ void GrassGen::resolve() * Address: 800E4BD4 * Size: 0000A0 */ -RockGen::RockGen(Shape*, CreatureProp*) +RockGen::RockGen(Shape* shape, CreatureProp* props) + : ItemCreature(0, props, shape) { /* .loc_0x0: @@ -1030,7 +1031,7 @@ void RockGen::refresh(Graphics&) * Address: 800E5200 * Size: 000008 */ -void RockGen::getSize() +f32 RockGen::getSize() { /* .loc_0x0: @@ -1124,7 +1125,8 @@ void RockGen::getRandomPebble() * Address: 800E52E8 * Size: 0000A0 */ -GrassGen::GrassGen(Shape*, CreatureProp*) +GrassGen::GrassGen(Shape* shape, CreatureProp* props) + : ItemCreature(0, props, shape) { /* .loc_0x0: @@ -1552,7 +1554,7 @@ void GrassGen::refresh(Graphics&) * Address: 800E5808 * Size: 000008 */ -void GrassGen::getSize() +f32 GrassGen::getSize() { /* .loc_0x0: @@ -1646,7 +1648,8 @@ void GrassGen::getRandomGrass() * Address: ........ * Size: 000078 */ -WeedsGen::WeedsGen(Shape*, CreatureProp*) +WeedsGen::WeedsGen(Shape* shape, CreatureProp* props) + : ItemCreature(0, props, shape) { // UNUSED FUNCTION } @@ -1804,6 +1807,7 @@ void WeedsGen::startAI(int) * Size: 000064 */ Weed::Weed() + : ItemCreature(0, nullptr, nullptr) { // UNUSED FUNCTION } @@ -2038,7 +2042,7 @@ void Weed::refresh(Graphics&) * Address: 800E5D58 * Size: 000014 */ -void Weed::isVisible() +bool Weed::isVisible() { /* .loc_0x0: @@ -2055,14 +2059,14 @@ void Weed::isVisible() * Address: 800E5D6C * Size: 000008 */ -u32 Weed::isAlive() { return 0x1; } +bool Weed::isAlive() { return true; } /* * --INFO-- * Address: 800E5D74 * Size: 000014 */ -void Weed::isAtari() +bool Weed::isAtari() { /* .loc_0x0: @@ -2079,14 +2083,14 @@ void Weed::isAtari() * Address: 800E5D88 * Size: 000008 */ -u32 Weed::needFlick(Creature*) { return 0x0; } +bool Weed::needFlick(Creature*) { return false; } /* * --INFO-- * Address: 800E5D90 * Size: 000014 */ -void GrassGen::isAlive() +bool GrassGen::isAlive() { /* .loc_0x0: @@ -2103,21 +2107,21 @@ void GrassGen::isAlive() * Address: 800E5DA4 * Size: 000008 */ -u32 GrassGen::isVisible() { return 0x1; } +bool GrassGen::isVisible() { return true; } /* * --INFO-- * Address: 800E5DAC * Size: 000008 */ -u32 GrassGen::needFlick(Creature*) { return 0x0; } +bool GrassGen::needFlick(Creature*) { return false; } /* * --INFO-- * Address: 800E5DB4 * Size: 000014 */ -void RockGen::isAlive() +bool RockGen::isAlive() { /* .loc_0x0: @@ -2134,11 +2138,11 @@ void RockGen::isAlive() * Address: 800E5DC8 * Size: 000008 */ -u32 RockGen::isVisible() { return 0x1; } +bool RockGen::isVisible() { return true; } /* * --INFO-- * Address: 800E5DD0 * Size: 000008 */ -u32 RockGen::needFlick(Creature*) { return 0x0; } +bool RockGen::needFlick(Creature*) { return false; } diff --git a/src/plugPikiNakata/genteki.cpp b/src/plugPikiNakata/genteki.cpp index 70d94efd..dbf21d4e 100644 --- a/src/plugPikiNakata/genteki.cpp +++ b/src/plugPikiNakata/genteki.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Generator.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 8011B2CC * Size: 000040 */ -void makeObjectTeki() +static void makeObjectTeki() { /* .loc_0x0: @@ -102,6 +102,7 @@ void GenObjectTeki::initialise() * Size: 00008C */ GenObjectTeki::GenObjectTeki() + : GenObject('teki', "") { /* .loc_0x0: @@ -283,7 +284,7 @@ void GenObjectTeki::updateUseList(Generator*, int) * Address: 8011B58C * Size: 000120 */ -void GenObjectTeki::birth(BirthInfo&) +void* GenObjectTeki::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiNakata/panianimator.cpp b/src/plugPikiNakata/panianimator.cpp index 4459f742..1edb1c0f 100644 --- a/src/plugPikiNakata/panianimator.cpp +++ b/src/plugPikiNakata/panianimator.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniAnimator.h" /* * --INFO-- @@ -302,7 +302,7 @@ void PaniAnimator::init(AnimContext*, AnimMgr*, PaniMotionTable*) void PaniAnimator::changeContext(AnimContext* a1) { // Generated from stw r4, 0x4(r3) - _04 = a1; + // _04 = a1; } /* diff --git a/src/plugPikiNakata/panipikianimmgr.cpp b/src/plugPikiNakata/panipikianimmgr.cpp index 0d5698c2..85ede0db 100644 --- a/src/plugPikiNakata/panipikianimmgr.cpp +++ b/src/plugPikiNakata/panipikianimmgr.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniAnimator.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: ........ * Size: 000034 */ -void PaniPikiAnimMgr::getMotionTable() +PaniMotionTable* PaniPikiAnimMgr::getMotionTable() { // UNUSED FUNCTION } diff --git a/src/plugPikiNakata/panitekianimator.cpp b/src/plugPikiNakata/panitekianimator.cpp index 55205339..f1f6cc51 100644 --- a/src/plugPikiNakata/panitekianimator.cpp +++ b/src/plugPikiNakata/panitekianimator.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniAnimator.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 8011FC54 * Size: 000268 */ -void PaniTekiAnimator::createMotionTable() +PaniMotionTable* PaniTekiAnimator::createMotionTable() { /* .loc_0x0: diff --git a/src/plugPikiNakata/panitestsection.cpp b/src/plugPikiNakata/panitestsection.cpp index 56f51ae2..d865dd93 100644 --- a/src/plugPikiNakata/panitestsection.cpp +++ b/src/plugPikiNakata/panitestsection.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "PaniTestSection.h" /* * --INFO-- @@ -1772,17 +1772,3 @@ void PaniTestSection::init() blr */ } - -/* - * --INFO-- - * Address: 8012159C - * Size: 000008 - */ -void PaniTestNode::@32 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - subi r3, r3, 0x20 - b -0x7D4 - */ -} diff --git a/src/plugPikiNakata/teki.cpp b/src/plugPikiNakata/teki.cpp index a1a13de7..ae1ae473 100644 --- a/src/plugPikiNakata/teki.cpp +++ b/src/plugPikiNakata/teki.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "teki.h" /* * --INFO-- @@ -130,7 +130,7 @@ void YTeki::init(int) void BTeki::setTekiOptions(int a1) { // Generated from stw r4, 0x410(r3) - _410 = a1; + // _410 = a1; } /* @@ -141,7 +141,7 @@ void BTeki::setTekiOptions(int a1) void BTeki::clearTekiOptions() { // Generated from stw r0, 0x410(r3) - _410 = 0; + // _410 = 0; } /* @@ -184,7 +184,7 @@ void BTeki::clearAnimationKeyOption(int) void BTeki::setAnimationKeyOptions(int a1) { // Generated from stw r4, 0x414(r3) - _414 = a1; + // _414 = a1; } /* @@ -195,7 +195,7 @@ void BTeki::setAnimationKeyOptions(int a1) void BTeki::clearAnimationKeyOptions() { // Generated from stw r0, 0x414(r3) - _414 = 0; + // _414 = 0; } /* @@ -203,7 +203,7 @@ void BTeki::clearAnimationKeyOptions() * Address: 80143D48 * Size: 000018 */ -void BTeki::getShadowSize() +f32 BTeki::getShadowSize() { /* .loc_0x0: @@ -221,7 +221,7 @@ void BTeki::getShadowSize() * Address: 80143D60 * Size: 00001C */ -void BTeki::isVisible() +bool BTeki::isVisible() { /* .loc_0x0: @@ -240,7 +240,7 @@ void BTeki::isVisible() * Address: 80143D7C * Size: 00001C */ -void BTeki::isOrganic() +bool BTeki::isOrganic() { /* .loc_0x0: @@ -259,7 +259,7 @@ void BTeki::isOrganic() * Address: 80143D98 * Size: 00001C */ -void BTeki::isAtari() +bool BTeki::isAtari() { /* .loc_0x0: @@ -278,7 +278,7 @@ void BTeki::isAtari() * Address: 80143DB4 * Size: 00001C */ -void BTeki::isAlive() +bool BTeki::isAlive() { /* .loc_0x0: @@ -297,7 +297,7 @@ void BTeki::isAlive() * Address: 80143DD0 * Size: 00001C */ -void BTeki::needShadow() +bool BTeki::needShadow() { /* .loc_0x0: @@ -310,146 +310,3 @@ void BTeki::needShadow() blr */ } - -/* - * --INFO-- - * Address: 80143DEC - * Size: 000014 - */ -void BTeki::@1336 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x538 - b 0x13E4 - */ -} - -/* - * --INFO-- - * Address: 80143E00 - * Size: 000008 - */ -void BTeki::@696 @viewGetScale() -{ - /* - .loc_0x0: - subi r4, r4, 0x2B8 - b 0x23C - */ -} - -/* - * --INFO-- - * Address: 80143E08 - * Size: 000008 - */ -void BTeki::@696 @viewGetHeight() -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x268 - */ -} - -/* - * --INFO-- - * Address: 80143E10 - * Size: 000008 - */ -void BTeki::@696 @viewGetBottomRadius() -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x248 - */ -} - -/* - * --INFO-- - * Address: 80143E18 - * Size: 000008 - */ -void BTeki::@696 @viewDoAnimation() -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x1AC - */ -} - -/* - * --INFO-- - * Address: 80143E20 - * Size: 000008 - */ -void BTeki::@696 @viewFinishMotion() -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x1D0 - */ -} - -/* - * --INFO-- - * Address: 80143E28 - * Size: 000008 - */ -void BTeki::@696 @viewSetMotionSpeed(f32) -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x194 - */ -} - -/* - * --INFO-- - * Address: 80143E30 - * Size: 000008 - */ -void BTeki::@696 @viewStartTrembleMotion(f32) -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x128 - */ -} - -/* - * --INFO-- - * Address: 80143E38 - * Size: 000008 - */ -void BTeki::@696 @viewDraw(Graphics&, Matrix4f&) -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x250 - */ -} - -/* - * --INFO-- - * Address: 80143E40 - * Size: 000008 - */ -void BTeki::@696 @viewKill() -{ - /* - .loc_0x0: - subi r3, r3, 0x2B8 - b 0x2EC - */ -} diff --git a/src/plugPikiNakata/tekianimationmanager.cpp b/src/plugPikiNakata/tekianimationmanager.cpp index a1585d63..1051d198 100644 --- a/src/plugPikiNakata/tekianimationmanager.cpp +++ b/src/plugPikiNakata/tekianimationmanager.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "TekiAnimationManager.h" /* * --INFO-- diff --git a/src/plugPikiNakata/tekibteki.cpp b/src/plugPikiNakata/tekibteki.cpp index b70e0ece..d1f61f15 100644 --- a/src/plugPikiNakata/tekibteki.cpp +++ b/src/plugPikiNakata/tekibteki.cpp @@ -392,7 +392,7 @@ void BTeki::calcCircleDistanceStatic(Vector3f&, f32, Vector3f&, f32) * Address: 8014427C * Size: 000014 */ -void BTeki::alwaysUpdatePlatform() +bool BTeki::alwaysUpdatePlatform() { /* .loc_0x0: diff --git a/src/plugPikiNakata/tekiinteraction.cpp b/src/plugPikiNakata/tekiinteraction.cpp index fabae132..6279f91f 100644 --- a/src/plugPikiNakata/tekiinteraction.cpp +++ b/src/plugPikiNakata/tekiinteraction.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Interactions.h" +#include "teki.h" /* * --INFO-- @@ -35,7 +36,7 @@ TekiInteractionKey::TekiInteractionKey(int, Interaction*) * Address: 8014A40C * Size: 000044 */ -void InteractAttack::actTeki(Teki*) +bool InteractAttack::actTeki(Teki*) { /* .loc_0x0: @@ -64,7 +65,7 @@ void InteractAttack::actTeki(Teki*) * Address: 8014A450 * Size: 000090 */ -void InteractBomb::actTeki(Teki*) +bool InteractBomb::actTeki(Teki*) { /* .loc_0x0: @@ -112,7 +113,7 @@ void InteractBomb::actTeki(Teki*) * Address: 8014A4E0 * Size: 000044 */ -void InteractHitEffect::actTeki(Teki*) +bool InteractHitEffect::actTeki(Teki*) { /* .loc_0x0: @@ -141,14 +142,14 @@ void InteractHitEffect::actTeki(Teki*) * Address: 8014A524 * Size: 000008 */ -u32 InteractSwallow::actTeki(Teki*) { return 0x1; } +bool InteractSwallow::actTeki(Teki*) { return true; } /* * --INFO-- * Address: 8014A52C * Size: 000058 */ -void InteractPress::actTeki(Teki*) +bool InteractPress::actTeki(Teki*) { /* .loc_0x0: @@ -182,4 +183,4 @@ void InteractPress::actTeki(Teki*) * Address: 8014A584 * Size: 000008 */ -u32 InteractFlick::actTeki(Teki*) { return 0x1; } +bool InteractFlick::actTeki(Teki*) { return true; } diff --git a/src/plugPikiNakata/tekimgr.cpp b/src/plugPikiNakata/tekimgr.cpp index 6c387cb4..335c1b98 100644 --- a/src/plugPikiNakata/tekimgr.cpp +++ b/src/plugPikiNakata/tekimgr.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "teki.h" /* * --INFO-- @@ -639,7 +639,7 @@ void TekiMgr::reset() * Address: 8014ACD4 * Size: 000044 */ -void TekiMgr::createObject() +Teki* TekiMgr::createObject() { /* .loc_0x0: @@ -969,7 +969,7 @@ void TekiMgr::setVisibleType(int, bool) * Address: 8014AFD4 * Size: 000070 */ -void TekiMgr::hasModel(int) +bool TekiMgr::hasModel(int) { /* .loc_0x0: @@ -1101,17 +1101,3 @@ TekiMgr::~TekiMgr() blr */ } - -/* - * --INFO-- - * Address: 8014B11C - * Size: 000008 - */ -void TekiMgr::@8 @update() -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x698 - */ -} diff --git a/src/plugPikiNakata/tekinakata.cpp b/src/plugPikiNakata/tekinakata.cpp index ab47b560..1f1fe96c 100644 --- a/src/plugPikiNakata/tekinakata.cpp +++ b/src/plugPikiNakata/tekinakata.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "teki.h" /* * --INFO-- @@ -20,12 +20,14 @@ static void _Print(char*, ...) // UNUSED FUNCTION } +namespace TekiNakata { + /* * --INFO-- * Address: 8014B124 * Size: 000244 */ -void TekiNakata::makeTekiParameters(TekiMgr*) +void makeTekiParameters(TekiMgr*) { /* .loc_0x0: @@ -220,7 +222,7 @@ void TekiNakata::makeTekiParameters(TekiMgr*) * Address: 8014B368 * Size: 000690 */ -void TekiNakata::makeTekis(TekiMgr*) +void makeTekis(TekiMgr*) { /* .loc_0x0: @@ -758,3 +760,4 @@ void TekiNakata::makeTekis(TekiMgr*) blr */ } +} // namespace TekiNakata diff --git a/src/plugPikiNakata/tekinteki.cpp b/src/plugPikiNakata/tekinteki.cpp index 5b8b52ec..4f7571d7 100644 --- a/src/plugPikiNakata/tekinteki.cpp +++ b/src/plugPikiNakata/tekinteki.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "teki.h" /* * --INFO-- @@ -300,20 +300,3 @@ void NTeki::receiveMessage(TekiMessage&) blr */ } - -/* - * --INFO-- - * Address: 8014BD34 - * Size: 000014 - */ -void BTeki::@1132 @4 @animationKeyUpdated(PaniAnimKeyEvent&) -{ - /* - .loc_0x0: - li r11, 0x4 - lwzx r11, r3, r11 - add r3, r3, r11 - subi r3, r3, 0x46C - b -0x6B64 - */ -} diff --git a/src/plugPikiNakata/tekiparameters.cpp b/src/plugPikiNakata/tekiparameters.cpp index 47dfb18d..12ce01b2 100644 --- a/src/plugPikiNakata/tekiparameters.cpp +++ b/src/plugPikiNakata/tekiparameters.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "TekiParameters.h" /* * --INFO-- diff --git a/src/plugPikiNakata/tekipersonality.cpp b/src/plugPikiNakata/tekipersonality.cpp index cebf593d..8221ad38 100644 --- a/src/plugPikiNakata/tekipersonality.cpp +++ b/src/plugPikiNakata/tekipersonality.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "TekiPersonality.h" /* * --INFO-- diff --git a/src/plugPikiNishimura/Boss.cpp b/src/plugPikiNishimura/Boss.cpp index 693b12f2..8b0829f1 100644 --- a/src/plugPikiNishimura/Boss.cpp +++ b/src/plugPikiNishimura/Boss.cpp @@ -2868,7 +2868,7 @@ bool Boss::needShadow() * Address: 8014FA08 * Size: 000008 */ -void Boss::getShadowSize() +f32 Boss::getShadowSize() { /* .loc_0x0: diff --git a/src/plugPikiNishimura/BossAnimMgr.cpp b/src/plugPikiNishimura/BossAnimMgr.cpp index 1037abf9..1ae2a06d 100644 --- a/src/plugPikiNishimura/BossAnimMgr.cpp +++ b/src/plugPikiNishimura/BossAnimMgr.cpp @@ -1,72 +1,36 @@ -#include "types.h" +#include "Boss.h" +#include "Dolphin/os.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -/* -static void _Error(char *, ...) + +static void _Error(char* fmt, ...) { - // UNUSED FUNCTION + OSPanic(__FILE__, __LINE__, fmt, "BossAnimMgr"); + // UNUSED FUNCTION } -*/ + /* * --INFO-- * Address: ........ * Size: 0000F4 */ -/* -static void _Print(char *, ...) + +static void _Print(char*, ...) { - // UNUSED FUNCTION + // UNUSED FUNCTION } -*/ + /* * --INFO-- * Address: 8014FA68 * Size: 000094 */ -BossAnimationManager::BossAnimationManager(BossMgr*) +BossAnimationManager::BossAnimationManager(BossMgr* mgr) + : Node("BossAnimationManager") { - /* - .loc_0x0: - mflr r0 - lis r5, 0x8022 - stw r0, 0x4(r1) - addi r0, r5, 0x738C - li r6, 0 - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - addi r31, r4, 0 - stw r30, 0x10(r1) - addi r30, r3, 0 - lis r3, 0x8022 - stw r0, 0x0(r30) - addi r0, r3, 0x737C - lis r3, 0x802D - stw r0, 0x0(r30) - subi r5, r3, 0x1564 - lis r3, 0x8023 - stw r6, 0x10(r30) - subi r0, r3, 0x71E0 - addi r3, r30, 0 - stw r6, 0xC(r30) - mr r4, r5 - stw r6, 0x8(r30) - stw r5, 0x4(r30) - stw r0, 0x0(r30) - bl -0x10F390 - lis r3, 0x802D - subi r0, r3, 0x1504 - stw r0, 0x0(r30) - mr r3, r30 - stw r31, 0x20(r30) - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - lwz r30, 0x10(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + mBossMgr = mgr; } diff --git a/src/plugPikiNishimura/BossCnd.cpp b/src/plugPikiNishimura/BossCnd.cpp index 7fa6f379..accd152a 100644 --- a/src/plugPikiNishimura/BossCnd.cpp +++ b/src/plugPikiNishimura/BossCnd.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "BossConditions.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 8014FAFC * Size: 000040 */ -void CndIsAlive::satisfy(Creature*) +bool CndIsAlive::satisfy(Creature*) { /* .loc_0x0: @@ -57,7 +57,7 @@ void CndIsAlive::satisfy(Creature*) * Address: 8014FB3C * Size: 0000C8 */ -void CndBossFlick::satisfy(Creature*) +bool CndBossFlick::satisfy(Creature*) { /* .loc_0x0: @@ -123,7 +123,7 @@ void CndBossFlick::satisfy(Creature*) * Address: 8014FC04 * Size: 000070 */ -void CndStickBossKill::satisfy(Creature*) +bool CndStickBossKill::satisfy(Creature*) { /* .loc_0x0: @@ -167,7 +167,7 @@ void CndStickBossKill::satisfy(Creature*) * Address: 8014FC74 * Size: 00007C */ -void CndStickMouthKill::satisfy(Creature*) +bool CndStickMouthKill::satisfy(Creature*) { /* .loc_0x0: @@ -214,7 +214,7 @@ void CndStickMouthKill::satisfy(Creature*) * Address: 8014FCF0 * Size: 000098 */ -void CndBossCollKill::satisfy(Creature*) +bool CndBossCollKill::satisfy(Creature*) { /* .loc_0x0: diff --git a/src/plugPikiNishimura/BossMgr.cpp b/src/plugPikiNishimura/BossMgr.cpp index 25929991..0840510c 100644 --- a/src/plugPikiNishimura/BossMgr.cpp +++ b/src/plugPikiNishimura/BossMgr.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Boss.h" /* * --INFO-- @@ -25,7 +25,7 @@ static void _Print(char*, ...) * Address: 8014FD88 * Size: 00016C */ -void BossMgr::getCreature(int) +Creature* BossMgr::getCreature(int) { /* .loc_0x0: @@ -166,14 +166,14 @@ void BossMgr::getCreature(int) * Address: 8014FEF4 * Size: 000008 */ -u32 BossMgr::getFirst() { return 0x0; } +int BossMgr::getFirst() { return 0; } /* * --INFO-- * Address: 8014FEFC * Size: 000008 */ -void BossMgr::getNext(int) +int BossMgr::getNext(int) { /* .loc_0x0: @@ -187,7 +187,7 @@ void BossMgr::getNext(int) * Address: 8014FF04 * Size: 00004C */ -void BossMgr::isDone(int) +bool BossMgr::isDone(int) { /* .loc_0x0: @@ -222,7 +222,7 @@ void BossMgr::isDone(int) * Address: 8014FF50 * Size: 000080 */ -void BossMgr::getSize() +int BossMgr::getSize() { /* .loc_0x0: @@ -274,7 +274,7 @@ void BossMgr::getSize() * Address: 8014FFD0 * Size: 000080 */ -void BossMgr::getMax() +int BossMgr::getMax() { /* .loc_0x0: @@ -3382,7 +3382,7 @@ void BossMgr::refresh2d(Graphics&) void BossMgr::finalSetup() { // Generated from stb r0, 0x2C(r3) - _2C = 1; + // _2C = 1; } /* @@ -3443,17 +3443,3 @@ BossMgr::~BossMgr() blr */ } - -/* - * --INFO-- - * Address: 8015267C - * Size: 000008 - */ -void BossMgr::@8 @update() -{ - /* - .loc_0x0: - subi r3, r3, 0x8 - b -0x378 - */ -} diff --git a/src/plugPikiNishimura/HmRumbleMgr.cpp b/src/plugPikiNishimura/HmRumbleMgr.cpp index 9c9d570a..68355123 100644 --- a/src/plugPikiNishimura/HmRumbleMgr.cpp +++ b/src/plugPikiNishimura/HmRumbleMgr.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "RumbleMgr.h" + +RumbleMgr* rumbleMgr; /* * --INFO-- diff --git a/src/plugPikiNishimura/HmRumbleSample.cpp b/src/plugPikiNishimura/HmRumbleSample.cpp index 7634a53f..ade6f0f1 100644 --- a/src/plugPikiNishimura/HmRumbleSample.cpp +++ b/src/plugPikiNishimura/HmRumbleSample.cpp @@ -1,15 +1,16 @@ -#include "HmRumble.h" +#include "RumbleMgr.h" +#include "Dolphin/pad.h" /* * --INFO-- * Address: 8017D680 * Size: 000014 */ -RumbleSample::RumbleSample(int param_1) +RumbleSample::RumbleSample(int chan) { - _00 = 0.0f; - _04 = 0.0f; - _08 = param_1; + _00 = 0.0f; + _04 = 0.0f; + mChannel = chan; } /* @@ -17,17 +18,17 @@ RumbleSample::RumbleSample(int param_1) * Address: ........ * Size: 000010 */ -// void RumbleSample::init() -// { -// UNUSED FUNCTION -// } +void RumbleSample::init() +{ + // UNUSED FUNCTION +} /* * --INFO-- * Address: 8017D694 * Size: 000028 */ -void RumbleSample::simpleStop() { PADControlMotor(_08, 2); } +void RumbleSample::simpleStop() { PADStopMotorHard(mChannel); } /* * --INFO-- @@ -39,11 +40,13 @@ void RumbleSample::simpleStart(f32 param_1) _00 = param_1; _04 += _00; if (_00 <= 0.0f) { - PADControlMotor(_08, 2); + PADStopMotorHard(mChannel); + } else if (_04 < 1.0f) { - PADControlMotor(_08, 0); + PADStopMotor(mChannel); + } else { _04 -= 1.0f; - PADControlMotor(_08, 1); + PADStartMotor(mChannel); } } diff --git a/src/plugPikiNishimura/genBoss.cpp b/src/plugPikiNishimura/genBoss.cpp index e2b541a0..c917aebe 100644 --- a/src/plugPikiNishimura/genBoss.cpp +++ b/src/plugPikiNishimura/genBoss.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Generator.h" /* * --INFO-- @@ -465,7 +465,7 @@ void GenObjectBoss::updateUseList(Generator*, int) * Address: 8014D790 * Size: 00013C */ -void GenObjectBoss::birth(BirthInfo&) +void* GenObjectBoss::birth(BirthInfo&) { /* .loc_0x0: diff --git a/src/plugPikiOgawa/ogSub.cpp b/src/plugPikiOgawa/ogSub.cpp index e938d60d..1c27c39a 100644 --- a/src/plugPikiOgawa/ogSub.cpp +++ b/src/plugPikiOgawa/ogSub.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "zen/ogSub.h" /* * --INFO-- diff --git a/unsorted_include_todo/BPikiInf.h b/unsorted_include_todo/BPikiInf.h deleted file mode 100644 index 53bd16d7..00000000 --- a/unsorted_include_todo/BPikiInf.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _BPIKIINF_H -#define _BPIKIINF_H - -/** - * .obj __vt__8BPikiInf, global - * .4byte __RTTI__8BPikiInf - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte doStore__8BPikiInfFP8Creature - * .4byte doRestore__8BPikiInfFP8Creature - * .4byte saveCard__8BPikiInfFR18RandomAccessStream - * .4byte loadCard__8BPikiInfFR18RandomAccessStream - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -/** - * @brief TODO - */ -struct BPikiInf : public ANode, public CoreNode { - virtual void doStore(Creature*); // _10 - virtual void doRestore(Creature*); // _14 - virtual void saveCard(RandomAccessStream&); // _18 - virtual void loadCard(RandomAccessStream&); // _1C -}; - -#endif diff --git a/unsorted_include_todo/BPikiInfMgr.h b/unsorted_include_todo/BPikiInfMgr.h deleted file mode 100644 index 2ad4a649..00000000 --- a/unsorted_include_todo/BPikiInfMgr.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _BPIKIINFMGR_H -#define _BPIKIINFMGR_H - -/** - * .obj __vt__11BPikiInfMgr, global - * .4byte __RTTI__11BPikiInfMgr - * .4byte 0 - * .4byte init__10MonoInfMgrFi - * .4byte getFreeInf__10MonoInfMgrFv - * .4byte delInf__10MonoInfMgrFP7BaseInf - * .4byte getFreeNum__10MonoInfMgrFv - * .4byte getActiveNum__10MonoInfMgrFv - * .4byte newInf__11BPikiInfMgrFv - */ - -struct MonoInfMgr { - virtual void init(int); // _08 - virtual void getFreeInf(); // _0C - virtual void delInf(BaseInf*); // _10 - virtual void getFreeNum(); // _14 - virtual void getActiveNum(); // _18 -}; - -/** - * @brief TODO - */ -struct BPikiInfMgr : public MonoInfMgr { - virtual void newInf(); // _1C -}; - -#endif diff --git a/unsorted_include_todo/BaseInf.h b/unsorted_include_todo/BaseInf.h deleted file mode 100644 index 7ae0bc75..00000000 --- a/unsorted_include_todo/BaseInf.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _BASEINF_H -#define _BASEINF_H - -/** - * .obj __vt__7BaseInf, global - * .4byte __RTTI__7BaseInf - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte doStore__7BaseInfFP8Creature - * .4byte doRestore__7BaseInfFP8Creature - * .4byte saveCard__7BaseInfFR18RandomAccessStream - * .4byte loadCard__7BaseInfFR18RandomAccessStream - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -/** - * @brief TODO - */ -struct BaseInf : public ANode, public CoreNode { - virtual void doStore(Creature*); // _10 - virtual void doRestore(Creature*); // _14 - virtual void saveCard(RandomAccessStream&); // _18 - virtual void loadCard(RandomAccessStream&); // _1C -}; - -#endif diff --git a/unsorted_include_todo/BoBaseItem.h b/unsorted_include_todo/BoBaseItem.h deleted file mode 100644 index f30f715a..00000000 --- a/unsorted_include_todo/BoBaseItem.h +++ /dev/null @@ -1,359 +0,0 @@ -#ifndef _BOBASEITEM_H -#define _BOBASEITEM_H - -/** - * .obj __vt__10BoBaseItem, global - * .4byte __RTTI__10BoBaseItem - * .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__10BoBaseItemFi - * .4byte getiMass__10BoBaseItemFv - * .4byte getSize__10BoBaseItemFv - * .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__10BoBaseItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__10BoBaseItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__10BoBaseItemFP8Creature - * .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__10BoBaseItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__10BoBaseItemFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__10BoBaseItem - * .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__12ItemCreatureFv - */ - -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 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - 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 - 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 (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 _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 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 ignoreAtari(Creature*); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _84() = 0; // _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 _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 _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 BoBaseItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 - virtual void ignoreAtari(Creature*); // _98 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC -}; - -#endif diff --git a/unsorted_include_todo/BombGenItem.h b/unsorted_include_todo/BombGenItem.h deleted file mode 100644 index 02185a9b..00000000 --- a/unsorted_include_todo/BombGenItem.h +++ /dev/null @@ -1,414 +0,0 @@ -#ifndef _BOMBGENITEM_H -#define _BOMBGENITEM_H - -/** - * .obj __vt__11BombGenItem, weak - * .4byte __RTTI__11BombGenItem - * .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__11BombGenItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__11BombGenItemFv - * .4byte isAlive__11BombGenItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__10ItemObjectFv - * .4byte needFlick__11BombGenItemFP8Creature - * .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__10ItemObjectFv - * .4byte postUpdate__10ItemObjectFif - * .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__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__11BombGenItem - * .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__12ItemCreatureFv - */ - -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 - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void _90() = 0; // _90 - virtual void needFlick(Creature*); // _94 - 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 _E4() = 0; // _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 _10C() = 0; // _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 isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void needFlick(Creature*); // _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 _E0() = 0; // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -struct ItemObject { - 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 isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _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 postUpdate(int, float); // _E4 -}; - -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 isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void needFlick(Creature*); // _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 _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 BombGenItem : public RefCountable, public Creature, public ItemCreature, public ItemObject, public AICreature { - virtual void isVisible(); // _74 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void needFlick(Creature*); // _94 -}; - -#endif diff --git a/unsorted_include_todo/BombItem.h b/unsorted_include_todo/BombItem.h deleted file mode 100644 index 7b27c9e4..00000000 --- a/unsorted_include_todo/BombItem.h +++ /dev/null @@ -1,366 +0,0 @@ -#ifndef _BOMBITEM_H -#define _BOMBITEM_H - -/** - * .obj __vt__8BombItem, global - * .4byte __RTTI__8BombItem - * .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__8BombItemFi - * .4byte getiMass__8BombItemFv - * .4byte getSize__8BombItemFv - * .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__8BombItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8BombItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8BombItemFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__12ItemCreatureFR11Interaction - * .4byte sendMsg__8CreatureFP3Msg - * .4byte collisionCallback__8BombItemFR9CollEvent - * .4byte bounceCallback__10AICreatureFv - * .4byte jumpCallback__8CreatureFv - * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject - * .4byte offwallCallback__8CreatureFP13DynCollObject - * .4byte stickCallback__8CreatureFP8Creature - * .4byte offstickCallback__8CreatureFP8Creature - * .4byte stickToCallback__8CreatureFP8Creature - * .4byte dump__8BombItemFv - * .4byte startWaterEffect__8CreatureFv - * .4byte finishWaterEffect__8CreatureFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__8BombItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__8BombItemFR8Graphics - * .4byte refresh2d__8BombItemFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8BombItem - * .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__12ItemCreatureFv - * .4byte renderTimer__8BombItemFR8Graphics - * .4byte renderBlast__8BombItemFR8Graphics - */ - -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 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - 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 collisionCallback(CollEvent&); // _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 - 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 _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 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 needShadow(); // _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 _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 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 _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _84() = 0; // _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 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 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 _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 BombItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 - virtual void needShadow(); // _90 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void dump(); // _C8 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void refresh2d(Graphics&); // _F0 - virtual void renderTimer(Graphics&); // _15C - virtual void renderBlast(Graphics&); // _160 -}; - -#endif diff --git a/unsorted_include_todo/BombItemProp.h b/unsorted_include_todo/BombItemProp.h deleted file mode 100644 index c722fb45..00000000 --- a/unsorted_include_todo/BombItemProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _BOMBITEMPROP_H -#define _BOMBITEMPROP_H - -/** - * .obj __vt__12BombItemProp, weak - * .4byte __RTTI__12BombItemProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct BombItemProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/BossAnimationManager.h b/unsorted_include_todo/BossAnimationManager.h deleted file mode 100644 index b0fc6889..00000000 --- a/unsorted_include_todo/BossAnimationManager.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef _BOSSANIMATIONMANAGER_H -#define _BOSSANIMATIONMANAGER_H - -/** - * .obj __vt__20BossAnimationManager, weak - * .4byte __RTTI__20BossAnimationManager - * .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 - */ - -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 BossAnimationManager : public ANode, public CoreNode, public Node { - - BossAnimationManager(BossMgr*); -}; - -#endif diff --git a/unsorted_include_todo/BossNode.h b/unsorted_include_todo/BossNode.h deleted file mode 100644 index 3dbea76c..00000000 --- a/unsorted_include_todo/BossNode.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _BOSSNODE_H -#define _BOSSNODE_H - -/** - * .obj __vt__8BossNode, weak - * .4byte __RTTI__8BossNode - * .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 BossNode : public ANode, public CoreNode { -}; - -#endif diff --git a/unsorted_include_todo/CndBossCollKill.h b/unsorted_include_todo/CndBossCollKill.h deleted file mode 100644 index 69e57aa8..00000000 --- a/unsorted_include_todo/CndBossCollKill.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _CNDBOSSCOLLKILL_H -#define _CNDBOSSCOLLKILL_H - -/** - * .obj __vt__15CndBossCollKill, global - * .4byte __RTTI__15CndBossCollKill - * .4byte 0 - * .4byte satisfy__15CndBossCollKillFP8Creature - */ - -/** - * @brief TODO - */ -struct CndBossCollKill { - virtual void satisfy(Creature*); // _08 -}; - -#endif diff --git a/unsorted_include_todo/CndBossFlick.h b/unsorted_include_todo/CndBossFlick.h deleted file mode 100644 index 0017e44f..00000000 --- a/unsorted_include_todo/CndBossFlick.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _CNDBOSSFLICK_H -#define _CNDBOSSFLICK_H - -/** - * .obj __vt__12CndBossFlick, global - * .4byte __RTTI__12CndBossFlick - * .4byte 0 - * .4byte satisfy__12CndBossFlickFP8Creature - */ - -/** - * @brief TODO - */ -struct CndBossFlick { - virtual void satisfy(Creature*); // _08 -}; - -#endif diff --git a/unsorted_include_todo/CndIsAlive.h b/unsorted_include_todo/CndIsAlive.h deleted file mode 100644 index b60de1bf..00000000 --- a/unsorted_include_todo/CndIsAlive.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _CNDISALIVE_H -#define _CNDISALIVE_H - -/** - * .obj __vt__10CndIsAlive, global - * .4byte __RTTI__10CndIsAlive - * .4byte 0 - * .4byte satisfy__10CndIsAliveFP8Creature - */ - -/** - * @brief TODO - */ -struct CndIsAlive { - virtual void satisfy(Creature*); // _08 -}; - -#endif diff --git a/unsorted_include_todo/CndStickBossKill.h b/unsorted_include_todo/CndStickBossKill.h deleted file mode 100644 index 2f2d5b77..00000000 --- a/unsorted_include_todo/CndStickBossKill.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _CNDSTICKBOSSKILL_H -#define _CNDSTICKBOSSKILL_H - -/** - * .obj __vt__16CndStickBossKill, global - * .4byte __RTTI__16CndStickBossKill - * .4byte 0 - * .4byte satisfy__16CndStickBossKillFP8Creature - */ - -/** - * @brief TODO - */ -struct CndStickBossKill { - virtual void satisfy(Creature*); // _08 -}; - -#endif diff --git a/unsorted_include_todo/CndStickMouthKill.h b/unsorted_include_todo/CndStickMouthKill.h deleted file mode 100644 index e0ba6351..00000000 --- a/unsorted_include_todo/CndStickMouthKill.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _CNDSTICKMOUTHKILL_H -#define _CNDSTICKMOUTHKILL_H - -/** - * .obj __vt__17CndStickMouthKill, global - * .4byte __RTTI__17CndStickMouthKill - * .4byte 0 - * .4byte satisfy__17CndStickMouthKillFP8Creature - */ - -/** - * @brief TODO - */ -struct CndStickMouthKill { - virtual void satisfy(Creature*); // _08 -}; - -#endif diff --git a/unsorted_include_todo/CreatureInf.h b/unsorted_include_todo/CreatureInf.h deleted file mode 100644 index d07d4f14..00000000 --- a/unsorted_include_todo/CreatureInf.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _CREATUREINF_H -#define _CREATUREINF_H - -#include "types.h" -#include "Stream.h" - -struct Creature; -/** - * .obj __vt__11CreatureInf, global - * .4byte __RTTI__11CreatureInf - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte doStore__11CreatureInfFP8Creature - * .4byte doRestore__11CreatureInfFP8Creature - * .4byte saveCard__7BaseInfFR18RandomAccessStream - * .4byte loadCard__7BaseInfFR18RandomAccessStream - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -struct BaseInf { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void doStore(Creature*); // _10 - virtual void doRestore(Creature*); // _14 - virtual void saveCard(RandomAccessStream&); // _18 - virtual void loadCard(RandomAccessStream&); // _1C -}; - -/** - * @brief TODO - */ -struct CreatureInf : public ANode, public CoreNode, public BaseInf { - virtual void doStore(Creature*); // _10 - virtual void doRestore(Creature*); // _14 -}; - -#endif diff --git a/unsorted_include_todo/CreatureInfMgr.h b/unsorted_include_todo/CreatureInfMgr.h deleted file mode 100644 index 141e06b1..00000000 --- a/unsorted_include_todo/CreatureInfMgr.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _CREATUREINFMGR_H -#define _CREATUREINFMGR_H - -/** - * .obj __vt__14CreatureInfMgr, global - * .4byte __RTTI__14CreatureInfMgr - * .4byte 0 - * .4byte init__10MonoInfMgrFi - * .4byte getFreeInf__10MonoInfMgrFv - * .4byte delInf__10MonoInfMgrFP7BaseInf - * .4byte getFreeNum__10MonoInfMgrFv - * .4byte getActiveNum__10MonoInfMgrFv - * .4byte newInf__14CreatureInfMgrFv - */ - -struct MonoInfMgr { - virtual void init(int); // _08 - virtual void getFreeInf(); // _0C - virtual void delInf(BaseInf*); // _10 - virtual void getFreeNum(); // _14 - virtual void getActiveNum(); // _18 -}; - -/** - * @brief TODO - */ -struct CreatureInfMgr : public MonoInfMgr { - virtual void newInf(); // _1C -}; - -#endif diff --git a/unsorted_include_todo/DoorItem.h b/unsorted_include_todo/DoorItem.h deleted file mode 100644 index 15cf9885..00000000 --- a/unsorted_include_todo/DoorItem.h +++ /dev/null @@ -1,361 +0,0 @@ -#ifndef _DOORITEM_H -#define _DOORITEM_H - -/** - * .obj __vt__8DoorItem, global - * .4byte __RTTI__8DoorItem - * .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__8DoorItemFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__8DoorItemFi - * .4byte getiMass__8DoorItemFv - * .4byte getSize__8DoorItemFv - * .4byte getHeight__8DoorItemFv - * .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__8DoorItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8DoorItemFv - * .4byte isAlive__8DoorItemFv - * .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__8DoorItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__8DoorItemFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8DoorItem - * .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__12ItemCreatureFv - */ - -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 - 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 _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 (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 _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 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 isAtari(); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 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 isAtari(); // _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 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 DoorItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void init(Vector3f&); // _28 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void getHeight(); // _40 - virtual void isVisible(); // _74 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC -}; - -#endif diff --git a/unsorted_include_todo/DoorProp.h b/unsorted_include_todo/DoorProp.h deleted file mode 100644 index 1a732b51..00000000 --- a/unsorted_include_todo/DoorProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _DOORPROP_H -#define _DOORPROP_H - -/** - * .obj __vt__8DoorProp, weak - * .4byte __RTTI__8DoorProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct DoorProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/Fish.h b/unsorted_include_todo/Fish.h deleted file mode 100644 index 022a9e8f..00000000 --- a/unsorted_include_todo/Fish.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _FISH_H -#define _FISH_H - -/* - * @brief TODO - */ -struct Fish { - Fish(); -}; - -#endif diff --git a/unsorted_include_todo/FishGenerator.h b/unsorted_include_todo/FishGenerator.h deleted file mode 100644 index 8332b269..00000000 --- a/unsorted_include_todo/FishGenerator.h +++ /dev/null @@ -1,357 +0,0 @@ -#ifndef _FISHGENERATOR_H -#define _FISHGENERATOR_H - -/** - * .obj __vt__13FishGenerator, global - * .4byte __RTTI__13FishGenerator - * .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__13FishGeneratorFi - * .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__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__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__13FishGeneratorFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__13FishGeneratorFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__13FishGenerator - * .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__12ItemCreatureFv - */ - -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 - 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 (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 _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 (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 _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 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 _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 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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _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 _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 _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 _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 FishGenerator : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - - FishGenerator(); - void moveFish(Fish*); -}; - -#endif diff --git a/unsorted_include_todo/Fulcrum.h b/unsorted_include_todo/Fulcrum.h deleted file mode 100644 index 9fa1ca80..00000000 --- a/unsorted_include_todo/Fulcrum.h +++ /dev/null @@ -1,410 +0,0 @@ -#ifndef _FULCRUM_H -#define _FULCRUM_H - -/** - * .obj __vt__7Fulcrum, weak - * .4byte __RTTI__7Fulcrum - * .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__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__10ItemObjectFv - * .4byte isAlive__8CreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__10ItemObjectFv - * .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__10ItemObjectFv - * .4byte postUpdate__10ItemObjectFif - * .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__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__7Fulcrum - * .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__12ItemCreatureFv - */ - -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 _84() = 0; // _84 - virtual void isAlive(); // _88 (weak) - virtual void isFixed(); // _8C (weak) - virtual void _90() = 0; // _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 _E4() = 0; // _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 _10C() = 0; // _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 _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 _E0() = 0; // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -struct ItemObject { - 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 _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void isAtari(); // _84 - virtual void _88() = 0; // _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 postUpdate(int, float); // _E4 -}; - -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 _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 _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 _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 Fulcrum : public RefCountable, public Creature, public ItemCreature, public ItemObject, public AICreature { -}; - -#endif diff --git a/unsorted_include_todo/GemItem.h b/unsorted_include_todo/GemItem.h deleted file mode 100644 index c94ff7b3..00000000 --- a/unsorted_include_todo/GemItem.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _GEMITEM_H -#define _GEMITEM_H - -/* - * @brief TODO - */ -struct GemItem { - void setColorType(int); - void split(); -}; - -#endif diff --git a/unsorted_include_todo/GrassGen.h b/unsorted_include_todo/GrassGen.h deleted file mode 100644 index 52a60c32..00000000 --- a/unsorted_include_todo/GrassGen.h +++ /dev/null @@ -1,358 +0,0 @@ -#ifndef _GRASSGEN_H -#define _GRASSGEN_H - -/** - * .obj __vt__8GrassGen, global - * .4byte __RTTI__8GrassGen - * .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__8GrassGenFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__8GrassGenFv - * .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__8GrassGenFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8GrassGenFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8GrassGenFP8Creature - * .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__8GrassGenFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__8GrassGenFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8GrassGen - * .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__12ItemCreatureFv - */ - -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 - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C - 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 - 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 (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 _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 void _38() = 0; // _38 - virtual void getSize(); // _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 needFlick(Creature*); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 startAI(int); // _34 - virtual void _38() = 0; // _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 _84() = 0; // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void needFlick(Creature*); // _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 _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 GrassGen : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void getSize(); // _3C - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 - virtual void needFlick(Creature*); // _94 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC -}; - -#endif diff --git a/unsorted_include_todo/InfMgr.h b/unsorted_include_todo/InfMgr.h deleted file mode 100644 index 085c7f7b..00000000 --- a/unsorted_include_todo/InfMgr.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _INFMGR_H -#define _INFMGR_H - -/** - * .obj __vt__6InfMgr, weak - * .4byte __RTTI__6InfMgr - * .4byte 0 - * .4byte init__6InfMgrFi - * .4byte 0 - * .4byte 0 - * .4byte 0 - * .4byte 0 - */ - -/** - * @brief TODO - */ -struct InfMgr { - virtual void init(int); // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 -}; - -#endif diff --git a/unsorted_include_todo/ItemBall.h b/unsorted_include_todo/ItemBall.h deleted file mode 100644 index 3c0ecff8..00000000 --- a/unsorted_include_todo/ItemBall.h +++ /dev/null @@ -1,354 +0,0 @@ -#ifndef _ITEMBALL_H -#define _ITEMBALL_H - -/** - * .obj __vt__8ItemBall, global - * .4byte __RTTI__8ItemBall - * .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__8ItemBallFi - * .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__8ItemBallFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8ItemBallFv - * .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__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8ItemBall - * .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__12ItemCreatureFv - */ - -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 - 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 _10C() = 0; // _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 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 _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _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 _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 ItemBall : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 -}; - -#endif diff --git a/unsorted_include_todo/KeyItem.h b/unsorted_include_todo/KeyItem.h deleted file mode 100644 index a12c0ef2..00000000 --- a/unsorted_include_todo/KeyItem.h +++ /dev/null @@ -1,170 +0,0 @@ -#ifndef _KEYITEM_H -#define _KEYITEM_H - -/** - * .obj __vt__7KeyItem, global - * .4byte __RTTI__7KeyItem - * .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__7KeyItemFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__7KeyItemFi - * .4byte getiMass__7KeyItemFv - * .4byte getSize__7KeyItemFv - * .4byte getHeight__7KeyItemFv - * .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__7KeyItemFv - * .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__7KeyItemFR9CollEvent - * .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__7KeyItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__7KeyItemFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8CreatureFv - * .4byte doAnimation__8CreatureFv - * .4byte doKill__7KeyItemFv - * .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 - 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 - 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 KeyItem : public RefCountable, public Creature { - virtual void init(Vector3f&); // _28 - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void getHeight(); // _40 - virtual void isVisible(); // _74 - virtual void collisionCallback(CollEvent&); // _A8 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void doKill(); // _10C - - KeyItem(CreatureProp*, Shape*); -}; - -#endif diff --git a/unsorted_include_todo/KeyProp.h b/unsorted_include_todo/KeyProp.h deleted file mode 100644 index 40e20af3..00000000 --- a/unsorted_include_todo/KeyProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _KEYPROP_H -#define _KEYPROP_H - -/** - * .obj __vt__7KeyProp, weak - * .4byte __RTTI__7KeyProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct KeyProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/Kontroller.h b/unsorted_include_todo/Kontroller.h deleted file mode 100644 index ac292f02..00000000 --- a/unsorted_include_todo/Kontroller.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef _KONTROLLER_H -#define _KONTROLLER_H - -/** - * .obj __vt__10Kontroller, global - * .4byte __RTTI__10Kontroller - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__10KontrollerFR18RandomAccessStream - * .4byte update__10KontrollerFv - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct Node { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _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 Kontroller : public ANode, public Node { - virtual void read(RandomAccessStream&); // _0C - virtual void update(); // _10 - - Kontroller(int); - void save(RamStream*, int); - void load(RamStream*, int); - void getSaveSize(int); - void write(RandomAccessStream&); -}; - -#endif diff --git a/unsorted_include_todo/KusaItem.h b/unsorted_include_todo/KusaItem.h deleted file mode 100644 index 25a1e3f4..00000000 --- a/unsorted_include_todo/KusaItem.h +++ /dev/null @@ -1,363 +0,0 @@ -#ifndef _KUSAITEM_H -#define _KUSAITEM_H - -/** - * .obj __vt__8KusaItem, global - * .4byte __RTTI__8KusaItem - * .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__8KusaItemFi - * .4byte getiMass__8KusaItemFv - * .4byte getSize__8KusaItemFv - * .4byte getHeight__12ItemCreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__8KusaItemFR18RandomAccessStream - * .4byte doLoad__8KusaItemFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__8KusaItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8KusaItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8KusaItemFP8Creature - * .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__8KusaItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__8KusaItemFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8KusaItem - * .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__12ItemCreatureFv - */ - -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 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - 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 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 - 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 (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 _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 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 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 ignoreAtari(Creature*); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 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 ignoreAtari(Creature*); // _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 _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 KusaItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 - virtual void ignoreAtari(Creature*); // _98 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - - KusaItem(CreatureProp*, Shape*); -}; - -#endif diff --git a/unsorted_include_todo/KusaItemProp.h b/unsorted_include_todo/KusaItemProp.h deleted file mode 100644 index 063ca055..00000000 --- a/unsorted_include_todo/KusaItemProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _KUSAITEMPROP_H -#define _KUSAITEMPROP_H - -/** - * .obj __vt__12KusaItemProp, weak - * .4byte __RTTI__12KusaItemProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct KusaItemProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/MeltingPotMgr.h b/unsorted_include_todo/MeltingPotMgr.h deleted file mode 100644 index 292d617a..00000000 --- a/unsorted_include_todo/MeltingPotMgr.h +++ /dev/null @@ -1,148 +0,0 @@ -#ifndef _MELTINGPOTMGR_H -#define _MELTINGPOTMGR_H - -/** - * .obj __vt__13MeltingPotMgr, weak - * .4byte __RTTI__13MeltingPotMgr - * .4byte 0 - * .4byte getCreature__15CreatureNodeMgrFi - * .4byte getFirst__15CreatureNodeMgrFv - * .4byte getNext__15CreatureNodeMgrFi - * .4byte isDone__15CreatureNodeMgrFi - * .4byte __RTTI__13MeltingPotMgr - * .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__13MeltingPotMgrFv - * .4byte update__9ObjectMgrFv - * .4byte postUpdate__9ObjectMgrFif - * .4byte stickUpdate__9ObjectMgrFv - * .4byte refresh__9ObjectMgrFR8Graphics - * .4byte drawShadow__9ObjectMgrFR8GraphicsP7Texture - * .4byte getSize__15CreatureNodeMgrFv - * .4byte getMax__15CreatureNodeMgrFv - * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition - * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition - * .4byte search__9ObjectMgrFP9ObjectMgr - * .4byte killAll__9ObjectMgrFv - */ - -struct CreatureNodeMgr { - 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 ~CreatureNodeMgr(); // _48 (weak) - 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 getSize(); // _60 - virtual void getMax(); // _64 -}; - -struct ANode { - 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 getAgeNodeType(); // _20 (weak) -}; - -struct CoreNode { - 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 read(RandomAccessStream&); // _24 (weak) -}; - -struct Node { - 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 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 _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 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 _60() = 0; // _60 - virtual void _64() = 0; // _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 MeltingPotMgr : public CreatureNodeMgr, public ANode, public CoreNode, public Node, public ObjectMgr { - virtual ~MeltingPotMgr(); // _48 (weak) - - MeltingPotMgr(ItemMgr*); - void finalSetup(); - void prepare(int); - void birth(int); -}; - -#endif diff --git a/unsorted_include_todo/MizuItem.h b/unsorted_include_todo/MizuItem.h deleted file mode 100644 index 3cfbe9b3..00000000 --- a/unsorted_include_todo/MizuItem.h +++ /dev/null @@ -1,357 +0,0 @@ -#ifndef _MIZUITEM_H -#define _MIZUITEM_H - -/** - * .obj __vt__8MizuItem, global - * .4byte __RTTI__8MizuItem - * .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__8MizuItemFi - * .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__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__8MizuItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8MizuItemFP8Creature - * .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__8MizuItemFv - * .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__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8MizuItem - * .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__12ItemCreatureFv - */ - -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 - 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 - 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 _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 _10C() = 0; // _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 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 _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 needFlick(Creature*); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _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 needFlick(Creature*); // _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 _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 _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 MizuItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void isAlive(); // _88 - virtual void needFlick(Creature*); // _94 - virtual void update(); // _E0 - - MizuItem(int, CreatureProp*, ItemShapeObject*, SimpleAI*); -}; - -#endif diff --git a/unsorted_include_todo/MizuItemProp.h b/unsorted_include_todo/MizuItemProp.h deleted file mode 100644 index 5ad93a95..00000000 --- a/unsorted_include_todo/MizuItemProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _MIZUITEMPROP_H -#define _MIZUITEMPROP_H - -/** - * .obj __vt__12MizuItemProp, weak - * .4byte __RTTI__12MizuItemProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct MizuItemProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/MonoInfMgr.h b/unsorted_include_todo/MonoInfMgr.h deleted file mode 100644 index 0b69e290..00000000 --- a/unsorted_include_todo/MonoInfMgr.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _MONOINFMGR_H -#define _MONOINFMGR_H - -/** - * .obj __vt__10MonoInfMgr, global - * .4byte __RTTI__10MonoInfMgr - * .4byte 0 - * .4byte init__10MonoInfMgrFi - * .4byte getFreeInf__10MonoInfMgrFv - * .4byte delInf__10MonoInfMgrFP7BaseInf - * .4byte getFreeNum__10MonoInfMgrFv - * .4byte getActiveNum__10MonoInfMgrFv - * .4byte 0 - */ - -/** - * @brief TODO - */ -struct MonoInfMgr { - virtual void init(int); // _08 - virtual void getFreeInf(); // _0C - virtual void delInf(BaseInf*); // _10 - virtual void getFreeNum(); // _14 - virtual void getActiveNum(); // _18 - virtual void _1C() = 0; // _1C -}; - -#endif diff --git a/unsorted_include_todo/NaviDemoSunsetGoal.h b/unsorted_include_todo/NaviDemoSunsetGoal.h deleted file mode 100644 index 68e4a140..00000000 --- a/unsorted_include_todo/NaviDemoSunsetGoal.h +++ /dev/null @@ -1,410 +0,0 @@ -#ifndef _NAVIDEMOSUNSETGOAL_H -#define _NAVIDEMOSUNSETGOAL_H - -/** - * .obj __vt__18NaviDemoSunsetGoal, weak - * .4byte __RTTI__18NaviDemoSunsetGoal - * .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__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__10ItemObjectFv - * .4byte isAlive__8CreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__10ItemObjectFv - * .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__10ItemObjectFv - * .4byte postUpdate__10ItemObjectFif - * .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__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__18NaviDemoSunsetGoal - * .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__12ItemCreatureFv - */ - -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 _84() = 0; // _84 - virtual void isAlive(); // _88 (weak) - virtual void isFixed(); // _8C (weak) - virtual void _90() = 0; // _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 _E4() = 0; // _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 _10C() = 0; // _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 _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 _E0() = 0; // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -struct ItemObject { - 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 _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void isAtari(); // _84 - virtual void _88() = 0; // _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 postUpdate(int, float); // _E4 -}; - -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 _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 _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 _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 NaviDemoSunsetGoal : public RefCountable, public Creature, public ItemCreature, public ItemObject, public AICreature { -}; - -#endif diff --git a/unsorted_include_todo/NaviDemoSunsetStart.h b/unsorted_include_todo/NaviDemoSunsetStart.h deleted file mode 100644 index a5d31ed7..00000000 --- a/unsorted_include_todo/NaviDemoSunsetStart.h +++ /dev/null @@ -1,410 +0,0 @@ -#ifndef _NAVIDEMOSUNSETSTART_H -#define _NAVIDEMOSUNSETSTART_H - -/** - * .obj __vt__19NaviDemoSunsetStart, weak - * .4byte __RTTI__19NaviDemoSunsetStart - * .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__8CreatureFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__10ItemObjectFv - * .4byte isAlive__8CreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__10ItemObjectFv - * .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__10ItemObjectFv - * .4byte postUpdate__10ItemObjectFif - * .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__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__19NaviDemoSunsetStart - * .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__12ItemCreatureFv - */ - -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 _84() = 0; // _84 - virtual void isAlive(); // _88 (weak) - virtual void isFixed(); // _8C (weak) - virtual void _90() = 0; // _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 _E4() = 0; // _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 _10C() = 0; // _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 _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 _E0() = 0; // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -struct ItemObject { - 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 _74() = 0; // _74 - virtual void _78() = 0; // _78 - virtual void _7C() = 0; // _7C - virtual void _80() = 0; // _80 - virtual void isAtari(); // _84 - virtual void _88() = 0; // _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 postUpdate(int, float); // _E4 -}; - -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 _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 _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 _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 NaviDemoSunsetStart : public RefCountable, public Creature, public ItemCreature, public ItemObject, public AICreature { -}; - -#endif diff --git a/unsorted_include_todo/PaniTestNode.h b/unsorted_include_todo/PaniTestNode.h deleted file mode 100644 index adf64368..00000000 --- a/unsorted_include_todo/PaniTestNode.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _PANITESTNODE_H -#define _PANITESTNODE_H - -/** - * .obj __vt__12PaniTestNode, global - * .4byte __RTTI__12PaniTestNode - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte update__12PaniTestNodeFv - * .4byte draw__12PaniTestNodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - * .4byte __RTTI__12PaniTestNode - * .4byte 0xFFFFFFE0 - * .4byte "@32@animationKeyUpdated__12PaniTestNodeFR16PaniAnimKeyEvent" - * .4byte animationKeyUpdated__12PaniTestNodeFR16PaniAnimKeyEvent - */ - -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 PaniTestNode : public ANode, public CoreNode, public Node { - virtual void update(); // _10 - virtual void draw(Graphics&); // _14 - virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _3C -}; - -#endif diff --git a/unsorted_include_todo/PaniTestSection.h b/unsorted_include_todo/PaniTestSection.h deleted file mode 100644 index 0469072c..00000000 --- a/unsorted_include_todo/PaniTestSection.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef _PANITESTSECTION_H -#define _PANITESTSECTION_H - -/** - * .obj __vt__15PaniTestSection, global - * .4byte __RTTI__15PaniTestSection - * .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__15PaniTestSectionFv - */ - -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 PaniTestSection : public ANode, public CoreNode, public Node { - virtual void init(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/PelletMgr/UseNode.h b/unsorted_include_todo/PelletMgr/UseNode.h deleted file mode 100644 index 9b3bc156..00000000 --- a/unsorted_include_todo/PelletMgr/UseNode.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _PELLETMGR_USENODE_H -#define _PELLETMGR_USENODE_H - -/** - * .obj __vt__Q29PelletMgr7UseNode, weak - * .4byte __RTTI__Q29PelletMgr7UseNode - * .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) -}; - -namespace PelletMgr { -/** - * @brief TODO - */ -struct UseNode : public ANode, public CoreNode { -}; -} // namespace PelletMgr - -#endif diff --git a/unsorted_include_todo/PikiHeadItem.h b/unsorted_include_todo/PikiHeadItem.h deleted file mode 100644 index 15e60cc4..00000000 --- a/unsorted_include_todo/PikiHeadItem.h +++ /dev/null @@ -1,363 +0,0 @@ -#ifndef _PIKIHEADITEM_H -#define _PIKIHEADITEM_H - -/** - * .obj __vt__12PikiHeadItem, global - * .4byte __RTTI__12PikiHeadItem - * .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__12PikiHeadItemFi - * .4byte getiMass__12PikiHeadItemFv - * .4byte getSize__12PikiHeadItemFv - * .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__12PikiHeadItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__12PikiHeadItemFv - * .4byte isAlive__12PikiHeadItemFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__12PikiHeadItemFv - * .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__12PikiHeadItemFv - * .4byte finishWaterEffect__12PikiHeadItemFv - * .4byte isRopable__8CreatureFv - * .4byte mayIstick__8CreatureFv - * .4byte getFormationPri__8CreatureFv - * .4byte update__12ItemCreatureFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__12PikiHeadItemFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12PikiHeadItemFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__12PikiHeadItem - * .4byte 0xFFFFFD48 - * .4byte "@696@animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent" - * .4byte getCurrState__10AICreatureFv - * .4byte "setCurrState__10AICreatureFP20AState<10AICreature>" - * .4byte playSound__12PikiHeadItemFi - * .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__12ItemCreatureFv - */ - -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 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - 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 - 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 - virtual void finishWaterEffect(); // _D0 - 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 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 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 startAI(int); // _34 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _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 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 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 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 _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 playSound(int); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 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 _E0() = 0; // _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 getCurrState(); // _120 (weak) - virtual void setCurrState(AState*); // _124 (weak) - virtual void playSound(int); // _128 - 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 PikiHeadItem : public RefCountable, public Creature, public ItemCreature, public AICreature { - 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 startWaterEffect(); // _CC - virtual void finishWaterEffect(); // _D0 - virtual void refresh(Graphics&); // _EC - virtual void doKill(); // _10C - virtual void playSound(int); // _128 -}; - -#endif diff --git a/unsorted_include_todo/PikiHeadItemProp.h b/unsorted_include_todo/PikiHeadItemProp.h deleted file mode 100644 index 91d2eb01..00000000 --- a/unsorted_include_todo/PikiHeadItemProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _PIKIHEADITEMPROP_H -#define _PIKIHEADITEMPROP_H - -/** - * .obj __vt__16PikiHeadItemProp, weak - * .4byte __RTTI__16PikiHeadItemProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct PikiHeadItemProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/PikiHeadMgr.h b/unsorted_include_todo/PikiHeadMgr.h deleted file mode 100644 index 4e8be35c..00000000 --- a/unsorted_include_todo/PikiHeadMgr.h +++ /dev/null @@ -1,156 +0,0 @@ -#ifndef _PIKIHEADMGR_H -#define _PIKIHEADMGR_H - -/** - * .obj __vt__11PikiHeadMgr, global - * .4byte __RTTI__11PikiHeadMgr - * .4byte 0 - * .4byte getCreature__13MonoObjectMgrFi - * .4byte getFirst__13MonoObjectMgrFv - * .4byte getNext__13MonoObjectMgrFi - * .4byte isDone__13MonoObjectMgrFi - * .4byte __RTTI__11PikiHeadMgr - * .4byte 0xFFFFFFF8 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .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__11PikiHeadMgrFv - * .4byte update__13MonoObjectMgrFv - * .4byte postUpdate__13MonoObjectMgrFif - * .4byte stickUpdate__9ObjectMgrFv - * .4byte refresh__13MonoObjectMgrFR8Graphics - * .4byte drawShadow__13MonoObjectMgrFR8GraphicsP7Texture - * .4byte getSize__13MonoObjectMgrFv - * .4byte getMax__13MonoObjectMgrFv - * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition - * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition - * .4byte search__13MonoObjectMgrFP9ObjectMgr - * .4byte killAll__9ObjectMgrFv - * .4byte birth__11PikiHeadMgrFv - * .4byte kill__13MonoObjectMgrFP8Creature - * .4byte createObject__11PikiHeadMgrFv - */ - -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, float); // _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 ANode { - 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 getAgeNodeType(); // _20 (weak) -}; - -struct CoreNode { - 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 read(RandomAccessStream&); // _24 (weak) -}; - -struct Node { - 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 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 _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 _58() = 0; // _58 - virtual void _5C() = 0; // _5C - virtual void _60() = 0; // _60 - virtual void _64() = 0; // _64 - virtual void findClosest(Vector3f&, float, Condition*); // _68 - virtual void findClosest(Vector3f&, Condition*); // _6C - virtual void _70() = 0; // _70 - virtual void killAll(); // _74 -}; - -/** - * @brief TODO - */ -struct PikiHeadMgr : public MonoObjectMgr, public ANode, public CoreNode, public Node, public ObjectMgr { - virtual ~PikiHeadMgr(); // _48 (weak) - virtual void birth(); // _78 - virtual void createObject(); // _80 - - PikiHeadMgr(ItemMgr*); -}; - -#endif diff --git a/unsorted_include_todo/PikiMgr.h b/unsorted_include_todo/PikiMgr.h deleted file mode 100644 index cac08f39..00000000 --- a/unsorted_include_todo/PikiMgr.h +++ /dev/null @@ -1,147 +0,0 @@ -#ifndef _PIKIMGR_H -#define _PIKIMGR_H - -/** - * .obj __vt__7PikiMgr, global - * .4byte __RTTI__7PikiMgr - * .4byte 0 - * .4byte getCreature__13MonoObjectMgrFi - * .4byte getFirst__13MonoObjectMgrFv - * .4byte getNext__13MonoObjectMgrFi - * .4byte isDone__13MonoObjectMgrFi - * .4byte __RTTI__7PikiMgr - * .4byte 0xFFFFFFF8 - * .4byte getAgeNodeType__5ANodeFv - * .4byte "@8@read__7PikiMgrFR18RandomAccessStream" - * .4byte "@8@update__7PikiMgrFv" - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - * .4byte __dt__7PikiMgrFv - * .4byte update__7PikiMgrFv - * .4byte postUpdate__13MonoObjectMgrFif - * .4byte stickUpdate__9ObjectMgrFv - * .4byte refresh__7PikiMgrFR8Graphics - * .4byte drawShadow__13MonoObjectMgrFR8GraphicsP7Texture - * .4byte getSize__13MonoObjectMgrFv - * .4byte getMax__13MonoObjectMgrFv - * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition - * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition - * .4byte search__13MonoObjectMgrFP9ObjectMgr - * .4byte killAll__9ObjectMgrFv - * .4byte birth__7PikiMgrFv - * .4byte kill__13MonoObjectMgrFP8Creature - * .4byte createObject__7PikiMgrFv - * .4byte read__7PikiMgrFR18RandomAccessStream - */ - -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 - virtual void update(); // _4C - virtual void postUpdate(int, float); // _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 ANode { - 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 getAgeNodeType(); // _20 (weak) -}; - -struct Node { - 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 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 _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 - virtual void update(); // _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&, float, Condition*); // _68 - virtual void findClosest(Vector3f&, Condition*); // _6C - virtual void _70() = 0; // _70 - virtual void killAll(); // _74 -}; - -/** - * @brief TODO - */ -struct PikiMgr : public MonoObjectMgr, public ANode, public Node, public ObjectMgr { - virtual ~PikiMgr(); // _48 - virtual void update(); // _4C - virtual void refresh(Graphics&); // _58 - virtual void birth(); // _78 - virtual void createObject(); // _80 - virtual void read(RandomAccessStream&); // _84 -}; - -#endif diff --git a/unsorted_include_todo/PikiProp.h b/unsorted_include_todo/PikiProp.h deleted file mode 100644 index 1c7cc21e..00000000 --- a/unsorted_include_todo/PikiProp.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _PIKIPROP_H -#define _PIKIPROP_H - -/** - * .obj __vt__8PikiProp, weak - * .4byte __RTTI__8PikiProp - * .4byte 0 - * .4byte read__8PikiPropFR18RandomAccessStream - */ - -/** - * @brief TODO - */ -struct PikiProp { - virtual void read(RandomAccessStream&); // _08 -}; - -#endif diff --git a/unsorted_include_todo/RockGen.h b/unsorted_include_todo/RockGen.h deleted file mode 100644 index 863fe5a8..00000000 --- a/unsorted_include_todo/RockGen.h +++ /dev/null @@ -1,362 +0,0 @@ -#ifndef _ROCKGEN_H -#define _ROCKGEN_H - -/** - * .obj __vt__7RockGen, global - * .4byte __RTTI__7RockGen - * .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__7RockGenFi - * .4byte getiMass__8CreatureFv - * .4byte getSize__7RockGenFv - * .4byte getHeight__12ItemCreatureFv - * .4byte getCylinderHeight__8CreatureFv - * .4byte doStore__8CreatureFP11CreatureInf - * .4byte doRestore__8CreatureFP11CreatureInf - * .4byte doSave__7RockGenFR18RandomAccessStream - * .4byte doLoad__7RockGenFR18RandomAccessStream - * .4byte getCentre__8CreatureFv - * .4byte getCentreSize__8CreatureFv - * .4byte getBoundingSphereCentre__8CreatureFv - * .4byte getBoundingSphereRadius__8CreatureFv - * .4byte getShadowPos__8CreatureFv - * .4byte setCentre__8CreatureFR8Vector3f - * .4byte getShadowSize__8CreatureFv - * .4byte isVisible__7RockGenFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8CreatureFv - * .4byte isAlive__7RockGenFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__7RockGenFP8Creature - * .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__7RockGenFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__7RockGenFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__7RockGen - * .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__12ItemCreatureFv - */ - -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 - virtual f32 getiMass(); // _38 (weak) - virtual void getSize(); // _3C - 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 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 - 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 (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 _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 void _38() = 0; // _38 - virtual void getSize(); // _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 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 needFlick(Creature*); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 startAI(int); // _34 - virtual void _38() = 0; // _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 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 needFlick(Creature*); // _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 _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 RockGen : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void getSize(); // _3C - virtual void doSave(RandomAccessStream&); // _50 - virtual void doLoad(RandomAccessStream&); // _54 - virtual void isVisible(); // _74 - virtual void isAlive(); // _88 - virtual void needFlick(Creature*); // _94 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - - void workable(); -}; - -#endif diff --git a/unsorted_include_todo/RumbleSample.h b/unsorted_include_todo/RumbleSample.h deleted file mode 100644 index 4a0d9a71..00000000 --- a/unsorted_include_todo/RumbleSample.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _RUMBLESAMPLE_H -#define _RUMBLESAMPLE_H - -/* - * @brief TODO - */ -struct RumbleSample { - RumbleSample(int); - void simpleStop(); - void simpleStart(float); -}; - -#endif diff --git a/unsorted_include_todo/SeedItem.h b/unsorted_include_todo/SeedItem.h deleted file mode 100644 index 7ee1a52b..00000000 --- a/unsorted_include_todo/SeedItem.h +++ /dev/null @@ -1,171 +0,0 @@ -#ifndef _SEEDITEM_H -#define _SEEDITEM_H - -/** - * .obj __vt__8SeedItem, global - * .4byte __RTTI__8SeedItem - * .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__8SeedItemFR8Vector3f - * .4byte resetPosition__8CreatureFR8Vector3f - * .4byte initParam__8CreatureFi - * .4byte startAI__8CreatureFi - * .4byte getiMass__8SeedItemFv - * .4byte getSize__8SeedItemFv - * .4byte getHeight__8SeedItemFv - * .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__8SeedItemFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__8SeedItemFv - * .4byte isAlive__8CreatureFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__8CreatureFP8Creature - * .4byte ignoreAtari__8CreatureFP8Creature - * .4byte isFree__8CreatureFv - * .4byte stimulate__8SeedItemFR11Interaction - * .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__8SeedItemFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__8SeedItemFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__8SeedItemFv - * .4byte doAnimation__8CreatureFv - * .4byte doKill__8SeedItemFv - * .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 - virtual void getSize(); // _3C - virtual void getHeight(); // _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 - 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 - virtual void doAnimation(); // _108 (weak) - virtual void doKill(); // _10C - virtual void exitCourse(); // _110 (weak) -}; - -/** - * @brief TODO - */ -struct SeedItem : public RefCountable, public Creature { - virtual void init(Vector3f&); // _28 - virtual f32 getiMass(); // _38 - virtual void getSize(); // _3C - virtual void getHeight(); // _40 - virtual void isVisible(); // _74 - virtual void isAtari(); // _84 - virtual void stimulate(Interaction&); // _A0 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC - virtual void doAI(); // _104 - virtual void doKill(); // _10C - - SeedItem(CreatureProp*, Shape**); -}; - -#endif diff --git a/unsorted_include_todo/SeedProp.h b/unsorted_include_todo/SeedProp.h deleted file mode 100644 index f43d5aa0..00000000 --- a/unsorted_include_todo/SeedProp.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _SEEDPROP_H -#define _SEEDPROP_H - -/** - * .obj __vt__8SeedProp, weak - * .4byte __RTTI__8SeedProp - * .4byte 0 - * .4byte read__12CreaturePropFR18RandomAccessStream - */ - -struct CreatureProp { - virtual void read(RandomAccessStream&); // _08 -}; - -/** - * @brief TODO - */ -struct SeedProp : public CreatureProp { -}; - -#endif diff --git a/unsorted_include_todo/TekiAnimationManager.h b/unsorted_include_todo/TekiAnimationManager.h deleted file mode 100644 index 7b491810..00000000 --- a/unsorted_include_todo/TekiAnimationManager.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _TEKIANIMATIONMANAGER_H -#define _TEKIANIMATIONMANAGER_H - -/** - * .obj __vt__20TekiAnimationManager, global - * .4byte __RTTI__20TekiAnimationManager - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__20TekiAnimationManagerFR18RandomAccessStream - * .4byte update__4NodeFv - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct Node { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _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 TekiAnimationManager : public ANode, public Node { - virtual void read(RandomAccessStream&); // _0C - - TekiAnimationManager(TekiMgr*); -}; - -#endif diff --git a/unsorted_include_todo/TekiNakata.h b/unsorted_include_todo/TekiNakata.h deleted file mode 100644 index 1736763f..00000000 --- a/unsorted_include_todo/TekiNakata.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _TEKINAKATA_H -#define _TEKINAKATA_H - -/* - * @brief TODO - */ -struct TekiNakata { - void makeTekiParameters(TekiMgr*); - void makeTekis(TekiMgr*); -}; - -#endif diff --git a/unsorted_include_todo/TekiParameters.h b/unsorted_include_todo/TekiParameters.h deleted file mode 100644 index ffe71f31..00000000 --- a/unsorted_include_todo/TekiParameters.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _TEKIPARAMETERS_H -#define _TEKIPARAMETERS_H - -/** - * .obj __vt__14TekiParameters, global - * .4byte __RTTI__14TekiParameters - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__14TekiParametersFR18RandomAccessStream - * .4byte update__4NodeFv - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct Node { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _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 TekiParameters : public ANode, public Node { - virtual void read(RandomAccessStream&); // _0C - - TekiParameters(int, int); -}; - -#endif diff --git a/unsorted_include_todo/TopAction.h b/unsorted_include_todo/TopAction.h deleted file mode 100644 index 875915d2..00000000 --- a/unsorted_include_todo/TopAction.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef _TOPACTION_H -#define _TOPACTION_H - -/** - * .obj __vt__9TopAction, global - * .4byte __RTTI__9TopAction - * .4byte 0 - * .4byte "procMsg__15Receiver<4Piki>FP4PikiP3Msg" - * .4byte "procBounceMsg__15Receiver<4Piki>FP4PikiP9MsgBounce" - * .4byte "procStickMsg__15Receiver<4Piki>FP4PikiP8MsgStick" - * .4byte "procHangMsg__15Receiver<4Piki>FP4PikiP7MsgHang" - * .4byte "procTargetMsg__15Receiver<4Piki>FP4PikiP9MsgTarget" - * .4byte "procCollideMsg__15Receiver<4Piki>FP4PikiP10MsgCollide" - * .4byte "procAnimMsg__15Receiver<4Piki>FP4PikiP7MsgAnim" - * .4byte "procDamageMsg__15Receiver<4Piki>FP4PikiP9MsgDamage" - * .4byte "procWallMsg__15Receiver<4Piki>FP4PikiP7MsgWall" - * .4byte "procOffWallMsg__15Receiver<4Piki>FP4PikiP10MsgOffWall" - * .4byte "procUserMsg__15Receiver<4Piki>FP4PikiP7MsgUser" - * .4byte "procGroundMsg__15Receiver<4Piki>FP4PikiP9MsgGround" - * .4byte defaultInitialiser__6ActionFv - * .4byte dump__6ActionFv - * .4byte draw__9TopActionFR8Graphics - * .4byte __dt__9TopActionFv - * .4byte init__9TopActionFP8Creature - * .4byte exec__9TopActionFv - * .4byte cleanup__6ActionFv - * .4byte resume__9TopActionFv - * .4byte restart__9TopActionFv - * .4byte resumable__9TopActionFv - * .4byte getInfo__9TopActionFPc - */ - -struct Receiver { - virtual void procMsg(Piki*, Msg*); // _08 - virtual void procBounceMsg(Piki*, MsgBounce*); // _0C - virtual void procStickMsg(Piki*, MsgStick*); // _10 - virtual void procHangMsg(Piki*, MsgHang*); // _14 - virtual void procTargetMsg(Piki*, MsgTarget*); // _18 - virtual void procCollideMsg(Piki*, MsgCollide*); // _1C - virtual void procAnimMsg(Piki*, MsgAnim*); // _20 - virtual void procDamageMsg(Piki*, MsgDamage*); // _24 - virtual void procWallMsg(Piki*, MsgWall*); // _28 - virtual void procOffWallMsg(Piki*, MsgOffWall*); // _2C - virtual void procUserMsg(Piki*, MsgUser*); // _30 - virtual void procGroundMsg(Piki*, MsgGround*); // _34 -}; - -struct Action { - 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 defaultInitialiser(); // _38 - virtual void dump(); // _3C - virtual void draw(Graphics&); // _40 - virtual ~Action(); // _44 - virtual void init(Creature*); // _48 - virtual void exec(); // _4C - virtual void cleanup(); // _50 -}; - -/** - * @brief TODO - */ -struct TopAction : public Receiver, public Action { - virtual void draw(Graphics&); // _40 - virtual ~TopAction(); // _44 - virtual void init(Creature*); // _48 - virtual void exec(); // _4C - virtual void resume(); // _54 - virtual void restart(); // _58 - virtual void resumable(); // _5C - virtual void getInfo(char*); // _60 -}; - -#endif diff --git a/unsorted_include_todo/UfoShapeObject.h b/unsorted_include_todo/UfoShapeObject.h deleted file mode 100644 index 3861087b..00000000 --- a/unsorted_include_todo/UfoShapeObject.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _UFOSHAPEOBJECT_H -#define _UFOSHAPEOBJECT_H - -/* - * @brief TODO - */ -struct UfoShapeObject { - UfoShapeObject(Shape*); -}; - -#endif diff --git a/unsorted_include_todo/Weed.h b/unsorted_include_todo/Weed.h deleted file mode 100644 index 5c7ded0f..00000000 --- a/unsorted_include_todo/Weed.h +++ /dev/null @@ -1,358 +0,0 @@ -#ifndef _WEED_H -#define _WEED_H - -/** - * .obj __vt__4Weed, global - * .4byte __RTTI__4Weed - * .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__4WeedFi - * .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__4WeedFv - * .4byte isOrganic__8CreatureFv - * .4byte isTerrible__8CreatureFv - * .4byte isBuried__8CreatureFv - * .4byte isAtari__4WeedFv - * .4byte isAlive__4WeedFv - * .4byte isFixed__8CreatureFv - * .4byte needShadow__8CreatureFv - * .4byte needFlick__4WeedFP8Creature - * .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__4WeedFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__4WeedFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__4Weed - * .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__12ItemCreatureFv - */ - -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 - 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 - virtual void isAlive(); // _88 - virtual void isFixed(); // _8C (weak) - virtual void needShadow(); // _90 - virtual void needFlick(Creature*); // _94 - 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 (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 _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 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 isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void _8C() = 0; // _8C - virtual void _90() = 0; // _90 - virtual void needFlick(Creature*); // _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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _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 _90() = 0; // _90 - virtual void needFlick(Creature*); // _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 _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 Weed : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void isVisible(); // _74 - virtual void isAtari(); // _84 - virtual void isAlive(); // _88 - virtual void needFlick(Creature*); // _94 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC -}; - -#endif diff --git a/unsorted_include_todo/WeedsGen.h b/unsorted_include_todo/WeedsGen.h deleted file mode 100644 index 4e25400c..00000000 --- a/unsorted_include_todo/WeedsGen.h +++ /dev/null @@ -1,354 +0,0 @@ -#ifndef _WEEDSGEN_H -#define _WEEDSGEN_H - -/** - * .obj __vt__8WeedsGen, global - * .4byte __RTTI__8WeedsGen - * .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__8WeedsGenFi - * .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__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__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__8WeedsGenFv - * .4byte postUpdate__8CreatureFif - * .4byte stickUpdate__8CreatureFv - * .4byte refresh__8WeedsGenFR8Graphics - * .4byte refresh2d__8CreatureFR8Graphics - * .4byte renderAtari__8CreatureFR8Graphics - * .4byte drawShadow__8CreatureFR8Graphics - * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f - * .4byte getCatchPos__8CreatureFP8Creature - * .4byte doAI__12ItemCreatureFv - * .4byte doAnimation__12ItemCreatureFv - * .4byte doKill__12ItemCreatureFv - * .4byte exitCourse__8CreatureFv - * .4byte __RTTI__8WeedsGen - * .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__12ItemCreatureFv - */ - -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 - 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 (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 _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 (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 _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 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 _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 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 - virtual void _154() = 0; // _154 - virtual void finalSetup(); // _158 (weak) -}; - -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 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 _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 _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 _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 _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 WeedsGen : public RefCountable, public Creature, public ItemCreature, public AICreature { - virtual void startAI(int); // _34 - virtual void update(); // _E0 - virtual void refresh(Graphics&); // _EC -}; - -#endif