Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-12 01:26:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make all source files compilable

Browse Source
This commit is contained in:
HeartPiece 2024-02-28 11:19:39 +11:00
parent 48323eafe5
commit cbf274ce1d
14 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/recommended_todo.md
View File

@ -28,19 +28,19 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JGadget/std-list.cpp">JGadget/std-list.cpp</a> | 6333 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/control.cpp">JMessage/control.cpp</a> | 6416 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DJointTree.cpp">J3D/J3DJointTree.cpp</a> | 6840 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-math.cpp">JStudio/jstudio-math.cpp</a> | 8130 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DTevs.cpp">J2D/J2DTevs.cpp</a> | 8222 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResourceLoader.cpp">JParticle/JPAResourceLoader.cpp</a> | 9869 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceHeap.cpp">JAudio//JAI/JAISequenceHeap.cpp</a> | 9983 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIInitData.cpp">JAudio//JAI/JAIInitData.cpp</a> | 10202 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-control.cpp">JStudio/jstudio-control.cpp</a> | 10213 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAMath.cpp">JParticle/JPAMath.cpp</a> | 10306 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceHeap.cpp">JAudio//JAI/JAISequenceHeap.cpp</a> | 9983 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-control.cpp">JStudio/jstudio-control.cpp</a> | 10198 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIInitData.cpp">JAudio//JAI/JAIInitData.cpp</a> | 10202 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAMath.cpp">JParticle/JPAMath.cpp</a> | 10306 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAEmitterManager.cpp">JParticle/JPAEmitterManager.cpp</a> | 10538 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIObject.cpp">JAudio//JAI/JAIObject.cpp</a> | 11254 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-light.cpp">JStudio_JStage/object-light.cpp</a> | 11408 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASDSPChannel.cpp">JAudio//JAS/JASDSPChannel.cpp</a> | 12076 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASWSParser.cpp">JAudio//JAS/JASWSParser.cpp</a> | 12435 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTaskThread.cpp">JAudio//JAS/JASTaskThread.cpp</a> | 12843 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAiCtrl.cpp">JAudio//JAS/JASAiCtrl.cpp</a> | 14267 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JGadget/std-vector.cpp">JGadget/std-vector.cpp</a> | 15911 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTransform.cpp">J3D/J3DTransform.cpp</a> | 16131 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/stb.cpp">JStudio/stb.cpp</a> | 16172 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JParticle/object-particle.cpp">JStudio_JParticle/object-particle.cpp</a> | 16654 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-camera.cpp">JStudio_JStage/object-camera.cpp</a> | 17755 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JParticle/object-particle.cpp">JStudio_JParticle/object-particle.cpp</a> | 16698 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-camera.cpp">JStudio_JStage/object-camera.cpp</a> | 17755 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DCluster.cpp">J3D/J3DCluster.cpp</a> | 18124 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISystemInterface.cpp">JAudio//JAI/JAISystemInterface.cpp</a> | 19058 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShape.cpp">J3D/J3DShape.cpp</a> | 19462 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JAudio/object-sound.cpp">JStudio_JAudio/object-sound.cpp</a> | 20083 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/resource.cpp">JMessage/resource.cpp</a> | 20331 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASBNKParser.cpp">JAudio//JAS/JASBNKParser.cpp</a> | 20964 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoaderCalcSize.cpp">J3D/J3DModelLoaderCalcSize.cpp</a> | 21199 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIAnimation.cpp">JAudio//JAI/JAIAnimation.cpp</a> | 21573 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindow.cpp">J2D/J2DWindow.cpp</a> | 22771 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DJoint.cpp">J3D/J3DJoint.cpp</a> | 23493 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindow.cpp">J2D/J2DWindow.cpp</a> | 22771 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DJoint.cpp">J3D/J3DJoint.cpp</a> | 23549 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterial.cpp">J2D/J2DMaterial.cpp</a> | 23586 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRHeap.cpp">JKernel/JKRHeap.cpp</a> | 23801 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMtxBuffer.cpp">J3D/J3DMtxBuffer.cpp</a> | 23904 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPADynamicsBlock.cpp">JParticle/JPADynamicsBlock.cpp</a> | 24323 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DTextBoxEx.cpp">J2D/J2DTextBoxEx.cpp</a> | 24399 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 26174 |
@ -69,7 +69,7 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efx2dEffect.cpp">efx2dEffect.cpp</a> | 10340 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebi2DCallBack.cpp">ebi2DCallBack.cpp</a> | 10457 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxObject.cpp">efxObject.cpp</a> | 11240 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/particleMgr.cpp">particleMgr.cpp</a> | 12851 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2Title.cpp">ebiP2Title.cpp</a> | 23731 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxPikmin.cpp">efxPikmin.cpp</a> | 33209 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxBase.cpp">efxBase.cpp</a> | 35283 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxEnemy.cpp">efxEnemy.cpp</a> | 39166 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxBase.cpp">efxBase.cpp</a> | 35235 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxEnemy.cpp">efxEnemy.cpp</a> | 39166 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiScreenMemoryCard.cpp">ebiScreenMemoryCard.cpp</a> | 48588 | | |
### <section id="plugProjectHikinoU">plugProjectHikinoU</section>
@ -99,11 +99,11 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/mapMgr.cpp">mapMgr.cpp</a> | 43345 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 43410 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiMgr.cpp">pikiMgr.cpp</a> | 47880 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 52263 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 52507 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi_demoCheck.cpp">navi_demoCheck.cpp</a> | 57448 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemWeed.cpp">itemWeed.cpp</a> | 62050 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 62915 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 63532 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 64772 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemWeed.cpp">itemWeed.cpp</a> | 62058 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 62915 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 63548 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 64772 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 65612 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayData.cpp">gamePlayData.cpp</a> | 66045 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73150 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 91018 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 116997 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 142649 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 116997 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 142637 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 150933 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 153107 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 161306 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 168069 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 180513 | | |
@ -197,16 +197,16 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/captionMessage.cpp">captionMessage.cpp</a> | 4025 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/aramMgr.cpp">aramMgr.cpp</a> | 4257 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageMgr.cpp">messageMgr.cpp</a> | 6794 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/section.cpp">section.cpp</a> | 8000 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectCamera.cpp">JSTObjectCamera.cpp</a> | 8577 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectGameActor.cpp">JSTObjectGameActor.cpp</a> | 9261 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/loadResource.cpp">loadResource.cpp</a> | 9618 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectParticleActor.cpp">JSTObjectParticleActor.cpp</a> | 10416 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/loadResource.cpp">loadResource.cpp</a> | 9618 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectParticleActor.cpp">JSTObjectParticleActor.cpp</a> | 10461 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/heapStatus.cpp">heapStatus.cpp</a> | 12534 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/sysMaterialAnim.cpp">sysMaterialAnim.cpp</a> | 13325 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/sysShape.cpp">sysShape.cpp</a> | 15109 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/sysShapeModel.cpp">sysShapeModel.cpp</a> | 16166 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectSystem.cpp">JSTObjectSystem.cpp</a> | 17997 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/titleSection.cpp">titleSection.cpp</a> | 19575 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectActor.cpp">JSTObjectActor.cpp</a> | 19715 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/resourceMgr.cpp">resourceMgr.cpp</a> | 21536 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectActor.cpp">JSTObjectActor.cpp</a> | 19718 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/resourceMgr.cpp">resourceMgr.cpp</a> | 21536 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/matMath.cpp">matMath.cpp</a> | 26224 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/moviePlayer.cpp">moviePlayer.cpp</a> | 30654 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/windowMessage.cpp">windowMessage.cpp</a> | 37914 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/bootSection.cpp">bootSection.cpp</a> | 38174 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/system.cpp">system.cpp</a> | 38660 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/movieMessage.cpp">movieMessage.cpp</a> | 48193 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/memoryCard.cpp">memoryCard.cpp</a> | 48550 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/screenMgr.cpp">screenMgr.cpp</a> | 50710 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/pikmin2MemoryCardMgr.cpp">pikmin2MemoryCardMgr.cpp</a> | 50817 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 76087 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/pikmin2MemoryCardMgr.cpp">pikmin2MemoryCardMgr.cpp</a> | 50817 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 76095 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 108929 | | |
### <section id="utilityU">utilityU</section>

