d_lyt_pause largely done

2026-08-29 08:59:56 -04:00 · 2025-08-10 02:47:49 +02:00
parent e08d120f0b
commit de8cc996c6
17 changed files with 1253 additions and 208 deletions
@@ -85,7 +85,7 @@ bool dLytCommonArrow_c::execute() {
 }

 bool dLytCommonArrow_c::draw() {
-    if (field_0x6CB == 1) {
+    if (mVisible == true) {
        mLytBase.addToDrawList();
    }
    return true;
@@ -179,14 +179,14 @@ void dLytCommonArrow_c::initializeState_None() {
    mInRequested = false;
    mOutRequested = false;
    field_0x6CA = 0;
-    field_0x6CB = 0;
+    mVisible = false;
    mTargetedBounding = PANE_BOUNDING_NONE;
    field_0x6B8 = 2;
    field_0x6BC = 2;
    field_0x6C0 = 2;
    mTimer = 0;
    displayElement(ANIM_IN, 0.0f);
-    field_0x6CC = 1;
+    mBackwards = true;
 }
 void dLytCommonArrow_c::executeState_None() {
    if (mInRequested == true) {
@@ -200,7 +200,7 @@ void dLytCommonArrow_c::finalizeState_None() {

 void dLytCommonArrow_c::initializeState_In() {
    mTimer = 0;
-    field_0x6CB = 1;
+    mVisible = true;
    f32 anmType = 0.0f;
    if (mType == 1) {
        anmType = 1.0f;
@@ -256,7 +256,7 @@ void dLytCommonArrow_c::executeState_Wait() {
    }

    d2d::AnmGroup_c &g2 = mAnmGroups[ANIM_INPUT];
-    if (field_0x6CC != 0) {
+    if (mBackwards) {
        tickDown(&g2);
    } else {
        g2.play();
@@ -0,0 +1,843 @@
+#include "d/lyt/d_lyt_pause.h"
+
+#include "common.h"
+#include "d/d_base.h"
+#include "d/d_cs_game.h"
+#include "d/d_heap.h"
+#include "d/d_pad.h"
+#include "d/d_pad_nav.h"
+#include "d/d_pause.h"
+#include "d/d_player.h"
+#include "d/flag/storyflag_manager.h"
+#include "d/lyt/d_lyt_common_arrow.h"
+#include "d/lyt/d_lyt_control_game.h"
+#include "d/lyt/d_lyt_pause_back.h"
+#include "d/lyt/d_lyt_pause_disp_00.h"
+#include "d/lyt/d_lyt_pause_disp_01.h"
+#include "d/lyt/d_lyt_pause_info.h"
+#include "d/lyt/d_lyt_pause_text.h"
+#include "d/lyt/meter/d_lyt_meter.h"
+#include "d/snd/d_snd_player_mgr.h"
+#include "d/snd/d_snd_small_effect_mgr.h"
+#include "d/snd/d_snd_wzsound.h"
+#include "egg/gfx/eggTextureBuffer.h"
+#include "m/m_pad.h"
+#include "toBeSorted/arc_managers/layout_arc_manager.h"
+
+STATE_DEFINE(dLytPauseMain_c, None);
+STATE_DEFINE(dLytPauseMain_c, In);
+STATE_DEFINE(dLytPauseMain_c, Wait);
+STATE_DEFINE(dLytPauseMain_c, Change);
+STATE_DEFINE(dLytPauseMain_c, Select);
+STATE_DEFINE(dLytPauseMain_c, Ring);
+STATE_DEFINE(dLytPauseMain_c, GetDemo);
+STATE_DEFINE(dLytPauseMain_c, Out);
+
+STATE_DEFINE(dLytPauseMgr_c, None);
+STATE_DEFINE(dLytPauseMgr_c, In);
+STATE_DEFINE(dLytPauseMgr_c, Wait);
+STATE_DEFINE(dLytPauseMgr_c, Change);
+STATE_DEFINE(dLytPauseMgr_c, Select);
+STATE_DEFINE(dLytPauseMgr_c, Ring);
+STATE_DEFINE(dLytPauseMgr_c, GetDemo);
+STATE_DEFINE(dLytPauseMgr_c, Out);
+
+dLytPauseMain_c::dLytPauseMain_c()
+    : mStateMgr(*this),
+      mpPauseBack(nullptr),
+      mpDisp00(nullptr),
+      mpDisp01(nullptr),
+      mpPauseInfo(nullptr),
+      mpPauseText(nullptr),
+      mpArrow(nullptr) {}
+
+bool dLytPauseMain_c::build() {
+    mpPauseBack = new (dHeap::layoutEx2Heap.heap) dLytPauseBack_c();
+    mpPauseBack->build();
+    mpPauseInfo = new (dHeap::layoutEx2Heap.heap) dLytPauseInfo_c();
+    mpPauseInfo->build();
+    mpPauseText = new (dHeap::layoutEx2Heap.heap) dLytPauseText_c();
+    mpPauseText->build();
+    mpArrow = new (dHeap::layoutEx2Heap.heap) dLytCommonArrow_c();
+    mpArrow->build();
+    mpDisp00 = new (dHeap::layoutEx2Heap.heap) dLytPauseDisp00_c();
+    mpDisp00->build();
+    mpDisp01 = new (dHeap::layoutEx2Heap.heap) dLytPauseDisp01_c();
+    mpDisp01->build();
+    mStateMgr.changeState(StateID_None);
+    return true;
+}
+
+bool dLytPauseMain_c::remove() {
+    if (mpArrow != nullptr) {
+        mpArrow->remove();
+        delete mpArrow;
+        mpArrow = nullptr;
+    }
+
+    if (mpPauseText != nullptr) {
+        mpPauseText->remove();
+        delete mpPauseText;
+        mpPauseText = nullptr;
+    }
+
+    if (mpPauseInfo != nullptr) {
+        mpPauseInfo->remove();
+        delete mpPauseInfo;
+        mpPauseInfo = nullptr;
+    }
+
+    if (mpDisp00 != nullptr) {
+        mpDisp00->remove();
+        delete mpDisp00;
+        mpDisp00 = nullptr;
+    }
+
+    if (mpDisp01 != nullptr) {
+        mpDisp01->remove();
+        delete mpDisp01;
+        mpDisp01 = nullptr;
+    }
+
+    if (mpPauseBack != nullptr) {
+        mpPauseBack->remove();
+        delete mpPauseBack;
+        mpPauseBack = nullptr;
+    }
+
+    dBase_c::s_NextExecuteControlFlags &= ~0x1;
+    dBase_c::s_DrawControlFlags &= ~0x1;
+
+    return true;
+}
+
+bool dLytPauseMain_c::execute() {
+    mStateMgr.executeState();
+    mpPauseBack->execute();
+    mpDisp00->execute();
+    mpDisp01->execute();
+    mpPauseInfo->execute();
+    mpPauseText->execute();
+    mpArrow->execute();
+    return true;
+}
+
+bool dLytPauseMain_c::draw() {
+    mpPauseBack->draw();
+    if (mpDisp00 != nullptr) {
+        mpDisp00->draw();
+    }
+    if (mpDisp01 != nullptr) {
+        mpDisp01->draw();
+    }
+    if (!dLytControlGame_c::getInstance()->getField_0x15C67()) {
+        mpArrow->draw();
+    }
+    mpPauseText->draw();
+    mpPauseInfo->draw();
+    return true;
+}
+
+void dLytPauseMain_c::drawDirectly() {
+    if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+        mpDisp00->drawDirectly();
+    } else {
+        mpDisp01->drawDirectly();
+    }
+}
+
+void dLytPauseMain_c::requestIn() {
+    mInRequest = true;
+}
+
+void dLytPauseMain_c::requestOut() {
+    mOutRequest = true;
+}
+
+void dLytPauseMain_c::requestChange() {
+    mChangeRequest = true;
+}
+
+void dLytPauseMain_c::requestSelect() {
+    mSelectRequest = true;
+}
+
+void dLytPauseMain_c::requestRingToggle() {
+    mRingToggleRequest = true;
+}
+
+void dLytPauseMain_c::initializeState_None() {
+    field_0x63 = false;
+    mInRequest = false;
+    mOutRequest = false;
+    mChangeRequest = false;
+    mSelectRequest = false;
+    mRingToggleRequest = false;
+    mPartStateChangeFlags = 0;
+    mStep = 0;
+    mTimer = 0;
+}
+void dLytPauseMain_c::executeState_None() {
+    if (mInRequest == true) {
+        mInRequest = false;
+        mpPauseBack->requestIn();
+        if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+            mpDisp00->requestIn(false);
+        } else {
+            mpDisp01->requestIn(false);
+        }
+        mpPauseInfo->requestIn();
+        mStateMgr.changeState(StateID_In);
+    }
+}
+void dLytPauseMain_c::finalizeState_None() {}
+
+void dLytPauseMain_c::initializeState_In() {
+    mPartStateChangeFlags = 0;
+    mTimer = 0;
+}
+void dLytPauseMain_c::executeState_In() {
+    if (mTimer == 8) {
+        mpArrow->requestIn();
+    }
+    mTimer++;
+
+    if (mpPauseBack->getField_0x156() == true) {
+        mPartStateChangeFlags |= 0x1;
+    }
+
+    if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+        if (mpDisp00->getField_0xE36E() == true) {
+            mPartStateChangeFlags |= 0x2;
+        }
+    } else {
+        if (mpDisp01->getField_0x98CE() == true) {
+            mPartStateChangeFlags |= 0x2;
+        }
+    }
+
+    if (mpPauseInfo->getField_0x19A() == true) {
+        mPartStateChangeFlags |= 0x4;
+    }
+
+    if (mPartStateChangeFlags == (0x1 | 0x2 | 0x4)) {
+        if (dLytControlGame_c::getInstance()->getField_0x15C67()) {
+            mStateMgr.changeState(StateID_GetDemo);
+        } else {
+            mStateMgr.changeState(StateID_Wait);
+        }
+    }
+}
+void dLytPauseMain_c::finalizeState_In() {
+    dBase_c::s_DrawControlFlags |= 0x1;
+}
+
+void dLytPauseMain_c::initializeState_Wait() {
+    mStep = 0;
+    mPartStateChangeFlags = 0;
+    field_0x63 = true;
+}
+void dLytPauseMain_c::executeState_Wait() {
+    field_0x63 = false;
+    if (mOutRequest == true) {
+        mOutRequest = false;
+        mpPauseBack->requestOut();
+        if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+            mpDisp00->requestOut(false);
+        } else {
+            mpDisp01->requestOut(false);
+        }
+        mpPauseInfo->requestOut();
+        mStateMgr.changeState(StateID_Out);
+    } else if (mSelectRequest == true) {
+        mStateMgr.changeState(StateID_Select);
+    } else if (mChangeRequest == true) {
+        mChangeRequest = false;
+        mStateMgr.changeState(StateID_Change);
+    } else {
+        if (mRingToggleRequest == true) {
+            mRingToggleRequest = false;
+            mStateMgr.changeState(StateID_Ring);
+        }
+        mpArrow->unk();
+    }
+}
+void dLytPauseMain_c::finalizeState_Wait() {}
+
+void dLytPauseMain_c::initializeState_Change() {
+    mStep = 0;
+    if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+        mpDisp01->requestIn(true);
+        mpDisp00->requestOut(true);
+    } else {
+        mpDisp00->requestIn(true);
+        mpDisp01->requestOut(true);
+    }
+}
+void dLytPauseMain_c::executeState_Change() {
+    if (mStep != 0) {
+        return;
+    }
+
+    bool change = false;
+    if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+        if (mpDisp01->getField_0x98CE()) {
+            change = true;
+        }
+    } else {
+        if (mpDisp00->getField_0xE36E()) {
+            change = true;
+        }
+    }
+
+    if (change == true) {
+        mStateMgr.changeState(StateID_Wait);
+    }
+}
+void dLytPauseMain_c::finalizeState_Change() {}
+
+void dLytPauseMain_c::initializeState_Select() {
+    mStep = 0;
+    mSelectRequest = false;
+    if (dLytPauseMgr_c::GetInstance()->getField_0x0838() == true) {
+        mStep = 10;
+        mpDisp00->requestSelect();
+        dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_MENU_P1_SELECT_TOGGLE);
+    } else if (dLytPauseMgr_c::GetInstance()->getField_0x083C() == true) {
+        if (mpDisp00->requestSelectGuide()) {
+            mStep = 100;
+        } else {
+            mStep = 200;
+        }
+    } else if (dLytPauseMgr_c::GetInstance()->getField_0x083D() == true) {
+        if (mpDisp00->requestSelectMpls()) {
+            mStep = 300;
+        } else {
+            mStep = 200;
+        }
+    } else {
+        mpArrow->setBackwards(false);
+        mpPauseInfo->setInputInOut(false);
+        if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+            mpDisp00->requestSelect();
+            dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_MENU_P1_SELECT_ITEM);
+        } else {
+            mpDisp01->requestSelect();
+        }
+        mpPauseText->requestIn();
+    }
+}
+extern "C" void fn_80059F40(void *);
+void dLytPauseMain_c::executeState_Select() {
+    switch (mStep) {
+        case 0: {
+            if (mpPauseText->getField_0x6D7()) {
+                mStep = 1;
+            }
+            break;
+        }
+        case 1: {
+            if (dPad::getDownTrigA() || dPad::getDownTrigB()) {
+                mStep = 2;
+                mpPauseText->requestOut();
+            }
+            break;
+        }
+        case 2: {
+            if (mpPauseText->getField_0x6D7()) {
+                if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+                    mpDisp00->requestUnselect();
+                } else {
+                    mpDisp01->requestUnselect();
+                }
+                mStateMgr.changeState(StateID_Wait);
+            }
+            break;
+        }
+        case 10: {
+            if (mpDisp00->getField_0xE36E() == true) {
+                mStateMgr.changeState(StateID_Wait);
+            }
+            break;
+        }
+        case 100: {
+            if (mpDisp00->getField_0xE36E() == true) {
+                mStateMgr.changeState(StateID_Wait);
+                u8 uiMode = dLytMeter_c::GetMain()->getUiMode() + 1;
+                if (uiMode >= 3) {
+                    uiMode = 0;
+                }
+                dLytMeter_c::GetMain()->setUiMode(uiMode);
+            }
+            break;
+        }
+        case 200: {
+            mStateMgr.changeState(StateID_Wait);
+            break;
+        }
+        case 300: {
+            if (mpDisp00->getField_0xE36E() == true) {
+                mStep++;
+                // TODO - dPadManager_c
+                fn_80059F40(dPauseManager_c::GetInstance());
+            }
+            break;
+        }
+        case 301: {
+            mStateMgr.changeState(StateID_Wait);
+            break;
+        }
+    }
+}
+void dLytPauseMain_c::finalizeState_Select() {
+    mpArrow->setBackwards(true);
+    mpPauseInfo->setInputInOut(true);
+}
+
+void dLytPauseMain_c::initializeState_Ring() {
+    if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+        mpDisp00->requestRingToggle();
+    }
+}
+void dLytPauseMain_c::executeState_Ring() {
+    if (mSelectRequest == true) {
+        mStateMgr.changeState(StateID_Select);
+    } else if (mRingToggleRequest == true) {
+        mRingToggleRequest = false;
+        if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+            mpDisp00->requestRingToggle();
+        }
+        mStateMgr.changeState(StateID_Wait);
+    }
+}
+void dLytPauseMain_c::finalizeState_Ring() {}
+
+void dLytPauseMain_c::initializeState_GetDemo() {
+    field_0x63 = true;
+}
+void dLytPauseMain_c::executeState_GetDemo() {
+    field_0x63 = false;
+    if (dLytControlGame_c::getInstance()->getField_0x15C68()) {
+        if (mpDisp01->getField_0x98CE() == true) {
+            mStateMgr.changeState(StateID_Wait);
+        }
+    } else {
+        if (mpDisp00->getField_0xE36E() == true) {
+            mStateMgr.changeState(StateID_Wait);
+        }
+    }
+}
+void dLytPauseMain_c::finalizeState_GetDemo() {}
+
+void dLytPauseMain_c::initializeState_Out() {
+    mPartStateChangeFlags = 0;
+    mStep = 0;
+    dBase_c::s_DrawControlFlags &= ~0x1;
+    mpArrow->requestOut();
+}
+void dLytPauseMain_c::executeState_Out() {
+    switch (mStep) {
+        case 0: {
+            if (mpPauseBack->getField_0x156() == true) {
+                mPartStateChangeFlags |= 0x1;
+            }
+
+            if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+                if (mpDisp00->getField_0xE36E() == true) {
+                    mPartStateChangeFlags |= 0x2;
+                }
+            } else {
+                if (mpDisp01->getField_0x98CE() == true) {
+                    mPartStateChangeFlags |= 0x2;
+                }
+            }
+
+            if (mpPauseInfo->getField_0x19A() == true) {
+                mPartStateChangeFlags |= 0x4;
+            }
+            if (mPartStateChangeFlags == (0x1 | 0x2 | 0x4)) {
+                field_0x63 = true;
+                mStep = 1;
+            }
+            break;
+        }
+        case 1: {
+            mStateMgr.changeState(StateID_None);
+            break;
+        }
+    }
+}
+void dLytPauseMain_c::finalizeState_Out() {}
+
+SPECIAL_BASE_PROFILE(LYT_PAUSE, dLytPauseMgr_c, fProfile::LYT_PAUSE, 0x2B7, 1);
+
+dLytPauseMgr_c::dLytPauseMgr_c() : mStateMgr(*this), mpTexture0x0810(nullptr), mpBgTexture(nullptr) {
+    sInstance = this;
+    field_0x083A = false;
+}
+
+dLytPauseMgr_c::~dLytPauseMgr_c() {
+    sInstance = nullptr;
+}
+
+int dLytPauseMgr_c::create() {
+    bool ok = allocateLytWork1Heap("pause", true);
+    if (!ok) {
+        return FAILED;
+    }
+
+    mStateMgr.changeState(StateID_None);
+    return SUCCEEDED;
+}
+
+int dLytPauseMgr_c::doDelete() {
+    removeLyt();
+    mMain.remove();
+    mResAcc2.detach();
+    mResAcc1.detach();
+    if (mpTexture0x0810 != nullptr) {
+        mpTexture0x0810->free();
+        mpTexture0x0810 = nullptr;
+    }
+    if (mpBgTexture != nullptr) {
+        mpBgTexture->free();
+        mpBgTexture = nullptr;
+    }
+    return SUCCEEDED;
+}
+
+int dLytPauseMgr_c::execute() {
+    mStateMgr.executeState();
+    if (*mStateMgr.getStateID() != StateID_None) {
+        mMain.execute();
+    }
+    return SUCCEEDED;
+}
+
+int dLytPauseMgr_c::draw() {
+    if (*mStateMgr.getStateID() != StateID_None) {
+        mMain.draw();
+    }
+    return SUCCEEDED;
+}
+
+void dLytPauseMgr_c::initializeState_None() {
+    mInRequest = 0;
+    setSelection(SELECT_NONE, 0, false);
+    mPrevSelectionType = SELECT_NONE;
+    mCurrentSelectionId = 0;
+    mPrevSelectionId = 0;
+    field_0x083C = false;
+    field_0x083D = false;
+    field_0x0836 = false;
+    field_0x0837 = false;
+    field_0x0838 = false;
+    field_0x0831 = false;
+    field_0x0832 = false;
+    field_0x083E = false;
+    field_0x083F = false;
+    field_0x0840 = false;
+    mCurrentDisp00Tab = 0;
+    field_0x0824 = 3;
+    mCurrentSelectionTab = 0;
+    mCurrentSelectionIsRestricted = false;
+    mTimer = 0;
+    field_0x0835 = 0;
+}
+void dLytPauseMgr_c::executeState_None() {
+    if (mInRequest == true) {
+        mInRequest = false;
+        field_0x083A = true;
+        mMain.requestIn();
+        mStateMgr.changeState(StateID_In);
+        dBase_c::s_NextExecuteControlFlags |= 0x1;
+        dLytMeter_c::GetInstance()->setMeterField_0x13750(3);
+        dLytControlGame_c *lytControl = dLytControlGame_c::getInstance();
+        if (lytControl->getField_0x15C67()) {
+            field_0x0828 = lytControl->getField_0x15C2C();
+            lytControl->setField_0x15C2C(lytControl->getField_0x15C68());
+        } else {
+            StoryflagManager::sInstance->unsetFlag(571);
+        }
+    }
+}
+void dLytPauseMgr_c::finalizeState_None() {}
+
+void dLytPauseMgr_c::initializeState_In() {}
+void dLytPauseMgr_c::executeState_In() {
+    if (mMain.getField_0x63() == true) {
+        if (dLytControlGame_c::getInstance()->getField_0x15C67()) {
+            mStateMgr.changeState(StateID_GetDemo);
+        } else {
+            mStateMgr.changeState(StateID_Wait);
+            dCsGame_c::GetInstance()->setCursorTypePointer();
+        }
+    }
+}
+void dLytPauseMgr_c::finalizeState_In() {}
+
+void dLytPauseMgr_c::initializeState_Wait() {
+    dPadNav::setNavEnabled(true, false);
+    if (sInstance->getField_0x083E()) {
+        sInstance->setField_0x083E(false);
+        dPadNav::hidePointer();
+    }
+
+    if (field_0x083F == true) {
+        field_0x083F = false;
+        dPadNav::hidePointer();
+    }
+    field_0x0840 = false;
+    field_0x0835 = 0;
+}
+void dLytPauseMgr_c::executeState_Wait() {
+    field_0x083B = false;
+    mPrevSelectionId = mCurrentSelectionId;
+    mPrevSelectionType = mCurrentSelectionType;
+    
+    if (dPad::getDownTrigDown()) {
+        dPad::ex_c::getInstance()->centerCursor(mPad::getCurrentCoreID(), true);
+    }
+    
+    dCsGame_c::GetInstance()->setCursorTypePointer();
+    
+    if (dPad::getDownTrig1() || (dLytControlGame_c::getInstance()->getField_0x15C2C() != 0 && dPad::getDownTrigB())) {
+        dSndPlayerMgr_c::GetInstance()->leaveMenu();
+        mMain.requestOut();
+        (void)getLinkPtr(); // yes
+        mStateMgr.changeState(StateID_Out);
+        return;
+    }
+
+    if (dLytControlGame_c::getInstance()->getField_0x15C2C() == 0) {
+        bool b = false;
+        if (!StoryflagManager::sInstance->getFlag(58)) {
+            if (dPad::getDownTrigB()) {
+                b = true;
+            }
+        } else {
+            if (dPad::getUpTrigB() && field_0x0835 < 10) {
+                b = true;
+            }
+        }
+
+        if (b) {
+            dSndPlayerMgr_c::GetInstance()->leaveMenu();
+            mMain.requestOut();
+            (void)getLinkPtr(); // yes
+            mStateMgr.changeState(StateID_Out);
+            return;
+        }
+    }
+
+    if (mMain.hasSelection() && dPad::getDownTrigA()) {
+        if (field_0x0837 && !dPadNav::isPointerVisible()) {
+            field_0x083F = true;
+        }
+        (void)checkSelectRing();
+        mStateMgr.changeState(StateID_Select);
+        return;
+    }
+
+    if (checkChangeGesture()) {
+        mStateMgr.changeState(StateID_Change);
+        return;
+    }
+
+    if ((dPad::getDownTrigB() || dPad::getDownTrigMinus() || dPad::getDownTrigC()) && checkSelectRing()) {
+        field_0x0837 = true;
+        mStateMgr.changeState(StateID_Select);
+        return;
+    }
+
+    if (checkRing()) {
+        if (mTimer >= 10) {
+            mTimer = 0;
+            dCsGame_c::GetInstance()->setCursorTypeNoneMaybe();
+            mStateMgr.changeState(StateID_Ring);
+        } else {
+            mTimer++;
+        }
+
+    } else {
+        mTimer = 0;
+    }
+    if (dPad::getDownB()) {
+        field_0x0835++;
+    } else {
+        field_0x0835 = 0;
+    }
+
+}
+void dLytPauseMgr_c::finalizeState_Wait() {
+    dPadNav::setNavEnabled(false, false);
+}
+
+void dLytPauseMgr_c::initializeState_Change() {
+    mMain.requestChange();
+    mMain.updateTitle();
+    if (field_0x0831) {
+        dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_MENU_TURN_PAGE_RIGHT);
+    } else {
+        dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_MENU_TURN_PAGE_LEFT);
+    }
+}
+void dLytPauseMgr_c::executeState_Change() {
+    if (!sInstance->getField_0x083E()) {
+        dCsGame_c::GetInstance()->setCursorTypePointer();
+    }
+
+    if (mMain.getField_0x63() == true) {
+        saveDispFlag();
+        mStateMgr.changeState(StateID_Wait);
+    }
+}
+void dLytPauseMgr_c::finalizeState_Change() {}
+
+void dLytPauseMgr_c::initializeState_Select() {
+    mMain.requestSelect();
+    field_0x0838 = field_0x0837;
+}
+void dLytPauseMgr_c::executeState_Select() {
+    if (mMain.getField_0x63() == true) {
+        if (field_0x0838) {
+            saveTabFlag();
+            field_0x0838 = false;
+        }
+        mStateMgr.changeState(StateID_Wait);
+    } else if (field_0x0838) {
+        s32 tab = mCurrentDisp00Tab;
+        bool buttonHeld = false;
+        if (dPad::getDownB() && tab == 0) {
+            buttonHeld = true;
+        }
+        if (dPad::getDownMinus() && tab == 1) {
+            buttonHeld = true;
+        }
+        if (dPad::getDownC() && tab == 2) {
+            buttonHeld = true;
+        }
+
+        if (buttonHeld) {
+            mTimer++;
+        } else {
+            mTimer = 0;
+        }
+    }
+}
+void dLytPauseMgr_c::finalizeState_Select() {}
+
+void dLytPauseMgr_c::initializeState_Ring() {
+    s32 controlGameTab = dLytControlGame_c::getInstance()->getPauseDisp00Tab();
+    if (controlGameTab == 0) {
+        field_0x0824 = 0;
+    } else if (controlGameTab == 1) {
+        field_0x0824 = 1;
+    } else {
+        field_0x0824 = 2;
+    }
+    mMain.requestRingToggle();
+}
+void dLytPauseMgr_c::executeState_Ring() {
+    field_0x083B = false;
+    mPrevSelectionId = mCurrentSelectionId;
+    mPrevSelectionType = mCurrentSelectionType;
+    bool buttonHeld = false;
+    if (field_0x0824 == 0) {
+        if (!dPad::getDownB()) {
+            buttonHeld = true;
+        }
+    } else if (field_0x0824 == 1) {
+        if (!dPad::getDownMinus()) {
+            buttonHeld = true;
+        }
+    } else {
+        if (!dPad::getDownC()) {
+            buttonHeld = true;
+        }
+    }
+
+    if (buttonHeld == true) {
+        if (mMain.hasSelection()) {
+            mStateMgr.changeState(StateID_Select);
+        } else {
+            mMain.requestRingToggle();
+            mStateMgr.changeState(StateID_Wait);
+        }
+    }
+}
+void dLytPauseMgr_c::finalizeState_Ring() {
+    mTimer = 0;
+}
+
+void dLytPauseMgr_c::initializeState_GetDemo() {}
+void dLytPauseMgr_c::executeState_GetDemo() {
+    if (mMain.getField_0x63() == true) {
+        dSndPlayerMgr_c::GetInstance()->leaveMenu();
+        mMain.requestOut();
+        (void)getLinkPtr();
+        mStateMgr.changeState(StateID_Out);
+    }
+}
+void dLytPauseMgr_c::finalizeState_GetDemo() {}
+
+void dLytPauseMgr_c::initializeState_Out() {
+    dCsGame_c::GetInstance()->offNextCursor();
+}
+void dLytPauseMgr_c::executeState_Out() {
+    if (mMain.getField_0x63() == true) {
+        dBase_c::s_NextExecuteControlFlags &= ~0x1;
+        dBase_c::s_DrawControlFlags &= ~0x1;
+        mStateMgr.changeState(StateID_None);
+    }
+}
+void dLytPauseMgr_c::finalizeState_Out() {
+    if (dLytControlGame_c::getInstance()->getField_0x15C67()) {
+        dLytControlGame_c::getInstance()->setField_0x15C2C(field_0x0828);
+    }
+}
+
+bool dLytPauseMgr_c::isStateWait() const {
+    return mStateMgr.getStateID()->isEqual(StateID_Wait);
+}
+
+bool dLytPauseMgr_c::build() {
+    void *data;
+    data = LayoutArcManager::GetInstance()->getLoadedData("MenuPause");
+    mResAcc1.attach(data, "");
+    data = LayoutArcManager::GetInstance()->getLoadedData("DoButton");
+    mResAcc2.attach(data, "");
+    mMain.build();  
+    return true;
+}
+
+void dLytPauseMgr_c::saveTabFlag() {
+    dLytControlGame_c::getInstance()->setPauseDisp00Tab(mCurrentDisp00Tab);
+    StoryflagManager::sInstance->setFlagOrCounterToValue(846, mCurrentDisp00Tab);
+}
+
+bool dLytPauseMgr_c::checkRing() {
+    dLytControlGame_c *lytControl = dLytControlGame_c::getInstance();
+    if (lytControl->getField_0x15C2C() != 0) {
+        return false;
+    }
+    if (!StoryflagManager::sInstance->getFlag(30)) {
+        return false;
+    }
+
+    s32 tab = lytControl->getPauseDisp00Tab();
+
+    if (dPad::getDownB() && tab == 0) {
+            return true;
+    } else if (dPad::getDownMinus() && tab == 1) {
+        return true;
+    } else if (dPad::getDownC() && tab == 2) {
+        return true;
+    }
+    return false;
+}
+
+void dLytPauseMgr_c::setSelectHand(f32 rotation, f32 length) {
+    sDisp00ArrowRotation = rotation;
+    sDisp00ArrowLength = length;
+}
@@ -329,8 +329,8 @@ static const d2d::LytBrlanMapping brlanMap[] = {

 #define PAUSE_DISP_00_NUM_SUBPANES 24

-#define navTargetToBounding(n) (s32)(n - 1)
-#define boundingToNavTarget(n) (s32)(n + 1)
+#define navTargetToBounding(n) ((s32)(n - 1))
+#define boundingToNavTarget(n) ((s32)(n + 1))

 // clang-format off
 static const u8 iconVariants[] = {
@@ -532,7 +532,7 @@ void dLytPauseDisp00_c::requestSelect() {
    mSelectToggleRequest = true;
 }

-void dLytPauseDisp00_c::requestRing() {
+void dLytPauseDisp00_c::requestRingToggle() {
    mRingToggleRequest = true;
 }

@@ -614,7 +614,7 @@ void dLytPauseDisp00_c::initializeState_None() {
    setAnm(PAUSE_DISP_00_ANIM_LOOP, 0.0f);
    mSelectGuideRequest = false;
    mSelectToggleRequest = false;
-    field_0xE376 = false;
+    mReverseTabChangeAnim = false;
    mRingToggleRequest = false;
 }
 void dLytPauseDisp00_c::executeState_None() {
@@ -803,19 +803,39 @@ void dLytPauseDisp00_c::executeState_Wait() {
 void dLytPauseDisp00_c::finalizeState_Wait() {}

 void dLytPauseDisp00_c::initializeState_Select() {
-    static const s32 sTabOrder[] = {
+    // Reminder: item=0, pouch=1, dowsing=2
+
+    // Subtle detail - the layout has three animations for changing tabs:
+    // 1. B-Wheel -> Pouch
+    // 2. Pouch -> Dowsing
+    // 3. Dowsing -> B-Wheel
+    // If we're changing tabs in this order, we can simply play the
+    // animation forward. If we're changing tabs in a different order,
+    // we need to play the reverse change animation, backwards.
+
+    // For a given tab index, what's the natural next tab index?
+    static const s32 sNaturalTabOrder[] = {
        1,
        2,
        0,
    };

-    static const s32 sTabAnim[] = {
+    // For a given tab index, what's the change anim when changing to the natural next tab?
+    static const s32 sNaturalTabChangeAnim[] = {
        PAUSE_DISP_00_ANIM_RING_TO_POUCH,
        PAUSE_DISP_00_ANIM_RING_TO_SWORD,
        PAUSE_DISP_00_ANIM_RING_TO_ITEM,
    };

-    static const s32 sTabAnim2[] = {
+    // TODO - possibly fakematch, but we need to force a reload.
+    // Note that this is part of a .rodata pool, so it
+    // must be const and in the same file...
+    
+    // For a given tab index, what's the change anim when changing to the *other* tab,
+    // in not-natural order?
+    static const volatile s32 sReverseTabChangeAnim[] = {
+        // E.g. we're on the item tab, and we're changing to dowsing,
+        // so we need to play the dowsing->item animation in reverse.
        PAUSE_DISP_00_ANIM_RING_TO_ITEM,
        PAUSE_DISP_00_ANIM_RING_TO_POUCH,
        PAUSE_DISP_00_ANIM_RING_TO_SWORD,
@@ -830,18 +850,17 @@ void dLytPauseDisp00_c::initializeState_Select() {
        stopAnm(PAUSE_DISP_00_ANIM_RING_TO_SWORD);
        stopAnm(PAUSE_DISP_00_ANIM_RING_TO_ITEM);

-        // Of course dLytControlGame_c and dLytPause_c would use different IDs...
-        // TODO check if this ID mapping is consistently done
-        s32 controlGameTab = dLytControlGame_c::getInstance()->getPauseDisp00Tab();
-        if (sTabOrder[controlGameTab] == pause->getCurrentDisp00Tab()) {
-            setAnm(sTabAnim[controlGameTab], 0.0f);
-            field_0xE376 = false;
+        s32 oldTab = dLytControlGame_c::getInstance()->getPauseDisp00Tab();
+        if (sNaturalTabOrder[oldTab] == pause->getCurrentDisp00Tab()) {
+            // Natural 
+            setAnm(sNaturalTabChangeAnim[oldTab], 0.0f);
+            mReverseTabChangeAnim = false;
        } else {
-            stopAnm(controlGameTab + PAUSE_DISP_00_ANIM_RING_BASE);
-            // TODO - nonmatching
-            setAnm(sTabAnim2[controlGameTab], 0.0f);
-            mAnm[sTabAnim2[controlGameTab]].setToEnd();
-            field_0xE376 = true;
+            // Opposite order
+            stopAnm(oldTab + PAUSE_DISP_00_ANIM_RING_BASE);
+            setAnm(sReverseTabChangeAnim[oldTab], 0.0f);
+            mAnm[sReverseTabChangeAnim[oldTab]].setToEnd();
+            mReverseTabChangeAnim = true;
        }

        for (int i = PAUSE_DISP_00_ANIM_ITEM_OFFSET;
@@ -852,13 +871,18 @@ void dLytPauseDisp00_c::initializeState_Select() {
    mAnm[PAUSE_DISP_00_ANIM_ONOFF_TEXT].setFrame(0.0f);
 }
 void dLytPauseDisp00_c::executeState_Select() {
-    static const s32 sTabAnim2[] = {
+    static const s32 sReverseTabChangeAnim[] = {
        PAUSE_DISP_00_ANIM_RING_TO_ITEM,
        PAUSE_DISP_00_ANIM_RING_TO_POUCH,
        PAUSE_DISP_00_ANIM_RING_TO_SWORD,
    };

-    static const s32 sTabAnim3[] = {
+    // When our normal tab change anim is done (frame == 1.0f),
+    // we change to the next anim with frame == 0.0f.
+    // Not entirely sure why.
+    static const s32 sNextTabChangeAnim[] = {
+        // E.g. we're changing from B-Wheel to Pouch. When
+        // we're done with that transition
        PAUSE_DISP_00_ANIM_RING_TO_SWORD,
        PAUSE_DISP_00_ANIM_RING_TO_ITEM,
        PAUSE_DISP_00_ANIM_RING_TO_POUCH,
@@ -876,8 +900,8 @@ void dLytPauseDisp00_c::executeState_Select() {
            s32 controlGameTab = dLytControlGame_c::getInstance()->getPauseDisp00Tab();
            s32 lytPauseTab = dLytPauseMgr_c::GetInstance()->getCurrentDisp00Tab();
            d2d::AnmGroup_c *anm;
-            if (field_0xE376) {
-                anm = &mAnm[sTabAnim2[controlGameTab]];
+            if (mReverseTabChangeAnim) {
+                anm = &mAnm[sReverseTabChangeAnim[controlGameTab]];
                if (cM::isZero(anm->getFrame()) == true) {
                    setupRingIcons(lytPauseTab);
                    mStateMgr.changeState(StateID_Wait);
@@ -887,7 +911,7 @@ void dLytPauseDisp00_c::executeState_Select() {
                anm = &mAnm[controlGameTab + PAUSE_DISP_00_ANIM_RING_BASE];
                if (anm->isEndReached() == true) {
                    stopAnm(controlGameTab + PAUSE_DISP_00_ANIM_RING_BASE);
-                    setAnm(sTabAnim3[controlGameTab], 0.0f);
+                    setAnm(sNextTabChangeAnim[controlGameTab], 0.0f);
                    setupRingIcons(lytPauseTab);
                    mStateMgr.changeState(StateID_Wait);
                } else {
@@ -1591,6 +1615,7 @@ s32 dLytPauseDisp00_c::updateSelection() {
    dLytControlGame_c *lytControl = dLytControlGame_c::getInstance();
    dLytPauseMgr_c *pause = dLytPauseMgr_c::GetInstance();
    d2d::AnmGroup_c *pAnm;
+    int i;

    if (!pause->isStateWait()) {
        pause->setSelection(dLytPauseMgr_c::SELECT_NONE, 0, false);
@@ -1753,9 +1778,8 @@ s32 dLytPauseDisp00_c::updateSelection() {
    // TODO: this part needs to be fixed before we can deal with the regswaps.
    // Part of the `mpBoundings[navTargetToBounding(target)]->IsVisible()` here is kept around
    // until the end of the function where the same call appears.
-
    pAnm = &mAnm[PAUSE_DISP_00_ANIM_ONOFF_TABLET];
-    for (int i = PAUSE_DISP_00_BOUNDING_TABLETS; i < PAUSE_DISP_00_BOUNDING_HARP; i++) {
+    for (i = PAUSE_DISP_00_BOUNDING_TABLETS; i < PAUSE_DISP_00_BOUNDING_HARP; i++) {
        s32 anim = PAUSE_DISP_00_ANIM_ONOFF_TABLET + i;
        if (target != 0 && navTargetToBounding(target) == i && mpBoundings[navTargetToBounding(target)]->IsVisible()) {
            pAnm->play();
@@ -1775,7 +1799,7 @@ s32 dLytPauseDisp00_c::updateSelection() {
    }

    pAnm = &mAnm[PAUSE_DISP_00_ANIM_ONOFF_HARP];
-    for (int i = PAUSE_DISP_00_BOUNDING_HARP; i < PAUSE_DISP_00_BOUNDING_SHIREN + 1; i++) {
+    for (i = PAUSE_DISP_00_BOUNDING_HARP; i < PAUSE_DISP_00_BOUNDING_SHIREN + 1; i++) {
        if (target != 0 && navTargetToBounding(target) == i) {
            pAnm->play();
        } else {
@@ -1828,7 +1852,7 @@ s32 dLytPauseDisp00_c::updateSelection() {
                            PAUSE_DISP_00_ANIM_ONOFF_ITEM_OFFSET;

    pAnm = &mAnm[anmIdx];
-    for (int i = PAUSE_DISP_00_BOUNDING_RING_OFFSET;
+    for (i = PAUSE_DISP_00_BOUNDING_RING_OFFSET;
         i < PAUSE_DISP_00_BOUNDING_RING_OFFSET + PAUSE_DISP_00_ICONS_NUM_ITEMS_ON_WHEEL; i++) {
        if (target != 0 && navTargetToBounding(target) == i) {
            f32 frame = pAnm->getFrame();
@@ -2124,7 +2148,6 @@ void dLytPauseDisp00_c::loadRingText(u32 cmd) {
        mLyt.loadTextVariant("T_decideS_00", 0);
    } else {
        s32 msgIdx = 1;
-        // TODO: Don't these use different IDs?
        s32 tab = dLytControlGame_c::getInstance()->getPauseDisp00Tab();
        if (cmd == RING_TEXT_CURRENT_TAB) {
            tab = dLytPauseMgr_c::GetInstance()->getCurrentDisp00Tab();