mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-03 01:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
robojumper
2025-07-09 22:18:34 +02:00
parent 4f9d63d357
commit a617b9f8cf
14 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/msg_window/d_lyt_msg_window.cpp
+7 -7
View File
@@ -28,6 +28,7 @@
// clang-format on
#include "d/d_gfx.h"
#include "d/snd/d_snd_player_mgr.h"
#include "d/snd/d_snd_small_effect_mgr.h"
#include "f/f_base.h"
#include "m/m_fader_base.h"
@@ -37,7 +38,6 @@
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/fi_context.h"
#include "toBeSorted/music_mgrs.h"
#include "toBeSorted/other_sound_stuff.h"
#include <cstring>
@@ -345,7 +345,7 @@ void dLytMsgWindow_c::initializeState_WaitKeyChangePage0() {
if (field_0x811 != 0) {
field_0x812 = 1;
} else if (field_0x814 == 0) {
fn_8035E860(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->enterMsgWait();
}
}
void dLytMsgWindow_c::executeState_WaitKeyChangePage0() {
@@ -360,7 +360,7 @@ void dLytMsgWindow_c::executeState_WaitKeyChangePage0() {
allowChange = true;
}
} else if (dPad::getDownTrigA() || fn_8011A5D0()) {
fn_8035E880(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->leaveMsgWait();
allowChange = true;
}
@@ -403,7 +403,7 @@ void dLytMsgWindow_c::initializeState_WaitKeyMsgEnd0() {
if (field_0x811 != 0) {
field_0x812 = 1;
} else if (mpTagProcessor->getField_0x90E() == 0 && field_0x814 == 0) {
fn_8035E860(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->enterMsgWait();
}
}
void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
@@ -420,7 +420,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
allowChange = true;
}
} else if (dPad::getDownTrigA() || fn_8011A5D0()) {
fn_8035E880(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->leaveMsgWait();
allowChange = true;
}
@@ -441,7 +441,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
}
field_0x810 = 0;
} else {
fn_8035E820(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->unsetMsgActor();
if (mpTagProcessor->getField_0x90E() != 0) {
mStateMgr.changeState(StateID_WaitKeySelectQuestion);
} else {
@@ -465,7 +465,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd1() {
}
field_0x810 = 0;
} else {
fn_8035E820(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->unsetMsgActor();
if (mpTagProcessor->getField_0x90E() != 0) {
mStateMgr.changeState(StateID_WaitKeySelectQuestion);
} else if (field_0x817 == 0) {
src/d/lyt/msg_window/d_lyt_msg_window_select_btn.cpp
+4 -4
View File
@@ -4,8 +4,8 @@
#include "d/d_pad.h"
#include "d/d_pad_nav.h"
#include "d/lyt/d2d.h"
#include "d/snd/d_snd_player_mgr.h"
#include "d/snd/d_snd_small_effect_mgr.h"
#include "toBeSorted/music_mgrs.h"
STATE_DEFINE(dLytMsgWindowSelectBtnParts_c, Wait);
STATE_DEFINE(dLytMsgWindowSelectBtnParts_c, On);
@@ -302,7 +302,7 @@ void dLytMsgWindowSelectBtn_c::finalizeState_In() {
void dLytMsgWindowSelectBtn_c::initializeState_WaitSelect() {
if (field_0x9D0 == 0) {
field_0x9D0 = true;
fn_8035E860(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->enterMsgWait();
}
mBtnHelper.fn_8011C970();
@@ -340,7 +340,7 @@ void dLytMsgWindowSelectBtn_c::executeState_WaitSelect() {
} else {
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_TALK_CURSOR_OK);
}
fn_8035E880(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->leaveMsgWait();
} else if (dPad::getDownTrigB()) {
f32 f = mBtnHelper.fn_8011D690(field_0x9BC);
// TODO
@@ -353,7 +353,7 @@ void dLytMsgWindowSelectBtn_c::executeState_WaitSelect() {
} else {
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_TALK_CURSOR_OK);
}
fn_8035E880(BGM_MGR);
dSndPlayerMgr_c::GetInstance()->leaveMsgWait();
}
}
void dLytMsgWindowSelectBtn_c::finalizeState_WaitSelect() {}