summaryrefslogtreecommitdiff
path: root/include/SSystem
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-08-30 14:22:17 -0700
committerGitHub <noreply@github.com>2022-08-30 15:22:17 -0600
commitf8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 (patch)
tree69659df2105266e9b26a4d50b9a2d610b3e437a2 /include/SSystem
parentbc30d007e11458a198c5725626a10bb06a5da536 (diff)
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress * finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data * rename more data * remove asm / progress * match all of d_pane_class * fixes / some dKankyo doc * bunch of j2d work. d_drawlist / d_attention cleanup * progress / asm * cleanup wip * decompile JStage * setup some more JStudio structs * set up d_demo classes * some d_demo work * cleanup dolphin os stuff * some initial dEvent documentation * some At collision documentation * match JUTConsole::doDraw * dbgs work / split up some of d_a_alink into .inc files * d_a_alink_spinner work
Diffstat (limited to 'include/SSystem')
-rw-r--r--include/SSystem/SComponent/c_bg_s_gnd_chk.h3
-rw-r--r--include/SSystem/SComponent/c_bg_s_poly_info.h2
-rw-r--r--include/SSystem/SComponent/c_bg_w.h2
-rw-r--r--include/SSystem/SComponent/c_cc_d.h22
4 files changed, 28 insertions, 1 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
index d1b2ceef59..14a03b8742 100644
--- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
@@ -15,6 +15,9 @@ public:
/* 80267C94 */ virtual ~cBgS_GndChk();
+ f32 GetNowY() const { return mNowY; }
+ void SetNowY(f32 y) { mNowY = y; }
+
private:
/* 0x24 */ cXyz m_pos;
/* 0x30 */ u32 mFlags;
diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h
index 984c0cd5b9..a3b5e915bf 100644
--- a/include/SSystem/SComponent/c_bg_s_poly_info.h
+++ b/include/SSystem/SComponent/c_bg_s_poly_info.h
@@ -8,7 +8,7 @@ private:
/* 0x00 */ u16 mPolyIndex;
/* 0x02 */ u16 mBgIndex;
/* 0x04 */ void* unk_0x04;
- /* 0x08 */ u32 unk_0x08;
+ /* 0x08 */ unsigned int mActorId;
public:
cBgS_PolyInfo();
diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h
index 9837f8a2e0..4e755a9cee 100644
--- a/include/SSystem/SComponent/c_bg_w.h
+++ b/include/SSystem/SComponent/c_bg_w.h
@@ -17,6 +17,8 @@ public:
cBgW_BgId() { Ct(); }
void Ct() { m_id = 0x100; }
+
+ u16 GetId() const { return m_id; }
};
bool cBgW_CheckBGround(float a1);
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 1f1dfce7df..5259f17acd 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -18,6 +18,28 @@ class cCcD_AabAttr;
class cCcD_CylAttr;
class cCcD_SphAttr;
+enum cCcD_ObjAtType {
+ /* 0x00000002 */ AT_TYPE_NORMAL_SWORD = (1 << 1), // wooden or ordon
+ /* 0x00000004 */ AT_TYPE_HORSE = (1 << 2),
+ /* 0x00000008 */ AT_TYPE_THROW_OBJ = (1 << 3),
+ /* 0x00000010 */ AT_TYPE_SHIELD_ATTACK = (1 << 4),
+ /* 0x00000020 */ AT_TYPE_BOMB = (1 << 5),
+ /* 0x00000080 */ AT_TYPE_SLINGSHOT = (1 << 7),
+ /* 0x00000400 */ AT_TYPE_CSTATUE_SWING = (1 << 10),
+ /* 0x00002000 */ AT_TYPE_ARROW = (1 << 13),
+ /* 0x00004000 */ AT_TYPE_HOOKSHOT = (1 << 14),
+ /* 0x00010000 */ AT_TYPE_BOOMERANG = (1 << 16),
+ /* 0x00040000 */ AT_TYPE_SPINNER = (1 << 18),
+ /* 0x00100000 */ AT_TYPE_CSTATUE_BOSS_SWING = (1 << 20),
+ /* 0x00200000 */ AT_TYPE_HEAVY_BOOTS = (1 << 21),
+ /* 0x00400000 */ AT_TYPE_IRON_BALL = (1 << 22),
+ /* 0x00800000 */ AT_TYPE_COPY_ROD = (1 << 23),
+ /* 0x04000000 */ AT_TYPE_MASTER_SWORD = (1 << 26),
+ /* 0x08000000 */ AT_TYPE_MIDNA_LOCK = (1 << 27),
+ /* 0x40000000 */ AT_TYPE_WOLF_CUT_TURN = (1 << 30),
+ /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1 << 31),
+};
+
class cCcD_ShapeAttr {
public:
/* 0x00 */ cM3dGAab mAab;