diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 02776db9..d3e51b77 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -14899,40 +14899,40 @@ changeSavedDisp__14dLytPauseMgr_cFv = .text:0x80281360; // type:function size:0x saveTabFlag__14dLytPauseMgr_cFv = .text:0x802813D0; // type:function size:0x34 checkRing__14dLytPauseMgr_cFv = .text:0x80281410; // type:function size:0xC8 setSelectHand__14dLytPauseMgr_cFff = .text:0x802814E0; // type:function size:0xC -build__30sFStateFct_c<14dLytPauseMgr_c>FRC12sStateIDIf_c = .text:0x802814F0; // type:function size:0x60 -dispose__30sFStateFct_c<14dLytPauseMgr_c>FRP10sStateIf_c = .text:0x80281550; // type:function size:0xC -build__31sFStateFct_c<15dLytPauseMain_c>FRC12sStateIDIf_c = .text:0x80281560; // type:function size:0x60 -dispose__31sFStateFct_c<15dLytPauseMain_c>FRP10sStateIf_c = .text:0x802815C0; // type:function size:0xC -initialize__27sFState_c<14dLytPauseMgr_c>Fv = .text:0x802815D0; // type:function size:0x1C -execute__27sFState_c<14dLytPauseMgr_c>Fv = .text:0x802815F0; // type:function size:0x1C -finalize__27sFState_c<14dLytPauseMgr_c>Fv = .text:0x80281610; // type:function size:0x1C -initialize__28sFState_c<15dLytPauseMain_c>Fv = .text:0x80281630; // type:function size:0x1C -execute__28sFState_c<15dLytPauseMain_c>Fv = .text:0x80281650; // type:function size:0x1C -finalize__28sFState_c<15dLytPauseMain_c>Fv = .text:0x80281670; // type:function size:0x1C -initializeState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80281690; // type:function size:0x10 -finalizeState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802816A0; // type:function size:0x10 -refreshState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802816B0; // type:function size:0x10 -getState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802816C0; // type:function size:0x10 -getNewStateID__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802816D0; // type:function size:0x10 -getOldStateID__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802816E0; // type:function size:0x10 -initializeState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802816F0; // type:function size:0x10 -finalizeState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80281700; // type:function size:0x10 -refreshState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80281710; // type:function size:0x10 -getState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281720; // type:function size:0x10 -getNewStateID__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281730; // type:function size:0x10 -getStateID__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281740; // type:function size:0x10 -getOldStateID__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281750; // type:function size:0x10 -finalizeState__30sFStateID_c<15dLytPauseMain_c>CFR15dLytPauseMain_c = .text:0x80281760; // type:function size:0x30 -executeState__30sFStateID_c<15dLytPauseMain_c>CFR15dLytPauseMain_c = .text:0x80281790; // type:function size:0x30 -initializeState__30sFStateID_c<15dLytPauseMain_c>CFR15dLytPauseMain_c = .text:0x802817C0; // type:function size:0x30 -finalizeState__29sFStateID_c<14dLytPauseMgr_c>CFR14dLytPauseMgr_c = .text:0x802817F0; // type:function size:0x30 -executeState__29sFStateID_c<14dLytPauseMgr_c>CFR14dLytPauseMgr_c = .text:0x80281820; // type:function size:0x30 -initializeState__29sFStateID_c<14dLytPauseMgr_c>CFR14dLytPauseMgr_c = .text:0x80281850; // type:function size:0x30 -__sinit_\d_lyt_pause_cpp = .text:0x80281880; // type:function size:0xC14 -__dt__30sFStateID_c<15dLytPauseMain_c>Fv = .text:0x802824A0; // type:function size:0x58 -__dt__29sFStateID_c<14dLytPauseMgr_c>Fv = .text:0x80282500; // type:function size:0x58 -isSameName__29sFStateID_c<14dLytPauseMgr_c>CFPCc = .text:0x80282560; // type:function size:0x88 -isSameName__30sFStateID_c<15dLytPauseMain_c>CFPCc = .text:0x802825F0; // type:function size:0x88 +build__30sFStateFct_c<14dLytPauseMgr_c>FRC12sStateIDIf_c = .text:0x802814F0; // type:function size:0x60 scope:weak +dispose__30sFStateFct_c<14dLytPauseMgr_c>FRP10sStateIf_c = .text:0x80281550; // type:function size:0xC scope:weak +build__31sFStateFct_c<15dLytPauseMain_c>FRC12sStateIDIf_c = .text:0x80281560; // type:function size:0x60 scope:weak +dispose__31sFStateFct_c<15dLytPauseMain_c>FRP10sStateIf_c = .text:0x802815C0; // type:function size:0xC scope:weak +initialize__27sFState_c<14dLytPauseMgr_c>Fv = .text:0x802815D0; // type:function size:0x1C scope:weak +execute__27sFState_c<14dLytPauseMgr_c>Fv = .text:0x802815F0; // type:function size:0x1C scope:weak +finalize__27sFState_c<14dLytPauseMgr_c>Fv = .text:0x80281610; // type:function size:0x1C scope:weak +initialize__28sFState_c<15dLytPauseMain_c>Fv = .text:0x80281630; // type:function size:0x1C scope:weak +execute__28sFState_c<15dLytPauseMain_c>Fv = .text:0x80281650; // type:function size:0x1C scope:weak +finalize__28sFState_c<15dLytPauseMain_c>Fv = .text:0x80281670; // type:function size:0x1C scope:weak +initializeState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80281690; // type:function size:0x10 scope:weak +finalizeState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802816A0; // type:function size:0x10 scope:weak +refreshState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802816B0; // type:function size:0x10 scope:weak +getState__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802816C0; // type:function size:0x10 scope:weak +getNewStateID__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802816D0; // type:function size:0x10 scope:weak +getOldStateID__83sStateMgr_c<14dLytPauseMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802816E0; // type:function size:0x10 scope:weak +initializeState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802816F0; // type:function size:0x10 scope:weak +finalizeState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80281700; // type:function size:0x10 scope:weak +refreshState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80281710; // type:function size:0x10 scope:weak +getState__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281720; // type:function size:0x10 scope:weak +getNewStateID__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281730; // type:function size:0x10 scope:weak +getStateID__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281740; // type:function size:0x10 scope:weak +getOldStateID__84sStateMgr_c<15dLytPauseMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80281750; // type:function size:0x10 scope:weak +finalizeState__30sFStateID_c<15dLytPauseMain_c>CFR15dLytPauseMain_c = .text:0x80281760; // type:function size:0x30 scope:weak +executeState__30sFStateID_c<15dLytPauseMain_c>CFR15dLytPauseMain_c = .text:0x80281790; // type:function size:0x30 scope:weak +initializeState__30sFStateID_c<15dLytPauseMain_c>CFR15dLytPauseMain_c = .text:0x802817C0; // type:function size:0x30 scope:weak +finalizeState__29sFStateID_c<14dLytPauseMgr_c>CFR14dLytPauseMgr_c = .text:0x802817F0; // type:function size:0x30 scope:weak +executeState__29sFStateID_c<14dLytPauseMgr_c>CFR14dLytPauseMgr_c = .text:0x80281820; // type:function size:0x30 scope:weak +initializeState__29sFStateID_c<14dLytPauseMgr_c>CFR14dLytPauseMgr_c = .text:0x80281850; // type:function size:0x30 scope:weak +__sinit_\d_lyt_pause_cpp = .text:0x80281880; // type:function size:0xC14 scope:local +__dt__30sFStateID_c<15dLytPauseMain_c>Fv = .text:0x802824A0; // type:function size:0x58 scope:weak +__dt__29sFStateID_c<14dLytPauseMgr_c>Fv = .text:0x80282500; // type:function size:0x58 scope:weak +isSameName__29sFStateID_c<14dLytPauseMgr_c>CFPCc = .text:0x80282560; // type:function size:0x88 scope:weak +isSameName__30sFStateID_c<15dLytPauseMain_c>CFPCc = .text:0x802825F0; // type:function size:0x88 scope:weak __ct__14dLytGameOver_cFv = .text:0x80282680; // type:function size:0x22C __dt__53sFStateMgr_c<14dLytGameOver_c,20sStateMethodUsr_FI_c>Fv = .text:0x802828B0; // type:function size:0xA4 __dt__83sStateMgr_c<14dLytGameOver_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80282960; // type:function size:0xA0 @@ -30905,7 +30905,7 @@ __vt__22CurrentStageArcManager = .data:0x8050E004; // type:object size:0xC @4271 = .data:0x8050E010; // type:object size:0x10 scope:local data:string @4278 = .data:0x8050E020; // type:object size:0xC scope:local data:string __vt__11OarcManager = .data:0x8050E02C; // type:object size:0xC -__vt__16ObjectArcControl = .data:0x8050E038; // type:object size:0x10 +__vt__16ObjectArcControl = .data:0x8050E038; // type:object size:0xC __vt__16LayoutArcManager = .data:0x8050E048; // type:object size:0xC __vt__16LayoutArcControl = .data:0x8050E054; // type:object size:0xC lbl_8050E060 = .data:0x8050E060; // type:object size:0x30 diff --git a/src/d/lyt/d_lyt_pause.cpp b/src/d/lyt/d_lyt_pause.cpp index e139e48f..afc09d73 100644 --- a/src/d/lyt/d_lyt_pause.cpp +++ b/src/d/lyt/d_lyt_pause.cpp @@ -7,8 +7,8 @@ #include "d/d_gfx.h" #include "d/d_heap.h" #include "d/d_pad.h" +#include "d/d_pad_manager.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" @@ -409,8 +409,7 @@ void dLytPauseMain_c::executeState_Select() { case 300: { if (mpDisp00->isChangingState() == true) { mStep++; - // TODO - dPadManager_c - fn_80059F40(dPauseManager_c::GetInstance()); + dPadManager_c::GetInstance()->requestMplsCalibration(); } break; }