summaryrefslogtreecommitdiff
path: root/include/d
diff options
context:
space:
mode:
authorCaroline Madsen <69010899+randomsalience@users.noreply.github.com>2024-01-31 13:49:22 -0500
committerGitHub <noreply@github.com>2024-01-31 20:49:22 +0200
commit9774b42db81ea5f3ccb7452a42ad93bf9ada92b2 (patch)
tree8343c11fef9463d864f917601408af683c4a4cca /include/d
parent4a081109bdc7283d0e086a73f01b74f7addffc34 (diff)
d_a_obj_mirror_screw OK, work on d_a_obj_mirror_chain and d_a_obj_mirror_table (#2057)
Diffstat (limited to 'include/d')
-rw-r--r--include/d/a/d_a_player.h5
-rw-r--r--include/d/bg/d_bg_w.h2
-rw-r--r--include/d/com/d_com_inf_game.h4
-rw-r--r--include/d/d_drawlist.h1
4 files changed, 11 insertions, 1 deletions
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index c3511a4a69..ce296554e8 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -814,6 +814,11 @@ public:
void i_onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; }
+ cXyz* getLeftHandPosP() { return &mLeftHandPos; }
+ cXyz* getRightHandPosP() { return &mRightHandPos; }
+ cXyz* i_getLeftFootPosP() { return &mLeftFootPos; }
+ cXyz* i_getRightFootPosP() { return &mRightFootPos; }
+
u32 i_checkWolf() const { return i_checkNoResetFlg1(FLG1_IS_WOLF); }
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h
index 0fd8779bd0..3338404bfa 100644
--- a/include/d/bg/d_bg_w.h
+++ b/include/d/bg/d_bg_w.h
@@ -230,7 +230,7 @@ public:
/* 0x7C */ cXyz mTransVel;
/* 0x88 */ u8 mFlags;
/* 0x89 */ u8 mNeedsFullTransform;
- /* 0x8A */ u8 field_0x8a[6];
+ /* 0x8C */ u32 field_0x8c;
/* 0x90 */ u8 mMoveCounter;
/* 0x91 */ u8 field_0x91;
/* 0x92 */ u16 m_rootGrpIdx;
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 27d6f06136..7c8a784960 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -3804,6 +3804,10 @@ inline J3DDrawBuffer* dComIfGd_getOpaListDark() {
return g_dComIfG_gameInfo.drawlist.getOpaListDark();
}
+inline J3DDrawBuffer* dComIfGd_getXluListBG() {
+ return g_dComIfG_gameInfo.drawlist.getXluListBG();
+}
+
inline void dComIfGd_init() {
g_dComIfG_gameInfo.drawlist.init();
}
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 9ece698705..73d69d7ddb 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -311,6 +311,7 @@ public:
J3DDrawBuffer* getOpaListPacket() { return mDrawBuffers[DB_OPA_LIST_PACKET]; }
J3DDrawBuffer* getOpaListBG() { return mDrawBuffers[DB_OPA_LIST_BG]; }
J3DDrawBuffer* getOpaListDark() { return mDrawBuffers[DB_OPA_LIST_DARK]; }
+ J3DDrawBuffer* getXluListBG() { return mDrawBuffers[DB_XLU_LIST_BG]; }
void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSys_XLU_BUFFER_e); }
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSys_OPA_BUFFER_e); }
void setXluListSky() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); }