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

update to cursor work (#45)

Browse Source
This commit is contained in:
robojumper
2024-10-26 04:03:54 +02:00
committed by GitHub
parent 5995604387
commit 532afc7b2a
6 changed files with 189 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_cs_base.h
+5
View File
@@ -1,6 +1,7 @@
#ifndef D_C_BASE_H
#define D_C_BASE_H
#include "common.h"
#include "d/d_cs.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_cursor_stick.h"
@@ -25,6 +26,10 @@ public:
field_0x703 = val;
}
d2d::dLytStructD *getUnk() {
return mStructC.field_0x14;
}
private:
static int sfield0x700Init;
void setCurrentLyt(int lyt);
include/d/lyt/d_lyt_common_arrow.h
+13 -12
View File
@@ -3,6 +3,7 @@
#include "d/lyt/d2d.h"
#include "d/lyt/d_structd.h"
#include "nw4r/lyt/lyt_bounding.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
@@ -23,11 +24,11 @@ public:
bool fn_80168490();
bool fn_80168500();
void fn_80168640(f32 *);
bool fn_80168680();
bool fn_801686F0();
void setTranslate(const Vec *);
bool requestIn();
bool requestOut();
bool fn_80168760();
void fn_80168790(s32, f32);
void displayElement(s32, f32);
void fn_80168800(s32);
void fn_80168810(d2d::AnmGroup_c *);
void fn_80168880();
@@ -36,18 +37,18 @@ private:
UI_STATE_MGR_DECLARE(dLytCommonArrow_c);
/* 0x40 */ d2d::LytBase_c mLytBase;
d2d::ResAccIf_c mResAcc;
d2d::AnmGroup_c field_0x440[0x9];
d2d::dLytStructD field_0x680;
void *field_0x6A8;
void *field_0x6AC;
s32 field_0x6B0;
d2d::AnmGroup_c mAnmGroups[0x9];
d2d::dLytStructD mStructD;
nw4r::lyt::Bounding *mBoundingL;
nw4r::lyt::Bounding *mBoundingR;
s32 mType;
s32 field_0x6B4;
s32 field_0x6B8;
s32 field_0x6BC;
s32 field_0x6C0;
s32 field_0x6C4;
u8 field_0x6C8;
u8 field_0x6C9;
s32 mTimer;
u8 mInRequested;
u8 mOutRequested;
u8 field_0x6CA;
u8 field_0x6CB;
u8 field_0x6CC;
include/d/lyt/d_structd.h
+11 -6
View File
@@ -1,21 +1,23 @@
#ifndef D_LYT_STRUCTD_H
#define D_LYT_STRUCTD_H
#include "common.h"
#include "egg/core/eggHeap.h"
#include "nw4r/ut/ut_LinkList.h"
#include "toBeSorted/tlist.h"
namespace d2d {
class dLytStructD;
class dLytStructC {
public:
dLytStructC() : field_0x10(0), field_0x14(0) {}
dLytStructC() : field_0x10(0), field_0x14(nullptr) {}
virtual ~dLytStructC() {}
virtual void *dLytStructC0x0C();
TListNode<dLytStructC> mLink;
u16 field_0x10;
s32 field_0x14;
dLytStructD *field_0x14;
};
class dLytStructCSub : public dLytStructC {
@@ -30,7 +32,8 @@ public:
struct dLytStructD_Base {
dLytStructD_Base() : field_0x0C(0), field_0x10(0), field_0x14(0), field_0x015(0), field_0x016(0) {}
virtual ~dLytStructD_Base() {}
virtual u32 getType() = 0;
virtual void doSomething() = 0;
TListNode<dLytStructD_Base> mLink;
u32 field_0x0C;
u32 field_0x10;
@@ -56,8 +59,10 @@ struct dLytStructDInArray {
};
struct dLytStructD : dLytStructD_Base {
dLytStructD() : field_0x18(0), field_0x1C(nullptr), field_0x20(0), field_0x22(0), field_0x23(0), field_0x24(0) {}
dLytStructD() : field_0x18(0), field_0x1C(nullptr), field_0x20(0), field_0x22(0), field_0x23(0), field_0x24(nullptr) {}
virtual u32 getType() override;
virtual void doSomething() override;
virtual ~dLytStructD();
void init(nw4r::lyt::Pane *, u16, u8, u8);
@@ -69,7 +74,7 @@ struct dLytStructD : dLytStructD_Base {
u16 field_0x20;
u8 field_0x22;
u8 field_0x23;
u32 field_0x24;
void *field_0x24;
};
class dLytStructDList {