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

LINK PSMAINSIDE_DEMO

Browse Source
This commit is contained in:
HeartPiece 2024-05-07 13:10:12 +10:00
parent 60fc0bb262
commit 0767142160
6 changed files with 11 additions and 4853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4361
asm/utilityU/PSMainSide_Demo.s
View File

File diff suppressed because it is too large Load Diff

2
configure.py
View File

@ -1645,7 +1645,7 @@ LIBS = [
["utilityU/PSMainSide_Director", False],
["utilityU/PSMainSide_Factory", False],
["utilityU/PSMainSide_ObjSound", False],
["utilityU/PSMainSide_Demo", False],
["utilityU/PSMainSide_Demo", True],
["utilityU/PSMainSide_Scene", False],
["utilityU/PSMainSide_BossMgr", False],
["utilityU/PSMainSide_Se", False],

5
docs/recommended_todo.md
View File

@ -200,8 +200,7 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Sound.cpp">PSMainSide_Sound.cpp</a> | 11782 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_TrackMap.cpp">PSMainSide_TrackMap.cpp</a> | 17101 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/menu.cpp">menu.cpp</a> | 17351 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_BossMgr.cpp">PSMainSide_BossMgr.cpp</a> | 17562 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Director.cpp">PSMainSide_Director.cpp</a> | 28380 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_DirectorMgr.cpp">PSMainSide_DirectorMgr.cpp</a> | 28495 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Demo.cpp">PSMainSide_Demo.cpp</a> | 34015 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Se.cpp">PSMainSide_Se.cpp</a> | 45041 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Scene.cpp">PSMainSide_Scene.cpp</a> | 49598 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_ObjSound.cpp">PSMainSide_ObjSound.cpp</a> | 86635 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Factory.cpp">PSMainSide_Factory.cpp</a> | 88157 | | |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Se.cpp">PSMainSide_Se.cpp</a> | 45041 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Scene.cpp">PSMainSide_Scene.cpp</a> | 49598 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_ObjSound.cpp">PSMainSide_ObjSound.cpp</a> | 86635 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/utilityU/PSMainSide_Factory.cpp">PSMainSide_Factory.cpp</a> | 88157 |

2
src/utilityU/Makefile
View File

@ -3,7 +3,7 @@ UTILITY_FILES:=\
$(BUILD_DIR)/asm/utilityU/PSMainSide_Director.o\
$(BUILD_DIR)/asm/utilityU/PSMainSide_Factory.o\
$(BUILD_DIR)/asm/utilityU/PSMainSide_ObjSound.o\
$(BUILD_DIR)/asm/utilityU/PSMainSide_Demo.o\
$(BUILD_DIR)/src/utilityU/PSMainSide_Demo.o\
$(BUILD_DIR)/asm/utilityU/PSMainSide_Scene.o\
$(BUILD_DIR)/asm/utilityU/PSMainSide_BossMgr.o\
$(BUILD_DIR)/asm/utilityU/PSMainSide_Se.o\

492
src/utilityU/PSMainSide_Demo.cpp
View File

@ -484,7 +484,7 @@ void Demo::onDemoTop()
scene->mSeqMgr.stopAllSound(15);
if (envse) {
envse->off();
if (scene->isCave() && !scene->isPollutUp()) {
if (scene->isCave() && !static_cast<Scene_Cave*>(scene)->isPollutUp()) {
envse->on(PSSE_EV_POLUTION_MIX01, true);
envse->on(PSSE_EV_POLUTION_MIX02, true);
}
@ -602,492 +602,6 @@ void Demo::onDemoEnd()
if (mMovieEndSE != 0xffffffff) {
PSSystem::spSysIF->playSystemSe(mMovieEndSE, 0);
}
/*
stwu r1, -0x20(r1)
mflr r0
lis r4, lbl_8049D080@ha
stw r0, 0x24(r1)
stmw r27, 0xc(r1)
mr r29, r3
addi r31, r4, lbl_8049D080@l
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r0, 0
bne lbl_80466BA8
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1d3
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466BA8:
lwz r28, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r28, 0
bne lbl_80466BC8
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1dc
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466BC8:
lwz r0, 4(r28)
cmplwi r0, 0
bne lbl_80466BE8
addi r3, r31, 0x2c
addi r5, r31, 0x14
li r4, 0xcf
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466BE8:
lwz r3, 4(r28)
lwz r28, 4(r3)
cmplwi r28, 0
bne lbl_80466C0C
addi r3, r31, 0x2c
addi r5, r31, 0x38
li r4, 0xd1
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466C0C:
mr r3, r28
lwz r12, 0(r28)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
lwz r0,
"sInstance__Q28PSSystem34SingletonBase<Q23PSM11ObjCalcBase>"@sda21(r13) cmplwi
r0, 0 bne lbl_80466C40 addi r3, r31, 0x86c addi r5, r31, 0x14 li
r4, 0x89 crclr 6 bl panic_f__12JUTExceptionFPCciPCce
lbl_80466C40:
lwz r3,
"sInstance__Q28PSSystem34SingletonBase<Q23PSM11ObjCalcBase>"@sda21(r13) li r4, 0
lwz r12, 0(r3)
lwz r12, 0x14(r12)
mtctr r12
bctrl
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r0, 0
bne lbl_80466C78
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1d3
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466C78:
lwz r28, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r28, 0
bne lbl_80466C98
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1dc
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466C98:
lwz r0, 4(r28)
cmplwi r0, 0
bne lbl_80466CB8
addi r3, r31, 0x2c
addi r5, r31, 0x14
li r4, 0xcf
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466CB8:
lwz r3, 4(r28)
lwz r28, 4(r3)
cmplwi r28, 0
bne lbl_80466CDC
addi r3, r31, 0x2c
addi r5, r31, 0x38
li r4, 0xd1
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466CDC:
mr r3, r28
lwz r12, 0(r28)
lwz r12, 0x50(r12)
mtctr r12
bctrl
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r0, 0
bne lbl_80466D10
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1d3
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466D10:
lwz r28, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r28, 0
bne lbl_80466D30
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1dc
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466D30:
lwz r0, 4(r28)
cmplwi r0, 0
bne lbl_80466D50
addi r3, r31, 0x2c
addi r5, r31, 0x14
li r4, 0xcf
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466D50:
lwz r3, 4(r28)
lwz r30, 4(r3)
cmplwi r30, 0
bne lbl_80466D74
addi r3, r31, 0x2c
addi r5, r31, 0x38
li r4, 0xd1
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466D74:
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0x40(r12)
mtctr r12
bctrl
clrlwi. r0, r3, 0x18
bne lbl_80466DA4
addi r3, r31, 0x858
addi r5, r31, 0x14
li r4, 0x177
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466DA4:
lwz r12, 0(r30)
mr r3, r30
lwz r28, 0x28(r29)
lwz r12, 0x2c(r12)
mtctr r12
bctrl
or. r27, r3, r3
beq lbl_80466EF0
mr r3, r28
addi r4, r31, 0x94
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x80
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x168
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0xb0
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x180
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x26c
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x37c
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x878
bl strcmp
cmpwi r3, 0
beq lbl_80466E78
mr r3, r28
addi r4, r31, 0x5c
bl strcmp
cmpwi r3, 0
bne lbl_80466EE8
lbl_80466E78:
mr r3, r27
bl off__Q28PSSystem8EnvSeMgrFv
mr r3, r30
lwz r12, 0(r30)
lwz r12, 0x58(r12)
mtctr r12
bctrl
clrlwi. r0, r3, 0x18
beq lbl_80466ED8
mr r3, r30
lwz r12, 0(r30)
lwz r12, 0x6c(r12)
mtctr r12
bctrl
clrlwi. r0, r3, 0x18
bne lbl_80466ED8
mr r3, r27
li r4, 0x3079
li r5, 1
bl on__Q28PSSystem8EnvSeMgrFUlb
mr r3, r27
li r4, 0x307a
li r5, 1
bl on__Q28PSSystem8EnvSeMgrFUlb
lbl_80466ED8:
mr r3, r27
li r4, 0
bl setAllPauseFlag__Q28PSSystem8EnvSeMgrFUc
b lbl_80466EF0
lbl_80466EE8:
mr r3, r27
bl reservePauseOff__Q28PSSystem8EnvSeMgrFv
lbl_80466EF0:
mr r3, r28
addi r4, r31, 0x5a8
bl strcmp
cmpwi r3, 0
bne lbl_80466FA0
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r0, 0
bne lbl_80466F24
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1d3
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466F24:
lwz r28, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r28, 0
bne lbl_80466F44
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1dc
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466F44:
lwz r0, 4(r28)
cmplwi r0, 0
bne lbl_80466F64
addi r3, r31, 0x2c
addi r5, r31, 0x14
li r4, 0xcf
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466F64:
lwz r3, 4(r28)
lwz r28, 4(r3)
cmplwi r28, 0
bne lbl_80466F88
addi r3, r31, 0x2c
addi r5, r31, 0x38
li r4, 0xd1
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466F88:
mr r3, r28
lwz r12, 0(r28)
lwz r12, 0x1c(r12)
mtctr r12
bctrl
b lbl_80467184
lbl_80466FA0:
mr r3, r28
addi r4, r31, 0x1ec
bl strcmp
cmpwi r3, 0
bne lbl_80467094
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r0, 0
bne lbl_80466FD4
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1d3
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466FD4:
lwz r28, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r28, 0
bne lbl_80466FF4
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1dc
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80466FF4:
lwz r0, 4(r28)
cmplwi r0, 0
bne lbl_80467014
addi r3, r31, 0x2c
addi r5, r31, 0x14
li r4, 0xc7
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80467014:
lwz r3, 4(r28)
lwz r28, 4(r3)
cmplwi r28, 0
bne lbl_80467038
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1e5
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80467038:
addi r3, r28, 0x10
li r4, 1
bl getSeq__Q28PSSystem6SeqMgrFUl
or. r28, r3, r3
bne lbl_80467060
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1e7
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80467060:
cmplwi r28, 0
bne lbl_8046707C
addi r3, r31, 0
addi r5, r31, 0x14
li r4, 0x342
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_8046707C:
mr r3, r28
lwz r12, 0x10(r28)
lwz r12, 0x14(r12)
mtctr r12
bctrl
b lbl_80467184
lbl_80467094:
mr r3, r28
addi r4, r31, 0x610
bl strcmp
cmpwi r3, 0
bne lbl_80467184
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r0, 0
bne lbl_804670C8
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1d3
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_804670C8:
lwz r28, spSceneMgr__8PSSystem@sda21(r13)
cmplwi r28, 0
bne lbl_804670E8
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1dc
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_804670E8:
lwz r0, 4(r28)
cmplwi r0, 0
bne lbl_80467108
addi r3, r31, 0x2c
addi r5, r31, 0x14
li r4, 0xc7
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80467108:
lwz r3, 4(r28)
lwz r28, 4(r3)
cmplwi r28, 0
bne lbl_8046712C
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1e5
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_8046712C:
addi r3, r28, 0x10
li r4, 1
bl getSeq__Q28PSSystem6SeqMgrFUl
or. r28, r3, r3
bne lbl_80467154
addi r3, r31, 0x20
addi r5, r31, 0x14
li r4, 0x1e7
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80467154:
cmplwi r28, 0
bne lbl_80467170
addi r3, r31, 0
addi r5, r31, 0x14
li r4, 0x346
crclr 6
bl panic_f__12JUTExceptionFPCciPCce
lbl_80467170:
mr r3, r28
lwz r12, 0x10(r28)
lwz r12, 0x14(r12)
mtctr r12
bctrl
lbl_80467184:
addi r3, r30, 0x10
bl reservePauseOffAllSeq__Q28PSSystem6SeqMgrFv
lwz r12, 0x24(r29)
cmplwi r12, 0
beq lbl_804671A0
mtctr r12
bctrl
lbl_804671A0:
lwz r4, 0x20(r29)
addis r0, r4, 1
cmplwi r0, 0xffff
beq lbl_804671BC
lwz r3, spSysIF__8PSSystem@sda21(r13)
li r5, 0
bl playSystemSe__Q28PSSystem5SysIFFUlUl
lbl_804671BC:
lmw r27, 0xc(r1)
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
*/
}
/**
@ -1139,6 +653,10 @@ void PSMCancelToPauseOffMainBgm()
/**
* @note Address: 0x8046751C
* @note Size: 0xEC
*
* @note This should be weak and in the same header as Scene_Game, but it refuses
* to spawn as a weak function and not inline in functions above if so, even with FORCE_DONT_INLINE.
* So here it lives.
*/
PSM::Scene_Game* PSMGetGameSceneA()
{

2
tools/progress.csv
View File

@ -971,3 +971,5 @@ You have 4389 out of 10000 Pokos and 111 out of 201 treasures.",2024-05-07 01:31
You have 4391 out of 10000 Pokos and 111 out of 201 treasures.",2024-05-07 02:42:57.754229
4416,2054496,0.44160373075811976,111,394347,0.5531930712514168,"
You have 4416 out of 10000 Pokos and 111 out of 201 treasures.",2024-05-07 12:30:15.109648
4445,2068392,0.44459060707358344,111,396373,0.5560351599762083,"
You have 4445 out of 10000 Pokos and 111 out of 201 treasures.",2024-05-07 13:07:41.132459

1 code_count_in_pokos code_completion_in_bytes code_completion_in_percentage data_count_in_treasures data_completion_in_bytes data_completion_in_percentage sentence created_at
971
972
973
974
975