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

Link screenMgr.cpp

Browse Source
This commit is contained in:
HeartPiece 2024-05-14 22:16:00 +10:00
parent 3f4f511c5d
commit d318357056
10 changed files with 248 additions and 3085 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1866
asm/sysGCU/screenMgr.s
View File

File diff suppressed because it is too large Load Diff

2
configure.py
View File

@ -1624,7 +1624,7 @@ LIBS = [
["sysGCU/captionMgr", True],
["sysGCU/captionMessage", True],
["sysGCU/screenScene", True],
["sysGCU/screenMgr", False],
["sysGCU/screenMgr", True],
["sysGCU/screenObj", True],
["sysGCU/JSTObjectParticleActor", False],
["sysGCU/moviePlayerAudio", True],

6
docs/recommended_todo.md
View File

@ -47,7 +47,7 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 31011 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-actor.cpp">JStudio_JStage/object-actor.cpp</a> | 35187 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 35247 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 35637 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAParticle.cpp">JParticle/JPAParticle.cpp</a> | 36971 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 39462 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 40290 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 46511 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 41169 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 46511 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 47225 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 48617 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 50054 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 52981 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 56856 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 58986 |
@ -188,8 +188,8 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/moviePlayer.cpp">moviePlayer.cpp</a> | 26325 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/memoryCard.cpp">memoryCard.cpp</a> | 32750 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/system.cpp">system.cpp</a> | 32972 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/windowMessage.cpp">windowMessage.cpp</a> | 37900 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/bootSection.cpp">bootSection.cpp</a> | 38565 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/movieMessage.cpp">movieMessage.cpp</a> | 44324 |
| <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> | 50877 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 76185 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 102011 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/pikmin2MemoryCardMgr.cpp">pikmin2MemoryCardMgr.cpp</a> | 50877 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 76185 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 102011 | | |
### <section id="utilityU">utilityU</section>
| File | Size (bytes) | File | Size (bytes) |

4
include/Screen/SceneInfoList.h
View File

@ -17,9 +17,7 @@ namespace Screen {
struct SceneInfoList : public CNode {
SceneInfoList();
virtual ~SceneInfoList(); // _00
// virtual void _08() = 0; // _08
virtual ~SceneInfoList() { } // _00
void set(s32, og::Screen::DispMemberBase*);

8
include/Screen/screenMgr.h
View File

@ -77,6 +77,10 @@ struct Mgr : public MgrBase {
P2ASSERTLINE(280, controller);
}
static Mgr* sScreenMgr;
inline SceneInfoList* getFirstList() { return static_cast<SceneInfoList*>(mSceneInfoList.mChild); }
// _00 = VTBL
// _00-_18 = MgrBase
BitFlag<u32> mFlags; // _18
@ -88,9 +92,7 @@ struct Mgr : public MgrBase {
CNode mCommandList; // _44
JKRSolidHeap* mCurrHeap; // _5C
CNode mBackupInfoList; // _60
CNode mSceneInfoList; // _78, treat as SceneInfoList // NOTE: Why can't this just be SceneInfoList?
static Mgr* sScreenMgr;
CNode mSceneInfoList; // _78, treat as SceneInfoList
};
inline void checkSceneList(SceneInfoList* list) { P2ASSERTLINE(329, list); }

2
include/Screen/screenObj.h
View File

@ -58,7 +58,7 @@ struct MgrCommand : public CNode {
// _00 = VTBL
// _00-_18 = CNode
int mArgType; // _18
char* mScreenArgBufferPtr; // _1C
void* mScreenArgBufferPtr; // _1C
char mScreenArgBuffer[0x40]; // _20
og::Screen::DispMemberBase* mDispBufferPtr; // _60
char mDispBuffer[0x400]; // _64

51
src/JSystem/JAudio/JAS/JASAramStream.cpp
View File

@ -541,10 +541,45 @@ bool JASAramStream::load()
return false;
}
// u32
// for (int i = 0; i < _24A; i++) {
// if (JKRAram::mainRamToAram(sReadBuffer, ))
// }
u32* preBuffer = (u32*)sReadBuffer;
u32 size = _238 + (_1FC * sBlockSize);
for (int i = 0; i < _24A; i++) {
if (JKRMainRamToAram((u8*)(sReadBuffer + (preBuffer[1] + 0x20)), size + (i * sBlockSize * _250), ((u32*)sReadBuffer)[1], Switch_0,
0, nullptr, -1, nullptr)
== 0) {
sFatalErrorFlag = true;
return false;
}
}
_1FC++;
if (_1FC >= _1F8) {
int val200 = _200 + (_1F8 - 1);
if (_258) {
while (val200 > val2) {
val200 = (val2 - val200) + val4;
}
}
if (val200 == val2 || val200 + 2 == val2) {
_1F8 = _250;
OSSendMessage(&mMsgQueueB, (void*)5, OS_MESSAGE_BLOCK);
} else {
_1F8 = _250 - 1;
}
for (int i = 0; i < _24A; i++) {
_220[0][i] = ((s16*)preBuffer)[2 * i + 4];
_220[1][i] = ((s16*)preBuffer)[2 * i + 5];
}
_1FC = 0;
}
_200++;
if (_200 > val2 && _258) {
_200 = val4;
}
return true;
/*
stwu r1, -0x30(r1)
mflr r0
@ -781,11 +816,12 @@ s32 JASAramStream::channelProcCallback(void* stream) { return static_cast<JASAra
s32 JASAramStream::dvdErrorCheck(void*)
{
u32 status = DVDGetDriveStatus();
// WHY WILL THIS NOT SPAWN A JUMP TABLE
switch (status) {
case DVD_STATE_END:
sSystemPauseFlag = false;
break;
case DVD_STATE_BUSY:
case DVD_STATE_WAITING:
case DVD_STATE_COVER_CLOSED:
case DVD_STATE_NO_DISK:
@ -796,9 +832,12 @@ s32 JASAramStream::dvdErrorCheck(void*)
case DVD_STATE_IGNORED:
case DVD_STATE_CANCELED:
case DVD_STATE_RETRY:
case DVD_STATE_FATAL_ERROR:
case 0xFFFFFFFF:
default:
sSystemPauseFlag = true;
break;
case DVD_STATE_BUSY:
break;
}
return 0;
/*

2
src/sysGCU/Makefile
View File

@ -61,7 +61,7 @@ GC_FILES:=\
$(BUILD_DIR)/src/sysGCU/captionMgr.o\
$(BUILD_DIR)/src/sysGCU/captionMessage.o\
$(BUILD_DIR)/src/sysGCU/screenScene.o\
$(BUILD_DIR)/asm/sysGCU/screenMgr.o\
$(BUILD_DIR)/src/sysGCU/screenMgr.o\
$(BUILD_DIR)/src/sysGCU/screenObj.o\
$(BUILD_DIR)/asm/sysGCU/JSTObjectParticleActor.o\
$(BUILD_DIR)/src/sysGCU/moviePlayerAudio.o\

1390
src/sysGCU/screenMgr.cpp
View File

File diff suppressed because it is too large Load Diff

2
tools/progress.csv
View File

@ -981,3 +981,5 @@ You have 4490 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-08 16:06
You have 4507 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-08 16:32:30.591874
4528,2106872,0.452861692322507,112,400248,0.5614710404345338,"
You have 4528 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-08 18:40:42.806286
4541,2112992,0.45417715598475783,112,400727,0.5621429853995757,"
You have 4541 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-14 22:14:35.311817

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
981
982
983
984
985