Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-12-04 03:21:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ogawa fully objdiffable

Browse Source 
also matched a titlemsg func
This commit is contained in:
EpochFlame 2023-01-14 23:54:09 -05:00
parent 6fcb35079e
commit 9002e9c0bd
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Radar.h
View File

@ -54,7 +54,7 @@ struct Radar {
// _00 = VTBL
// _00-_18 = CNode
cRadarType m_objType; // _18
Game::TPositionObject* m_object; // _1c
Game::TPositionObject* m_object; // _1C
u32 m_caveID; // _20
};

2
include/og/newScreen/TitleMsg.h
View File

@ -62,7 +62,7 @@ struct TitleMsg {
TitleMessageAnalyzer m_analyzer; // _04
J2DPictureEx* m_panes1[128]; // _140
J2DPictureEx* m_panes2[128]; // _340
int m_stringLength; // _540
u32 m_stringLength; // _540
f32 m_currXpos; // _544
EnumCentering m_centering; // _548
J2DPane* m_rootPane; // _54C

4
src/plugProjectOgawaU/ogObjSMenuMap.cpp
View File

@ -386,7 +386,7 @@ void ObjSMenuMap::initMapIcon(JKRArchive* arc)
case Radar::MAP_INCOMPLETE_CAVE:
if (id == Radar::MAP_UPGRADE) { }
if (id == Radar::MAP_COMPLETED_CAVE || id == Radar::MAP_INCOMPLETE_CAVE) {
appendCaveName(pane, count & 0xffff, og::Screen::maskTag(caveIDtoMsgID(cPoint->_20), 1, 3));
appendCaveName(pane, count & 0xffff, og::Screen::maskTag(caveIDtoMsgID(cPoint->m_caveID), 1, 3));
}
m_radarPaneList[count][0] = pane;
count++;
@ -1308,7 +1308,7 @@ void ObjSMenuMap::appendCaveName(J2DPane* parent, u16 caveIndex, u64 tag)
og::Screen::TagToName(tag, buf);
const JGeometry::TBox2f box(30.0f, 0.0f, 40.0f, 10.0f);
J2DTextBox* pane = new J2DTextBox(newtag, box, nullptr, "", -1, J2DTextBoxHBinding(2), J2DTextBoxVBinding(2));
J2DTextBox* pane = new J2DTextBox(newtag, box, (const ResFONT*)nullptr, "", -1, J2DTextBoxHBinding(2), J2DTextBoxVBinding(2));
pane->_11C = 24.0f;
pane->_120 = 24.0f;
pane->m_color1 = JUtility::TColor(-1);

4
src/plugProjectOgawaU/ogObjVs.cpp
View File

@ -2215,8 +2215,8 @@ void ObjVs::ScreenSet::update(og::Screen::DataNavi& data)
dope->m_naviLifeRatio = data.m_naviLifeRatio;
dope->m_followPiki = data.m_followPikis;
dope->m_nextThrowPiki = data.m_nextThrowPiki;
dope->m_sprays1 = data.m_dope1Count;
dope->m_sprays2 = data.m_dope0Count;
dope->m_spicySprayCount = data.m_dope1Count;
dope->m_bitterSprayCount = data.m_dope0Count;
dope->m_activeNaviID = data.m_activeNaviID;
dope->update();
}

2
src/plugProjectOgawaU/ogTitleMsg.cpp
View File

@ -1638,7 +1638,7 @@ void TitleMsgWave::init() { }
*/
void TitleMsgWave::start()
{
for (u32 i = 0; i < m_stringLength; i++) {
for (int i = 0; i < m_stringLength; i++) {
m_scaleMgrs[i]->up(m_scaleup1, m_scaleup2, m_scaleup3, (f32)i * m_scaleup4);
}
m_delayTimer = 3.0f;