mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-30 08:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
robojumper
2025-04-06 12:19:05 +02:00
parent ba2d569818
commit 45bc91d263
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+6 -6
View File
@@ -9202,21 +9202,21 @@ __dt__56sFStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c>Fv = .text:0x801
__dt__86sStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801681E0; // type:function size:0xA0 scope:weak
__dt__33sFStateFct_c<17dLytCommonArrow_c>Fv = .text:0x80168280; // type:function size:0x6C scope:weak
__dt__30sFState_c<17dLytCommonArrow_c>Fv = .text:0x801682F0; // type:function size:0x58 scope:weak
init__17dLytCommonArrow_cFv = .text:0x80168350; // type:function size:0x124
build__17dLytCommonArrow_cFv = .text:0x80168350; // type:function size:0x124
changeState__86sStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80168480; // type:function size:0x10 scope:weak
fn_80168490__17dLytCommonArrow_cFv = .text:0x80168490; // type:function size:0x68
fn_80168500__17dLytCommonArrow_cFv = .text:0x80168500; // type:function size:0xB0
remove__17dLytCommonArrow_cFv = .text:0x80168490; // type:function size:0x68
execute__17dLytCommonArrow_cFv = .text:0x80168500; // type:function size:0xB0
executeState__86sStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801685B0; // type:function size:0x10 scope:weak
getStateID__86sStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801685C0; // type:function size:0x10 scope:weak
addToDrawList__17dLytCommonArrow_cFv = .text:0x801685D0; // type:function size:0x34
draw__17dLytCommonArrow_cFv = .text:0x801685D0; // type:function size:0x34
setState__17dLytCommonArrow_cFl = .text:0x80168610; // type:function size:0x24
setTranslate__17dLytCommonArrow_cFPC3Vec = .text:0x80168640; // type:function size:0x34
requestIn__17dLytCommonArrow_cFv = .text:0x80168680; // type:function size:0x70
requestOut__17dLytCommonArrow_cFv = .text:0x801686F0; // type:function size:0x70
fn_80168760__17dLytCommonArrow_cFv = .text:0x80168760; // type:function size:0x2C
displayElement__17dLytCommonArrow_cFlf = .text:0x80168790; // type:function size:0x68
fn_80168800__17dLytCommonArrow_cFl = .text:0x80168800; // type:function size:0x10
fn_80168810__17dLytCommonArrow_cFPQ23d2d10AnmGroup_c = .text:0x80168810; // type:function size:0x64
unbindAt__17dLytCommonArrow_cFl = .text:0x80168800; // type:function size:0x10
tickDown__17dLytCommonArrow_cFPQ23d2d10AnmGroup_c = .text:0x80168810; // type:function size:0x64
fn_80168880__17dLytCommonArrow_cFv = .text:0x80168880; // type:function size:0xC4
initializeState_None__17dLytCommonArrow_cFv = .text:0x80168950; // type:function size:0x74
executeState_None__17dLytCommonArrow_cFv = .text:0x801689D0; // type:function size:0x28
include/d/lyt/d_lyt_common_arrow.h
+10 -10
View File
@@ -12,7 +12,7 @@ public:
dLytCommonArrow_c();
virtual ~dLytCommonArrow_c() {}
bool init();
bool build();
STATE_FUNC_DECLARE(dLytCommonArrow_c, None);
STATE_FUNC_DECLARE(dLytCommonArrow_c, In);
@@ -20,20 +20,20 @@ public:
STATE_FUNC_DECLARE(dLytCommonArrow_c, Out);
void setState(s32 state);
bool addToDrawList();
bool draw();
bool fn_80168490();
bool fn_80168500();
void setTranslate(const Vec *);
bool remove();
bool execute();
bool requestIn();
bool requestOut();
bool fn_80168760();
void displayElement(s32, f32);
void fn_80168800(s32);
void fn_80168810(d2d::AnmGroup_c *);
void fn_80168880();
private:
void setTranslate(const Vec *);
bool fn_80168760();
void displayElement(s32, f32);
void unbindAt(s32);
void tickDown(d2d::AnmGroup_c *);
void fn_80168880();
UI_STATE_MGR_DECLARE(dLytCommonArrow_c);
/* 0x40 */ d2d::LytBase_c mLytBase;
d2d::ResAccIf_c mResAcc;
src/d/lyt/d_lyt_common_arrow.cpp
+13 -13
View File
@@ -38,7 +38,7 @@ static const d2d::LytBrlanMapping brlanMap[] = {
dLytCommonArrow_c::dLytCommonArrow_c() : mStateMgr(*this, sStateID::null) {}
bool dLytCommonArrow_c::init() {
bool dLytCommonArrow_c::build() {
void *data = LayoutArcManager::GetInstance()->getLoadedData("CommonArrow");
mResAcc.attach(data, "");
mLytBase.build("commonArrow_00.brlyt", &mResAcc);
@@ -56,7 +56,7 @@ bool dLytCommonArrow_c::init() {
return true;
}
bool dLytCommonArrow_c::fn_80168490() {
bool dLytCommonArrow_c::remove() {
d2d::dLytStructDList::GetInstance()->removeFromList2(&mStructD);
mLytBase.unbindAnims();
for (int i = 0; i < 9; i++) {
@@ -65,7 +65,7 @@ bool dLytCommonArrow_c::fn_80168490() {
return true;
}
bool dLytCommonArrow_c::fn_80168500() {
bool dLytCommonArrow_c::execute() {
mStateMgr.executeState();
if (!mStateMgr.getStateID()->isEqual(StateID_None)) {
mAnmGroups[ANIM_LOOP].play();
@@ -77,7 +77,7 @@ bool dLytCommonArrow_c::fn_80168500() {
return true;
}
bool dLytCommonArrow_c::addToDrawList() {
bool dLytCommonArrow_c::draw() {
if (field_0x6CB == 1) {
mLytBase.addToDrawList();
}
@@ -130,11 +130,11 @@ void dLytCommonArrow_c::displayElement(s32 idx, f32 frame) {
s->setFrame(frame);
}
void dLytCommonArrow_c::fn_80168800(s32 idx) {
void dLytCommonArrow_c::unbindAt(s32 idx) {
mAnmGroups[idx].unbind();
}
void dLytCommonArrow_c::fn_80168810(d2d::AnmGroup_c *ctrl) {
void dLytCommonArrow_c::tickDown(d2d::AnmGroup_c *ctrl) {
if (ctrl->getFrame()) {
f32 newFrame = ctrl->getFrame() - 1.0f;
if (newFrame <= 0.0f) {
@@ -223,7 +223,7 @@ void dLytCommonArrow_c::executeState_In() {
}
}
void dLytCommonArrow_c::finalizeState_In() {
fn_80168800(ANIM_IN);
unbindAt(ANIM_IN);
}
void dLytCommonArrow_c::initializeState_Wait() {
@@ -240,19 +240,19 @@ void dLytCommonArrow_c::executeState_Wait() {
if (field_0x6B8 == 0) {
d2d::AnmGroup_c &g = mAnmGroups[ANIM_ONOFF_L];
g.play();
fn_80168810(&mAnmGroups[ANIM_ONOFF_R]);
tickDown(&mAnmGroups[ANIM_ONOFF_R]);
} else if (field_0x6B8 == 1) {
d2d::AnmGroup_c &g = mAnmGroups[ANIM_ONOFF_R];
g.play();
fn_80168810(&mAnmGroups[ANIM_ONOFF_L]);
tickDown(&mAnmGroups[ANIM_ONOFF_L]);
} else {
fn_80168810(&mAnmGroups[ANIM_ONOFF_L]);
fn_80168810(&mAnmGroups[ANIM_ONOFF_R]);
tickDown(&mAnmGroups[ANIM_ONOFF_L]);
tickDown(&mAnmGroups[ANIM_ONOFF_R]);
}
d2d::AnmGroup_c &g2 = mAnmGroups[ANIM_INPUT];
if (field_0x6CC != 0) {
fn_80168810(&g2);
tickDown(&g2);
} else {
g2.play();
}
@@ -278,7 +278,7 @@ void dLytCommonArrow_c::executeState_Wait() {
g.play();
} break;
case 2:
fn_80168800(field_0x6C0 + ANIM_DECIDE_OFFSET);
unbindAt(field_0x6C0 + ANIM_DECIDE_OFFSET);
mTimer = 0;
field_0x6CA = 0;
field_0x6C0 = 2;