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

fix a bit more baseGameSection

Browse Source
This commit is contained in:
PikHacker 2024-05-18 23:09:06 -04:00
parent ecdea843de
commit ca925a45f1
4 changed files with 9 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -2,7 +2,7 @@ Language: Cpp
BasedOnStyle: WebKit
ColumnLimit: 140
SortIncludes: true
SortIncludes: false
IndentWidth: 4
TabWidth: 4

8
include/JSystem/J2D/J2DPrint.h
View File

@ -55,11 +55,9 @@ struct J2DPrint {
mGlyphHeight = (height > 0.0f) ? height : 0.0f;
}
inline void setColors(JUtility::TColor gradColor, JUtility::TColor charColor)
{
mCharColor = charColor;
mGradientColor = gradColor;
}
inline void setCharColor(JUtility::TColor color) { mCharColor = color; }
inline void setGradColor(JUtility::TColor color) { mGradientColor = color; }
static const u8* mStrBuff;
static size_t mStrBuffSize;

4
include/PSM/BossBgmFader.h
View File

@ -37,7 +37,7 @@ struct TypedProc : public JSUList<EnemyBoss> {
f32 mMaxDistance; // _2C
DirectorUpdator* mDirectorUpdator; // _30
u8 mNeedJump; // _34
f32 _38; // _38
// f32 _38; // _38
};
/**
@ -93,7 +93,7 @@ struct Mgr : ::PSSystem::SingletonBase<Mgr> {
}
// _00 VTBL
TypedProc_MidBoss mTypedProc; // _04
TypedProc mTypedProc; // _04
};
} // namespace BossBgmFader
} // namespace PSM

236
src/plugProjectKandoU/baseGameSection.cpp
View File

@ -1327,12 +1327,11 @@ void BaseGameSection::prepareFountainOn(Vector3f& suroundPos)
piki->endStick();
piki->mFsm->transitForce(piki, PIKISTATE_Walk, nullptr);
piki->getCreatureID();
PikiAI::ActFormationInitArg arg(aliveOrima, false);
piki->mNavi = aliveOrima;
arg.mIsDemoFollow = true; // MAKE UP YOUR DAMN MIND I STG
piki->mBrain->start(PikiAI::ACT_Formation, &arg);
@ -1440,7 +1439,8 @@ void BaseGameSection::draw2D(Graphics& gfx)
gfx.mOrthoGraph.setPort();
J2DPrint print(JFWSystem::systemFont, 0.0f);
print.initiate();
print.setColors(JUtility::TColor(0x38, 0x9f, 0xf7, 0xff), JUtility::TColor(0x9e, 0xdb, 0xff, 0xff));
print.setCharColor(JUtility::TColor(158, 219, 255, 255));
print.setGradColor(JUtility::TColor(56, 159, 247, 255));
JKRHeap::sCurrentHeap->getFreeSize();
// print was likely showing how much head space was left
}
@ -2046,235 +2046,6 @@ void BaseGameSection::setupFixMemory_dvdload()
createScreenRootNode();
sys->heapStatusEnd("setupFixMemory");
/*
stwu r1, -0x20(r1)
mflr r0
lis r4, lbl_8047C948@ha
li r5, 0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
addi r31, r4, lbl_8047C948@l
addi r4, r31, 0x2e0
stw r30, 0x18(r1)
mr r30, r3
stw r29, 0x14(r1)
stw r28, 0x10(r1)
lwz r3, sys@sda21(r13)
bl heapStatusStart__6SystemFPcP7JKRHeap
li r0, 0
addi r3, r31, 0x2f0
stw r0, 8(r1)
li r4, 0
li r5, 0
li r6, 0
li r7, 0
li r8, 1
li r9, 0
li r10, 0
bl
loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
mr r0, r3
li r3, 0x40
mr r28, r0
bl __nw__FUl
or. r29, r3, r3
beq lbl_80150408
li r0, 0
mr r4, r28
stw r0, 0x28(r29)
li r5, 0
bl storeTIMG__10JUTTextureFPC7ResTIMGUc
lbz r0, 0x3b(r29)
rlwinm r0, r0, 0, 0x1e, 0x1e
stb r0, 0x3b(r29)
lbl_80150408:
stw r29, 0xf4(r30)
addi r4, r31, 0x304
li r5, 0
lwz r3, sys@sda21(r13)
bl heapStatusStart__6SystemFPcP7JKRHeap
li r3, 0x40
bl __nw__FUl
or. r29, r3, r3
beq lbl_80150454
bl getRenderModeObj__6SystemFv
lhz r28, 6(r3)
bl getRenderModeObj__6SystemFv
lhz r0, 4(r3)
mr r3, r29
rlwinm r5, r28, 0x1f, 0x11, 0x1f
li r6, 4
rlwinm r4, r0, 0x1f, 0x11, 0x1f
bl __ct__10JUTTextureFii9_GXTexFmt
mr r29, r3
lbl_80150454:
stw r29, 0x154(r30)
addi r4, r31, 0x304
lwz r0, 0x154(r30)
lwz r3, gameSystem__4Game@sda21(r13)
stw r0, 0x54(r3)
lwz r3, sys@sda21(r13)
bl heapStatusEnd__6SystemFPc
lwz r3, sys@sda21(r13)
addi r4, r31, 0x14c
li r5, 0
bl heapStatusStart__6SystemFPcP7JKRHeap
bl globalInstance__11ParticleMgrFv
lwz r3, particleMgr@sda21(r13)
lis r4, 0x18
bl createHeap__11ParticleMgrFUl
lwz r3, particleMgr@sda21(r13)
addi r4, r31, 0x310
li r5, 0x7d0
li r6, 0x12c
li r7, 0x80
bl createMgr__11ParticleMgrFPcUlUlUl
lwz r4, particleMgr@sda21(r13)
mr r3, r30
bl addGenNode__Q24Game14BaseHIOSectionFP5CNode
bl globalInstance__14TParticle2dMgrFv
lis r4, 0x0003E800@ha
lwz r3, particle2dMgr@sda21(r13)
addi r4, r4, 0x0003E800@l
bl createHeap__14TParticle2dMgrFUl
lwz r3, particle2dMgr@sda21(r13)
addi r4, r31, 0x330
li r5, 0x1d4
li r6, 0x28
li r7, 0x80
bl createMgr__14TParticle2dMgrFPcUlUlUl
lwz r4, particle2dMgr@sda21(r13)
mr r3, r30
bl addGenNode__Q24Game14BaseHIOSectionFP5CNode
lwz r3, particleMgr@sda21(r13)
bl beginEntryModelEffect__11ParticleMgrFv
li r3, 0x30
bl __nw__FUl
or. r29, r3, r3
beq lbl_80150520
bl __ct__5CNodeFv
lis r4, __vt__15ModelEffectData@ha
lis r3, __vt__Q23efx13OnyonSpotData@ha
addi r0, r4, __vt__15ModelEffectData@l
stw r0, 0(r29)
addi r0, r3, __vt__Q23efx13OnyonSpotData@l
stw r0, 0(r29)
lbl_80150520:
mr r3, r29
bl entry__15ModelEffectDataFv
lwz r3, particleMgr@sda21(r13)
bl endEntryModelEffect__11ParticleMgrFv
lwz r3, particleMgr@sda21(r13)
bl Instance_TPkEffectMgr__11ParticleMgrFv
lwz r3, sys@sda21(r13)
addi r4, r31, 0x14c
bl heapStatusEnd__6SystemFPc
li r3, 0x18
bl __nw__FUl
or. r0, r3, r3
beq lbl_8015055C
bl __ct__Q24Game9UpdateMgrFv
mr r0, r3
lbl_8015055C:
stw r0, collisionUpdateMgr__4Game@sda21(r13)
mr r3, r0
li r4, 3
bl create__Q24Game9UpdateMgrFi
lwz r3, sys@sda21(r13)
addi r4, r31, 0x358
li r5, 0
bl heapStatusStart__6SystemFPcP7JKRHeap
li r3, 0xd0
bl __nw__FUl
or. r4, r3, r3
beq lbl_80150594
bl __ct__Q24Game7NaviMgrFv
mr r4, r3
lbl_80150594:
cmplwi r4, 0
stw r4, naviMgr__4Game@sda21(r13)
beq lbl_801505A4
addi r4, r4, 0x1c
lbl_801505A4:
lwz r3, gameSystem__4Game@sda21(r13)
bl addObjectMgr__Q24Game10GameSystemFP16GenericObjectMgr
lwz r3, naviMgr__4Game@sda21(r13)
lwz r12, 0(r3)
lwz r12, 0xa4(r12)
mtctr r12
bctrl
li r3, 0x80
bl __nw__FUl
or. r4, r3, r3
beq lbl_801505D8
bl __ct__Q24Game7PikiMgrFv
mr r4, r3
lbl_801505D8:
cmplwi r4, 0
stw r4, pikiMgr__4Game@sda21(r13)
beq lbl_801505E8
addi r4, r4, 0x1c
lbl_801505E8:
lwz r3, gameSystem__4Game@sda21(r13)
bl addObjectMgr__Q24Game10GameSystemFP16GenericObjectMgr
lwz r4, pikiMgr__4Game@sda21(r13)
mr r3, r30
bl addGenNode__Q24Game14BaseHIOSectionFP5CNode
lwz r4, naviMgr__4Game@sda21(r13)
mr r3, r30
bl addGenNode__Q24Game14BaseHIOSectionFP5CNode
lwz r3, pikiMgr__4Game@sda21(r13)
lwz r4, 0x114(r30)
lwz r12, 0(r3)
lwz r12, 0x9c(r12)
mtctr r12
bctrl
lwz r3, sys@sda21(r13)
addi r4, r31, 0x358
bl heapStatusEnd__6SystemFPc
li r3, 0x40
bl __nw__FUl
or. r0, r3, r3
beq lbl_80150644
bl __ct__Q24Game9PelletMgrFv
mr r0, r3
lbl_80150644:
stw r0, pelletMgr__4Game@sda21(r13)
mr r3, r0
li r4, 0
bl createManagers__Q24Game9PelletMgrFUl
lwz r4, pelletMgr__4Game@sda21(r13)
cmplwi r4, 0
beq lbl_80150664
addi r4, r4, 0x1c
lbl_80150664:
lwz r3, gameSystem__4Game@sda21(r13)
bl addObjectMgr__Q24Game10GameSystemFP16GenericObjectMgr
mr r3, r30
bl createScreenRootNode__Q24Game14BaseHIOSectionFv
lwz r3, sys@sda21(r13)
addi r4, r31, 0x2e0
bl heapStatusEnd__6SystemFPc
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r28, 0x10(r1)
mtlr r0
addi r1, r1, 0x20
blr
*/
}
} // namespace Game
@ -2501,7 +2272,6 @@ void BaseGameSection::setupFloatMemory()
sys->heapStatusEnd("PlatCellMgr");
}
sys->heapStatusEnd("CellMgr");
if (cave) {
static_cast<RoomMapMgr*>(mapMgr)->placeObjects();