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

Pad stuff

Browse Source
This commit is contained in:
elijah-thomas774
2025-06-15 14:40:59 -04:00
parent 2707f74d70
commit e4b1c30f47
40 changed files with 2258 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/msg_window/d_lyt_msg_window.cpp
+13 -9
View File
@@ -27,6 +27,7 @@
#include "d/lyt/d_lyt_auto_caption.h"
// clang-format on
#include "d/d_gfx.h"
#include "d/snd/d_snd_small_effect_mgr.h"
#include "f/f_base.h"
#include "m/m_fader_base.h"
@@ -36,7 +37,6 @@
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/fi_context.h"
#include "toBeSorted/lyt_related_floats.h"
#include "toBeSorted/music_mgrs.h"
#include "toBeSorted/other_sound_stuff.h"
@@ -265,9 +265,14 @@ void dLytMsgWindow_c::initializeState_In() {
param = 1;
} else if (obj != nullptr && d3d::fn_80016A90(obj->poscopy2)) {
d3d::fn_80016960(field_0x768, obj->poscopy2);
// TODO - stack and FPR problems
field_0x768 = mVec3_c(field_0x768.x, field_0x768.y, 0.0f);
if (field_0x768.y < get_8057511C() / 3.0f + get_80575134()) {
mVec3_c v = field_0x768;
v.z = 0.f;
field_0x768 = v;
f32 h, b;
h = dGfx_c::getCurrentScreenHeight();
b = +dGfx_c::getCurrentScreenBottom();
if (v.y < b + (h / 3.f)) {
param = 2;
}
}
@@ -297,7 +302,7 @@ void dLytMsgWindow_c::executeState_OutputText() {
if (field_0x815 == 0 && field_0x816 == 0) {
mpMsgWindowUnk->textAdvancingRelated(false, true);
if (field_0x811 == 0 && dPad::checkButtonAHeld() && field_0x815 == 0 && field_0x816 == 0) {
if (field_0x811 == 0 && dPad::getDownA() && field_0x815 == 0 && field_0x816 == 0) {
mpMsgWindowUnk->textAdvancingRelated(false, true);
}
}
@@ -354,7 +359,7 @@ void dLytMsgWindow_c::executeState_WaitKeyChangePage0() {
field_0x813 = 0;
allowChange = true;
}
} else if (dPad::checkButtonAPressed() || fn_8011A5D0()) {
} else if (dPad::getDownTrigA() || fn_8011A5D0()) {
fn_8035E880(BGM_MGR);
allowChange = true;
}
@@ -414,7 +419,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
field_0x813 = 0;
allowChange = true;
}
} else if (dPad::checkButtonAPressed() || fn_8011A5D0()) {
} else if (dPad::getDownTrigA() || fn_8011A5D0()) {
fn_8035E880(BGM_MGR);
allowChange = true;
}
@@ -553,8 +558,7 @@ void dLytMsgWindow_c::finalizeState_MapOpen() {}
void dLytMsgWindow_c::initializeState_WaitKeyMapClose() {}
void dLytMsgWindow_c::executeState_WaitKeyMapClose() {
if ((dPad::checkButtonBPressed() || dPad::checkButtonPlusPressed()) &&
!dLytControlGame_c::getInstance()->isNotInStateMap()) {
if ((dPad::getDownTrigB() || dPad::getDownTrigPlus()) && !dLytControlGame_c::getInstance()->isNotInStateMap()) {
dLytControlGame_c::getInstance()->fn_802CCD40(true);
mStateMgr.changeState(StateID_MapClose);
}
src/d/lyt/msg_window/d_lyt_msg_window_select_btn.cpp
+2 -3
View File
@@ -6,7 +6,6 @@
#include "d/snd/d_snd_small_effect_mgr.h"
#include "toBeSorted/music_mgrs.h"
STATE_DEFINE(dLytMsgWindowSelectBtnParts_c, Wait);
STATE_DEFINE(dLytMsgWindowSelectBtnParts_c, On);
STATE_DEFINE(dLytMsgWindowSelectBtnParts_c, Select);
@@ -328,7 +327,7 @@ void dLytMsgWindowSelectBtn_c::executeState_WaitSelect() {
return;
}
if (mBtnHelper.field_0x50 >= 0 && dPad::checkButtonAPressed()) {
if (mBtnHelper.field_0x50 >= 0 && dPad::getDownTrigA()) {
field_0x9D0 = 0;
field_0x9B0 = mBtnHelper.field_0x50;
mStateMgr.changeState(StateID_WaitDecide);
@@ -339,7 +338,7 @@ void dLytMsgWindowSelectBtn_c::executeState_WaitSelect() {
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_TALK_CURSOR_OK);
}
fn_8035E880(BGM_MGR);
} else if (dPad::checkButtonBPressed()) {
} else if (dPad::getDownTrigB()) {
f32 f = mBtnHelper.fn_8011D690(field_0x9BC);
// TODO
field_0x9CC = field_0x9BC;
src/d/lyt/msg_window/d_lyt_msg_window_sword.cpp
+3 -2
View File
@@ -1,6 +1,7 @@
#include "d/lyt/msg_window/d_lyt_msg_window_sword.h"
#include "common.h"
#include "d/d_gfx.h"
#include "d/d_tag_processor.h"
#include "d/d_textunk.h"
#include "d/lyt/d2d.h"
@@ -11,7 +12,6 @@
#include "nw4r/lyt/lyt_types.h"
#include "nw4r/math/math_types.h"
#include "s/s_State.hpp"
#include "toBeSorted/lyt_related_floats.h"
STATE_DEFINE(dLytMsgWindowSword_c, Invisible);
STATE_DEFINE(dLytMsgWindowSword_c, In);
@@ -271,7 +271,8 @@ void dLytMsgWindowSword_c::draw() {
mCharacterData[i].displayTimerMaybe += 1;
}
mVec3_c v(
(mOffset.x + mCharacterData[i].posX) / get_805751A4(), mOffset.y + mCharacterData[i].posY, 0.0f
(mOffset.x + mCharacterData[i].posX) / dGfx_c::get16x9to4x3WidthScaleF(),
mOffset.y + mCharacterData[i].posY, 0.0f
);
wchar_t str[2];