Link messageMgr.cpp

2024-11-23 05:20:06 +00:00 · 2024-04-12 21:15:51 +10:00 · 2024-04-12 21:15:51 +10:00 · fa597aec8b
commit fa597aec8b
parent 2ed6033588
7 changed files with 43 additions and 1106 deletions
--- a/asm/sysGCU/messageMgr.s
+++ b/asm/sysGCU/messageMgr.s
--- a/configure.py
+++ b/configure.py
@ -1597,7 +1597,7 @@ LIBS = [
            ["sysGCU/moviePlayerPauseAndDraw", True],
            ["sysGCU/JSTObjectSpecialActor", True],
            ["sysGCU/messageSequence", True],
-            ["sysGCU/messageMgr", False],
+            ["sysGCU/messageMgr", True],
            ["sysGCU/messageObj", True],
            ["sysGCU/messageRendering", False],
            ["sysGCU/message", True],
--- a/docs/recommended_todo.md
+++ b/docs/recommended_todo.md
@ -55,7 +55,7 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 55221 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 58986 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 61174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 75520 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 80652 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 84157 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 84860 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 84204 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 84860 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 89090 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 123297 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 127830 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 165716 |  |  |
@ -190,19 +190,19 @@
 ### <section id="sysGCU">sysGCU</section>
 | File | Size (bytes) | File | Size (bytes) |
 | ---- | ---- | ---- | ---- |
-| <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> | 6974 |
-| <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> | 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> | 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> | 30673 | <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> | 38359 | <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> | 76095 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 108929 |
+| <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/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> | 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> | 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> | 30673 |
+| <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> | 38359 |
+| <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> | 76095 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 108929 |  |  |

 ### <section id="utilityU">utilityU</section>
 | File | Size (bytes) | File | Size (bytes) |
--- a/src/JSystem/JAudio/JAS/JASTrack.cpp
+++ b/src/JSystem/JAudio/JAS/JASTrack.cpp
@ -813,14 +813,14 @@ bool JASTrack::noteOff(u8 channelIndex, u16 p2)
 * @note Address: 0x8009FA64
 * @note Size: 0x64
 */
-int JASTrack::gateOn(u8 p1, s32 p2, s32 p3, s32 p4)
+int JASTrack::gateOn(u8 chanIdx, s32 p2, s32 p3, s32 updateTimer)
 {
-	JASChannel* channel = mChannels[p1];
+	JASChannel* channel = mChannels[chanIdx];
 	if (channel == nullptr) {
 		return -1;
 	}
 	JASBankMgr::gateOn(channel, p2, p3);
-	channel->mUpdateTimer = p4;
+	channel->mUpdateTimer = updateTimer;
 	return 0;
 }

@ -828,12 +828,12 @@ int JASTrack::gateOn(u8 p1, s32 p2, s32 p3, s32 p4)
 * @note Address: 0x8009FAC8
 * @note Size: 0x2C
 */
-BOOL JASTrack::checkNoteStop(s32 p1)
+BOOL JASTrack::checkNoteStop(s32 chanIdx)
 {
-	if (mChannels[p1] == nullptr) {
+	if (mChannels[chanIdx] == nullptr) {
 		return true;
 	}
-	return mChannels[p1]->mStatus == JASChannel::STATUS_INACTIVE;
+	return mChannels[chanIdx]->mStatus == JASChannel::STATUS_INACTIVE;
 }

 /**
@ -2678,7 +2678,7 @@ lbl_800A1768:
 * @note Address: 0x800A1778
 * @note Size: 0x94
 */
-u32 JASTrack::readReg32(u8)
+u32 JASTrack::readReg32(u8 reg)
 {
 	/*
 	stwu     r1, -0x10(r1)
--- a/src/sysGCU/Makefile
+++ b/src/sysGCU/Makefile
@ -34,7 +34,7 @@ GC_FILES:=\
 	$(BUILD_DIR)/src/sysGCU/moviePlayerPauseAndDraw.o\
 	$(BUILD_DIR)/src/sysGCU/JSTObjectSpecialActor.o\
 	$(BUILD_DIR)/src/sysGCU/messageSequence.o\
-	$(BUILD_DIR)/asm/sysGCU/messageMgr.o\
+	$(BUILD_DIR)/src/sysGCU/messageMgr.o\
 	$(BUILD_DIR)/src/sysGCU/messageObj.o\
 	$(BUILD_DIR)/asm/sysGCU/messageRendering.o\
 	$(BUILD_DIR)/src/sysGCU/message.o\
--- a/src/sysGCU/messageMgr.cpp
+++ b/src/sysGCU/messageMgr.cpp
@ -60,11 +60,15 @@ Mgr::Mgr(JKRExpHeap* heap)

 	sys->heapStatusStart("MessageMgr", nullptr);

-	mMaxTextures    = new int[1];
-	mImageLists     = new JUTTexture**[1];
-	mMaxTextures[0] = 0;
-	mImageLists[0]  = new JUTTexture*;
-	mImageLists[0]  = nullptr;
+	mMaxTextures = new int[1];
+	mImageLists  = new JUTTexture**[1];
+
+	// dumb.
+	for (int i = 0; i < 1; i++) {
+		mMaxTextures[i] = 0;
+		mImageLists[i]  = new JUTTexture*;
+		mImageLists[i]  = nullptr;
+	}

 	sys->heapStatusStart("font res", nullptr);
 	setupFont("pikmin2main.bfn", heap);
@ -125,8 +129,10 @@ void Mgr::setupTex()
 	JKRArchive* imgarc = JKRMountArchive("/user/Yamashita/arc/gameTex.szs", JKRArchive::EMM_Mem, nullptr, JKRArchive::EMD_Head);
 	createImage(ImageGroup::ID0, 11);

+	ResTIMG* timg;
 	for (int i = 0; i < mMaxTextures[0]; i++) {
-		ResTIMG* timg = JKRGetArchiveImageResource(imgarc, cBtnTexName[i]);
+		// dont even ask.
+		timg = (ResTIMG*)JKRGetArchiveImageResource(imgarc, cBtnTexName[i]);
 		P2ASSERTLINE(344, timg);
 		setImage(ImageGroup::ID0, i, new JUTTexture(timg));
 	}
@ -156,10 +162,10 @@ void Mgr::setupFont(char const* path, JKRExpHeap* heap)

 		P2ASSERTLINE(378, mFont->mIsValid);
 		static_cast<JUTCacheFont*>(mFont)->mPagingType = JUTCacheFont::CFPAGETYPE_Unk1;
-		static_cast<JUTCacheFont*>(mFont)->loadCache_string(
-		    "\tあいうえおかきくけこさしすせそたちすてとなにぬねのはひすへほまみむめもやゆよわん\tアイウエオカキクケコサシスセソタチツテトナ"
-		    "ニヌネノハヒフヘホマミ ムメモヤユヨワン",
-		    true);
+		static_cast<JUTCacheFont*>(mFont)->loadCache_string("\tあいうえおかきくけこさしすせそたちすてとなにぬねのはひすへほまみむめもやゆよ"
+		                                                    "わん\tアイウエオカキクケコサシスセソ\タチツテトナ"
+		                                                    "ニヌネノハヒフヘホマミムメモヤユヨワン\t",
+		                                                    true); // this is just all the characters in the japanese font sheet lol
 		delete file;
 		fontarc->unmount();
 	} else {
@ -230,7 +236,7 @@ void Mgr::setupMessageResource(JKRArchive* arc, char const* path)
 	sys->heapStatusStart("ƒ<EFBFBD>ƒbƒZ<EFBFBD>[ƒW‚Ìƒp<C692>[ƒX", nullptr); // "Message Parsing"
 	JMessage::TParse parse(mResContainer);
 	P2ASSERTLINE(484, parse.parse(file, 0));
-	sys->heapStatusEnd("メッセージのパース");
+	sys->heapStatusEnd("メッセージのパース"); // "Message Parsing"
 }

 /**
@ -246,7 +252,7 @@ bool Mgr::setupColor(JKRArchive* arc, char const* path)
 	JMessage::TParse_color parse(mResContainer);
 	bool success = parse.parse(file, 0x20);
 	P2ASSERTLINE(510, success);
-	sys->heapStatusEnd("メッセージカラーのパース");
+	sys->heapStatusEnd("メッセージカラーのパース"); // "Message Parsing"
 	return success;
 }

--- a/tools/progress.csv
+++ b/tools/progress.csv
@ -933,3 +933,5 @@ You have 4141 out of 10000 Pokos and 107 out of 201 treasures.",2024-04-04 12:49
 You have 4165 out of 10000 Pokos and 108 out of 201 treasures.",2024-04-05 12:28:07.584041
 4170,1940392,0.4170776415885986,108,383063,0.5373637873567734,"
 You have 4170 out of 10000 Pokos and 108 out of 201 treasures.",2024-04-09 16:13:24.105175
+4177,1943344,0.4177121593550961,108,383893,0.5385281178807501,"
+You have 4177 out of 10000 Pokos and 108 out of 201 treasures.",2024-04-12 21:14:18.615190