Skip to content

Meter mode cleanups #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robojumper merged 1 commit into from
Nov 27, 2025
Merged

Meter mode cleanups #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/SOUE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4741,16 +4741,16 @@ __dt__16dLytMeterTimer_cFv = .text:0x800D4DE0; // type:function size:0xB4 scope:
__dt__14dLytSkyGauge_cFv = .text:0x800D4EA0; // type:function size:0x164 scope:weak
__dt__15dLytBirdGauge_cFv = .text:0x800D5010; // type:function size:0x164 scope:weak
__dt__15dLytBossGauge_cFv = .text:0x800D5180; // type:function size:0x108 scope:weak
fn_800D5290__15dLytMeterMain_cFv = .text:0x800D5290; // type:function size:0xB4
fn_800D5350__15dLytMeterMain_cFv = .text:0x800D5350; // type:function size:0x30
executeMap__15dLytMeterMain_cFv = .text:0x800D5290; // type:function size:0xB4
isInMapEvent__15dLytMeterMain_cFv = .text:0x800D5350; // type:function size:0x30
fn_800D5380__15dLytMeterMain_cFUc = .text:0x800D5380; // type:function size:0x44
fn_800D53D0__15dLytMeterMain_cFv = .text:0x800D53D0; // type:function size:0x50
isDoingSkyKeepPuzzle__15dLytMeterMain_cFv = .text:0x800D53D0; // type:function size:0x50
fn_800D5420__15dLytMeterMain_cFv = .text:0x800D5420; // type:function size:0x114
isSilentRealm__15dLytMeterMain_cFv = .text:0x800D5540; // type:function size:0x4C
fn_800D5590__15dLytMeterMain_cFv = .text:0x800D5590; // type:function size:0x98
fn_800D5630__15dLytMeterMain_cFv = .text:0x800D5630; // type:function size:0x18
fn_800D5650__15dLytMeterMain_cFv = .text:0x800D5650; // type:function size:0x24
fn_800D5680__15dLytMeterMain_cFv = .text:0x800D5680; // type:function size:0x28
isInModeMap__15dLytMeterMain_cFv = .text:0x800D5650; // type:function size:0x24
isInModePause__15dLytMeterMain_cFv = .text:0x800D5680; // type:function size:0x28
fn_800D56B0__15dLytMeterMain_cFv = .text:0x800D56B0; // type:function size:0xFC
checkPaneVisibility__15dLytMeterMain_cFv = .text:0x800D57B0; // type:function size:0x1A58
execute__15dLytMeterMain_cFv = .text:0x800D7210; // type:function size:0x92C
Expand Down
29 changes: 15 additions & 14 deletions include/d/lyt/meter/d_lyt_meter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class dLytMeterMain_c {
enum Mode_e {
MODE_MAP_INIT = 0,
MODE_MAP = 1,
MODE_PAUSE = 2,
MODE_PAUSE_INIT = 2,
MODE_PAUSE = 3,
MODE_NONE = 4,
};

Expand All @@ -94,20 +95,20 @@ class dLytMeterMain_c {
bool fn_800C9FE0();
bool fn_800CA040();

bool fn_800D5350();
bool isInMapEvent();
bool fn_800D5380(u8);
void fn_800D5290();
void executeMap();
bool fn_800D5590();
void fn_800D5630();
bool fn_800D5650();
bool fn_800D5680();
bool isInModeMap();
bool isInModePause();
bool fn_800D56B0();
void checkPaneVisibility();
bool execute();

bool isSilentRealm();

bool fn_800D53D0();
bool isDoingSkyKeepPuzzle();
bool fn_800D5420();

void setUiMode(u16 value) const;
Expand All @@ -129,8 +130,8 @@ class dLytMeterMain_c {
mPanesNotHiddenByAreaCaption[15] = visible;
}

bool getField_0x1377E() const {
return field_0x1377E;
bool isInSwordDrawEvent() const {
return mIsInSwordDrawEvent;
}

bool getField_0x1377F() const {
Expand Down Expand Up @@ -184,7 +185,7 @@ class dLytMeterMain_c {
/* 0x1373C */ mVec3_c mRupyPos;
/* 0x13748 */ s32 mBasicPosition;
/* 0x1374C */ s32 mSavedBasicPosition;
/* 0x13750 */ s32 field_0x13750;
/* 0x13750 */ s32 mMode;
/* 0x13754 */ s32 field_0x13754;
/* 0x13758 */ s32 mShieldPosIndex;
/* 0x1375C */ s32 mRupyPosIndex;
Expand All @@ -206,7 +207,7 @@ class dLytMeterMain_c {
/* 0x1377B */ bool mBossKeyVisible;
/* 0x1377C */ bool mSmallKeyVisible;
/* 0x1377D */ bool mDrinkVisible;
/* 0x1377E */ bool field_0x1377E;
/* 0x1377E */ bool mIsInSwordDrawEvent;
/* 0x1377F */ bool field_0x1377F;
/* 0x13780 */ bool field_0x13780;
/* 0x13781 */ bool field_0x13781;
Expand Down Expand Up @@ -281,12 +282,12 @@ class dLytMeter_c {
// because accessing via GetMeter->get... causes
// different instructions sometimes

s32 getMeterField_0x13750() const {
return mMain.field_0x13750;
s32 getMeterMode() const {
return mMain.mMode;
}

void setMeterField_0x13750(s32 value) {
mMain.field_0x13750 = value;
void setMeterMode(s32 value) {
mMain.mMode = value;
}

u8 getMeterField_0x13770() const {
Expand Down
12 changes: 6 additions & 6 deletions src/d/lyt/d_lyt_control_game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static const char *const sMapSky = "MapSky";
static const char *const sCommonArrow = "CommonArrow";

void dLytControlGame_c::initializeState_Pause_SetRes() {
dLytMeter_c::GetInstance()->setMeterField_0x13750(dLytMeterMain_c::MODE_PAUSE);
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_PAUSE_INIT);
dBase_c::s_NextExecuteControlFlags |= BASE_PROP_0x1;
static const char *sLytArcs[] = {sMenuPause, sCommonArrow};
mLytArcControl.set(sLytArcs, ARRAY_LENGTH(sLytArcs));
Expand Down Expand Up @@ -132,15 +132,15 @@ void dLytControlGame_c::executeState_Pause_DelRes() {
mStateMgr.changeState(StateID_Normal);
}
void dLytControlGame_c::finalizeState_Pause_DelRes() {
dLytMeter_c::GetInstance()->setMeterField_0x13750(dLytMeterMain_c::MODE_NONE);
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_NONE);
}

void dLytControlGame_c::initializeState_Map_SetRes() {
// Not sure if this is the right enum
if (!EventManager::isInEvent() || mMapEvent == dLytMapMain_c::MAP_EVENT_11) {
dBase_c::s_NextExecuteControlFlags |= BASE_PROP_0x10;
}
dLytMeter_c::GetInstance()->setMeterField_0x13750(dLytMeterMain_c::MODE_MAP_INIT);
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_MAP_INIT);
}
void dLytControlGame_c::executeState_Map_SetRes() {
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk(sMap2D, nullptr);
Expand Down Expand Up @@ -180,8 +180,8 @@ void dLytControlGame_c::initializeState_Map() {
}
void dLytControlGame_c::executeState_Map() {
if (dLytMap_c::GetInstance()->isOpen()) {
if (dLytMeter_c::GetInstance()->getMeterField_0x13750() != dLytMeterMain_c::MODE_MAP) {
dLytMeter_c::GetInstance()->setMeterField_0x13750(dLytMeterMain_c::MODE_MAP);
if (dLytMeter_c::GetInstance()->getMeterMode() != dLytMeterMain_c::MODE_MAP) {
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_MAP);
if (StoryflagManager::sInstance->getCounterOrFlag(STORYFLAG_PLUS_BTN_NOTICE)) {
StoryflagManager::sInstance->unsetFlag(STORYFLAG_PLUS_BTN_NOTICE);
}
Expand Down Expand Up @@ -250,7 +250,7 @@ void dLytControlGame_c::executeState_Map_DelRes() {
}
}
void dLytControlGame_c::finalizeState_Map_DelRes() {
dLytMeter_c::GetInstance()->setMeterField_0x13750(dLytMeterMain_c::MODE_NONE);
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_NONE);
dLytMeter_c::GetInstance()->setBasicPosition(dLytMeterMain_c::POSITION_NORMAL);
dMessage_c::getInstance()->setMapEvent(dLytMapMain_c::MAP_EVENT_MAX);
}
Expand Down
2 changes: 1 addition & 1 deletion src/d/lyt/d_lyt_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4598,7 +4598,7 @@ void dLytMapMain_c::initializeState_Out() {
if (mMapEvent == MAP_EVENT_SAVE_OBJ) {
mPopupInfo.mStateMgr.changeState(StateID_Out);
}
dLytMeter_c::GetInstance()->setMeterField_0x13750(0);
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_MAP_INIT);
if (mDoCameraTransition || mMapEvent == MAP_EVENT_MAP_INTRO) {
mpInOutAnmGroup = &mAnmGroups[MAP_MAIN_ANIM_OUT];
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/d/lyt/d_lyt_pause.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ void dLytPauseMgr_c::executeState_None() {
mMain.requestIn();
mStateMgr.changeState(StateID_In);
dBase_c::s_NextExecuteControlFlags |= BASE_PROP_0x1;
dLytMeter_c::GetInstance()->setMeterField_0x13750(3);
dLytMeter_c::GetInstance()->setMeterMode(dLytMeterMain_c::MODE_PAUSE);
dLytControlGame_c *lytControl = dLytControlGame_c::getInstance();
if (lytControl->isPauseDemo()) {
mSavedPauseDisp = lytControl->getCurrentPauseDisp();
Expand Down
Loading