2
include/JSystem/J3D/J3DMtxCalc.h
View File

@ -75,7 +75,7 @@ struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
}
virtual ~J3DMtxCalcAnimation() {}; // _08
virtual void setAnmTransform(J3DAnmTransform* p1) { mAnim = p1; } // _0C
virtual void setAnmTransform(J3DAnmTransform* p1) { mBaseAnim = p1; } // _0C
virtual void init(const Vec& p1, const f32 (&p2)[3][4]) { Init::init(p1, p2); } // _24
virtual void calc() // _28
{

4
include/JSystem/JAudio/JAD/JADDataMgr.h
View File

@ -125,8 +125,8 @@ struct PrmDataMgrNode : public DataMgrNode {
virtual bool initInstance(void* buffer, s32 bufferLength)
{
if (initInstance()) {
JSUMemoryInputStream input;
input.setBuffer(buffer, bufferLength);
JSUMemoryInputStream input(buffer, bufferLength);
// input.setBuffer(buffer, bufferLength);
mPrmSetRc->load(input);
return true;
}

8
src/JSystem/J3D/J3DJoint.cpp
View File

@ -702,10 +702,10 @@ J3DJoint::J3DJoint()
mMtxCalc = nullptr;
mMaterial = nullptr;
Vec init = { 0.0f, 0.0f, 0.0f };
mMin = init;
Vec init2 = { 0.0f, 0.0f, 0.0f };
mMax = init2;
JGeometry::TVec3f init = { 0.0f, 0.0f, 0.0f };
mMin = init;
JGeometry::TVec3f init2 = { 0.0f, 0.0f, 0.0f };
mMax = init2;
}
/**

2
src/JSystem/JStudio/jstudio-control.cpp
View File

@ -73,7 +73,7 @@ TControl::TControl()
, _74(0)
, _75(0)
{
Vec vec = JGeometry::TVec3f(0.0f, 0.0f, 0.0f);
Vec vec = { 0.0f, 0.0f, 0.0f };
transformOnSet_setOrigin(vec, 0.0f);
transformOnGet_setOrigin(vec, 0.0f);
/*

4
src/JSystem/JStudio_JParticle/object-particle.cpp
View File

@ -265,10 +265,10 @@ void JStudio_JParticle::TAdaptor_particle::TJPACallback_::execute(JPABaseEmitter
outVec[1].z = srts[1].z;
pos = outVec;
}
emitter->mGlobalTrs = pos[0];
emitter->mGlobalTrs = ((JGeometry::TVec3f*)pos)[0];
JPAGetXYZRotateMtx(65536.0 * (pos[1].x / 360.0), 65536.0 * (pos[1].y / 360.0), 65536.0 * (pos[1].z / 360.0), emitter->mGlobalRot);
JGeometry::TVec3f scaleVec(pos[2]);
JGeometry::TVec3f scaleVec(((JGeometry::TVec3f*)pos)[2]);
emitter->setScale(scaleVec);
} else {
Mtx mtx;

6
src/plugProjectEbisawaU/efxBase.cpp
View File

@ -60,7 +60,7 @@ void TOneEmitter::executeAfter(JPABaseEmitter* emitter)
for (int i = 0; i < createCount; i++) {
JPABaseParticle* particle = emitter->createParticle();
if (particle) {
particle->mOffsetPosition = JGeometry::TVec3f(v1.x, v1.y, v1.z);
particle->mOffsetPosition.set(v1.x, v1.y, v1.z);
}
}
}
@ -166,7 +166,7 @@ void TOneEmitterChasePos::executeAfter(JPABaseEmitter* emitter)
for (int i = 0; i < createCount; i++) {
JPABaseParticle* particle = emitter->createParticle();
if (particle) {
particle->mOffsetPosition = JGeometry::TVec3f(v1->x, v1->y, v1->z);
particle->mOffsetPosition.set(v1->x, v1->y, v1->z);
}
}
}
@ -238,7 +238,7 @@ void TOneEmitterSimple::executeAfter(JPABaseEmitter* emitter)
for (int i = 0; i < createCount; i++) {
JPABaseParticle* particle = emitter->createParticle();
if (particle) {
particle->mOffsetPosition = JGeometry::TVec3f(v1.x, v1.y, v1.z);
particle->mOffsetPosition.set(v1.x, v1.y, v1.z);
}
}
}

2
src/plugProjectKandoU/baseGameSectionKantei.cpp
View File

@ -466,7 +466,7 @@ lbl_8023BEBC:
* @note Address: 0x8023BEF4
* @note Size: 0x164
*/
bool BaseGameSection::ZoomCamera::doUpdate()
void BaseGameSection::ZoomCamera::doUpdate()
{
bool check1 = false; // r4
bool check2 = false; // r5

4
src/plugProjectKandoU/itemUjamushi.cpp
View File

@ -2453,12 +2453,12 @@ Mgr::Mgr()
_30C = 0.0f;
J3DModelData* polyData = getModelData(0);
polyData->newSharedDisplayList(0x40000);
polyData->simpleCalcMaterial(0, j3dDefaultMtx);
polyData->simpleCalcMaterial(0, *(Mtx*)&j3dDefaultMtx);
polyData->makeSharedDL();
J3DModelData* billData = getModelData(1);
billData->newSharedDisplayList(0x40000);
billData->simpleCalcMaterial(0, j3dDefaultMtx);
billData->simpleCalcMaterial(0, *(Mtx*)&j3dDefaultMtx);
billData->makeSharedDL();
_88 = 72.0f;

2
src/plugProjectKandoU/itemWeed.cpp
View File

@ -456,7 +456,7 @@ Mgr::Mgr()
for (int i = 0; i < 4; i++) {
J3DModelData* modelData = getModelData(i);
modelData->newSharedDisplayList(0x40000);
modelData->simpleCalcMaterial(0, j3dDefaultMtx);
modelData->simpleCalcMaterial(0, *(Mtx*)&j3dDefaultMtx);
modelData->makeSharedDL();
}
}

24
src/plugProjectKandoU/pelletMgr.cpp
View File

@ -5531,14 +5531,14 @@ Pellet* PelletMgr::birth(PelletInitArg* arg)
if (strcmp("yes", config->mParams.mUnique.mData) == 0) {
int unk = arg->mPelletIndex;
if (arg->mPelletType == PelletList::OTAKARA) {
u8* result = playData->mZukanStat->mOtakara(unk);
if (*result & 2) {
u8 result = playData->mZukanStat->mOtakara(unk);
if (result & 2) {
mgr->mConfigList->getPelletConfig(arg->mTextIdentifier);
return nullptr;
}
} else if (arg->mPelletType == PelletList::ITEM) {
u8* result = playData->mZukanStat->mItem(unk);
if (*result & 2) {
u8 result = playData->mZukanStat->mItem(unk);
if (result & 2) {
mgr->mConfigList->getPelletConfig(arg->mTextIdentifier);
return nullptr;
}
@ -5585,14 +5585,14 @@ bool PelletMgr::setUse(PelletInitArg* arg)
if (strcmp("yes", config->mParams.mUnique.mData) == 0) {
int unk = arg->mPelletIndex;
if (arg->mPelletType == PelletList::OTAKARA) {
u8* result = playData->mZukanStat->mOtakara(unk);
if (*result & 2) {
u8 result = playData->mZukanStat->mOtakara(unk);
if (result & 2) {
mgr->mConfigList->getPelletConfig(arg->mTextIdentifier);
return false;
}
} else if (arg->mPelletType == PelletList::ITEM) {
u8* result = playData->mZukanStat->mItem(unk);
if (*result & 2) {
u8 result = playData->mZukanStat->mItem(unk);
if (result & 2) {
mgr->mConfigList->getPelletConfig(arg->mTextIdentifier);
return false;
}
@ -5640,13 +5640,13 @@ bool PelletMgr::OtakaraItemCode::isNull()
if (strcmp("yes", config->mParams.mUnique.mData) == 0) {
u8 code = mValue;
if ((u8)(mValue >> 8) == 3) {
u8* result = playData->mZukanStat->mOtakara(code);
if (*result & 2) {
u8 result = playData->mZukanStat->mOtakara(code);
if (result & 2) {
return true;
}
} else {
u8* result = playData->mZukanStat->mItem(code);
if (*result & 2) {
u8 result = playData->mZukanStat->mItem(code);
if (result & 2) {
return true;
}
}

4
src/sysGCU/JSTObjectActor.cpp
View File

@ -523,10 +523,10 @@ void ObjectActor::parseUserData_(u32 p1, void const* p2)
JStudio::stb::data::TParse_TParagraph_data v1(p2);
JStudio::stb::data::TParse_TParagraph_data::TData v2;
v1.getData(&v2);
if (v2.status == 0) {
if (v2.mStatus == 0) {
return;
}
if (v2.fileCount == 0 || v2.status != 0x22 || v2._10 == nullptr) {
if (v2.mFileCount == 0 || v2.mStatus != 0x22 || v2._10 == nullptr) {
return;
}

16
src/sysGCU/JSTObjectParticleActor.cpp
View File

@ -210,26 +210,26 @@ void ObjectParticleActor::parseUserData_(u32 p1, void const* rawData)
JStudio::stb::data::TParse_TParagraph_data paragraph(rawData);
JStudio::stb::data::TParse_TParagraph_data::TData data;
paragraph.getData(&data);
if (data.status == 0) {
if (data.mStatus == 0) {
return;
}
if (data.fileCount == 0 || data.status != 0x60) {
if (data.mFileCount == 0 || data.mStatus != 0x60) {
return;
}
mModelJointIndex = -1;
for (int i = 0; i < data._08; i++) {
OSReport("string:%u,%s\n", i, data.fileCount);
OSReport("string:%u,%s\n", i, data.mFileCount);
if (i == 0) {
if (strcmp(data.fileCount, "kill") == 0) {
if (strcmp((char*)data.mFileCount, "kill") == 0) {
mEfxFlag |= 2;
} else {
mGameObject = mMoviePlayer->mObjectSystem->findCreature(data.fileCount);
mGameObject = mMoviePlayer->mObjectSystem->findCreature((char*)data.mFileCount);
}
} else if (i == 1) {
if (strcmp(data.fileCount, "@ground") == 0) {
if (strcmp((char*)data.mFileCount, "@ground") == 0) {
mModelJointIndex = -2;
} else if (mGameObject != nullptr && mGameObject->mModel != nullptr) {
SysShape::Joint* joint = mGameObject->mModel->getJoint(data.fileCount);
SysShape::Joint* joint = mGameObject->mModel->getJoint((char*)data.mFileCount);
if (joint != nullptr) {
mModelJointIndex = joint->mJointIndex;
} else {
@ -237,7 +237,7 @@ void ObjectParticleActor::parseUserData_(u32 p1, void const* rawData)
}
}
}
data.fileCount = strchr(data.fileCount, 0) + 1;
data.mFileCount = strchr((char*)data.mFileCount, 0) + 1;
}
/*
stwu r1, -0x30(r1)

8
src/sysGCU/graphics.cpp
View File

@ -1927,11 +1927,11 @@ void Graphics::drawTile(Sys::Sphere&, Sys::Sphere&, JUTTexture*)
* @note Address: 0x80426CB8
* @note Size: 0x70C
*/
void Graphics::drawCone(Vector3f& start, Vector3f& end, f32 angle, int limit)
void Graphics::drawCone(Vector3f& start, Vector3f& end, f32 inAngle, int limit)
{
f32 angle = TORADIANS(angle); // f7
Vector3f sep = end - start; // f2, f0, f1
f32 dist = sep.length(); // f31
f32 angle = TORADIANS(inAngle); // f7
Vector3f sep = end - start; // f2, f0, f1
f32 dist = sep.length(); // f31
f32 sinTheta = sinf(angle);
f32 cosTheta = cosf(angle);