Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-27 23:30:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

itemUjamushi.cpp progress

Browse Source
This commit is contained in:
HeartPiece 2023-11-22 01:01:17 +11:00
parent 13191d8b67
commit 8f46e92375
4 changed files with 158 additions and 1019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/recommended_todo.md
View File

@ -117,7 +117,7 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBattle.cpp">aiBattle.cpp</a> | 14633 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 15438 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBattle.cpp">aiBattle.cpp</a> | 14633 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSectionKantei.cpp">baseGameSectionKantei.cpp</a> | 15438 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemRock.cpp">itemRock.cpp</a> | 17257 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 19828 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemRock.cpp">itemRock.cpp</a> | 17257 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 19828 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemCave.cpp">itemCave.cpp</a> | 20159 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemDownFloor.cpp">itemDownFloor.cpp</a> | 21105 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemCave.cpp">itemCave.cpp</a> | 20159 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemDownFloor.cpp">itemDownFloor.cpp</a> | 21105 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainResult.cpp">singleGS_MainResult.cpp</a> | 21358 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/dynCreature.cpp">dynCreature.cpp</a> | 21675 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_MainResult.cpp">singleGS_MainResult.cpp</a> | 21358 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/dynCreature.cpp">dynCreature.cpp</a> | 21676 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveResult.cpp">singleGS_CaveResult.cpp</a> | 24957 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 25157 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveResult.cpp">singleGS_CaveResult.cpp</a> | 24957 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 25157 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 26033 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPikihead.cpp">itemPikihead.cpp</a> | 26220 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 26033 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPikihead.cpp">itemPikihead.cpp</a> | 26220 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 30254 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsCardMgr.cpp">vsCardMgr.cpp</a> | 30919 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_DayEnd.cpp">singleGS_DayEnd.cpp</a> | 30254 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsCardMgr.cpp">vsCardMgr.cpp</a> | 30919 |
@ -131,8 +131,8 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemWeed.cpp">itemWeed.cpp</a> | 62506 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 62925 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemWeed.cpp">itemWeed.cpp</a> | 62506 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 62925 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 64646 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayData.cpp">gamePlayData.cpp</a> | 67504 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 64646 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayData.cpp">gamePlayData.cpp</a> | 67504 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73029 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 75901 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73029 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 75901 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGameSection.cpp">singleGameSection.cpp</a> | 86519 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 92198 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 76345 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGameSection.cpp">singleGameSection.cpp</a> | 86519 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 95820 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemMgr.cpp">itemMgr.cpp</a> | 102119 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 92198 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemMgr.cpp">itemMgr.cpp</a> | 102119 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 116963 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 142712 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 116963 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 142712 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 152886 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 158942 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 152886 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 158942 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 163131 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 192282 | | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 163131 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 192282 |

21
include/Game/Entities/ItemUjamushi.h
View File

@ -30,7 +30,7 @@ struct InitArg : public CreatureInitArg {
virtual const char* getName() { return "ItemUjamushi::InitArg"; } // _08 (weak) virtual const char* getName() { return "ItemUjamushi::InitArg"; } // _08 (weak)
// _00 = VTBL // _00 = VTBL
int _04; // _04 int mCount; // _04
}; };
struct FSM : public ItemFSM<Item> { struct FSM : public ItemFSM<Item> {
@ -198,7 +198,7 @@ struct Uja : public TFlock {
u8 _AD; // _AD u8 _AD; // _AD
u8 _AE; // _AE u8 _AE; // _AE
u8 _AF; // _AF, unknown/padding u8 _AF; // _AF, unknown/padding
u8 _B0[0x4]; // _B0, unknown u32 _B0; // _B0, unknown
f32 _B4; // _B4 f32 _B4; // _B4
f32 _B8; // _B8 f32 _B8; // _B8
int mBufferSlotCount; // _BC int mBufferSlotCount; // _BC
@ -207,9 +207,17 @@ struct Uja : public TFlock {
}; };
struct UjaMgrInitArg { struct UjaMgrInitArg {
inline UjaMgrInitArg(Vector3f& pos, f32 rad, BoidParameter* boid, UjaParms* parms)
{
mSphere.mPosition = pos;
mSphere.mRadius = rad;
mBoidParameter = boid;
mUjaParms = parms;
}
Sys::Sphere mSphere; // _00 Sys::Sphere mSphere; // _00
BoidParameter* mBoidParameter; // _10 BoidParameter* mBoidParameter; // _10
u32 _14; // _14 UjaParms* mUjaParms; // _14, same as the parameters at _310 in UjaMgr
}; };
struct UjaMgr : public TFlockMgr<Uja> { struct UjaMgr : public TFlockMgr<Uja> {
@ -239,7 +247,7 @@ struct UjaMgr : public TFlockMgr<Uja> {
f32 _A0; // _A0 f32 _A0; // _A0
BoidParameter* mBoidParameter; // _A4 BoidParameter* mBoidParameter; // _A4
BoidParms mBoidParms; // _A8 BoidParms mBoidParms; // _A8
void* _310; // _310, this is a pointer to parameters of some description. UjaParms* mUjaParms; // _310, this is a pointer to parameters of some description, UjaParms is a guess
}; };
struct Item : public FSMItem<Item, FSM, State> { struct Item : public FSMItem<Item, FSM, State> {
@ -259,7 +267,7 @@ struct Item : public FSMItem<Item, FSM, State> {
virtual void onInit(CreatureInitArg* initArg); // _30 virtual void onInit(CreatureInitArg* initArg); // _30
virtual BaseFlockMgr* getFlockMgr() { return static_cast<BaseFlockMgr*>(mFlockMgr); } // _90 (weak) virtual BaseFlockMgr* getFlockMgr() { return static_cast<BaseFlockMgr*>(mFlockMgr); } // _90 (weak)
virtual bool isCollisionFlick(); // _B0 (weak) virtual bool isCollisionFlick() { return false; } // _B0 (weak)
virtual bool ignoreAtari(Creature* toIgnore); // _190 virtual bool ignoreAtari(Creature* toIgnore); // _190
virtual void makeTrMatrix() { } // _1C4 (weak) virtual void makeTrMatrix() { } // _1C4 (weak)
virtual void doAI(); // _1C8 virtual void doAI(); // _1C8
@ -325,9 +333,10 @@ extern Mgr* mgr;
} // namespace Game } // namespace Game
struct GenUjamushiParm : public Game::GenItemParm { struct GenUjamushiParm : public Game::GenItemParm {
inline GenUjamushiParm() { mCount = 100; }
// _00 = VTBL // _00 = VTBL
int _04; // _04 int mCount; // _04
}; };
#endif #endif

7
include/trig.h
View File

@ -119,6 +119,13 @@ inline Vector3f getDirection(f32 angle)
Vector3f vec = Vector3f(sinf(angle), 0.0f, cosf(angle)); Vector3f vec = Vector3f(sinf(angle), 0.0f, cosf(angle));
return vec; return vec;
} }
inline Vector3f getDirection(f32 angle, f32 rad)
{
Vector3f vec = Vector3f(rad * sinf(angle), 0.0f, rad * cosf(angle));
return vec;
}
inline Vector3f getPerpDirection(f32 angle) { return Vector3f(cosf(angle), 0.0f, -sinf(angle)); } inline Vector3f getPerpDirection(f32 angle) { return Vector3f(cosf(angle), 0.0f, -sinf(angle)); }
inline Vector3f getDirectionMori(f32 angle) inline Vector3f getDirectionMori(f32 angle)

1143
src/plugProjectKandoU/itemUjamushi.cpp
View File

File diff suppressed because it is too large Load Diff