mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-04 10:11:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

dKyr_sun_move progress

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-10-25 01:02:42 -07:00
parent 45019aca6b
commit d7ff28a6f7
8 changed files with 260 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_cc_mass_s.h
+1
View File
@@ -36,6 +36,7 @@ private:
/* 0x0C */ f32 mCoHitLen;
public:
virtual ~dCcMassS_HitInf() {}
void ClearPointer();
void SetAreaHitObj(cCcD_Obj* obj) { mpArea = obj; }
void SetCoHitObj(cCcD_Obj* obj) { mpCoObj = obj; }
include/d/d_com_inf_game.h
+2
View File
@@ -2141,6 +2141,8 @@ inline MtxP dComIfGd_getViewRotMtx() {
inline void dComIfGd_set2DOpa(dDlst_base_c* pBase) { g_dComIfG_gameInfo.drawlist.set2DOpa(pBase); }
inline void dComIfGd_set2DXlu(dDlst_base_c* pBase) { g_dComIfG_gameInfo.drawlist.set2DXlu(pBase); }
inline void dComIfGd_peekZ(s16 x, s16 y, u32 * data) { g_dComIfG_gameInfo.drawlist.newPeekZdata(x, y, data); }
inline void dComIfGd_setWindow(dDlst_window_c* pWindow) { g_dComIfG_gameInfo.drawlist.setWindow(pWindow); }
inline void dComIfGd_setViewPort(view_port_class* pViewPort) { g_dComIfG_gameInfo.drawlist.setViewPort(pViewPort); }
inline void dComIfGd_setView(view_class* pView) { g_dComIfG_gameInfo.drawlist.setView(pView); }
include/d/d_drawlist.h
+2
View File
@@ -397,6 +397,8 @@ public:
static void offWipe() { mWipe = false; }
void newPeekZdata(s16 x, s16 y, u32 * data) { mPeekZ.newData(x, y, data); }
static bool mWipe;
/* 0x00000 */ J3DDrawBuffer* mpOpaListSky;
include/d/d_kankyo.h
+4
View File
@@ -412,6 +412,10 @@ void dKy_arrowcol_chg_on(cXyz*, int);
void dKy_arrowcol_chg_move();
void dKy_setLight_init();
void GxXFog_set();
void dKy_set_actcol_ratio(f32 ratio);
void dKy_set_bgcol_ratio(f32 ratio);
void dKy_set_fogcol_ratio(f32 ratio);
void dKy_set_vrboxcol_ratio(f32 ratio);
void dKy_set_vrboxsoracol_ratio(f32 ratio);
void dKy_set_vrboxkumocol_ratio(f32 ratio);
cXyz dKy_get_orion_pos();
include/d/d_kankyo_wether.h
+7 -3
View File
@@ -152,10 +152,14 @@ struct POISON_EFF {
POISON_EFF();
~POISON_EFF();
/* 0x00 */ u8 mStatus;
/* 0x01 */ u8 field_0x1[0x2F];
/* 0x00 */ s8 mStatus;
/* 0x04 */ cXyz mPos;
/* 0x10 */ u8 field_0x10[0x1E];
/* 0x2E */ s16 field_0x2e;
};
STATIC_ASSERT(sizeof(POISON_EFF) == 0x30);
class dKankyo_poison_Packet : public J3DPacket {
public:
dKankyo_poison_Packet() {}
@@ -164,7 +168,7 @@ public:
virtual ~dKankyo_poison_Packet();
/* 0x0010 */ POISON_EFF mEff[1000];
/* 0xBB90 */ u8 field_0xbb90[0xBB9C - 0xBB90];
/* 0xBB90 */ cXyz field_0xbb90;
/* 0xBB9C */ cXyz field_0xbb9c;
/* 0xBBA8 */ u32 mCount;
/* 0xBBAC */ u8* mpTexture;
include/d/d_snap.h
+17 -1
View File
@@ -3,7 +3,23 @@
#include "f_op/f_op_actor.h"
class dSnap_Obj;
class dSnap_Obj {
public:
/* 0x00 */ cXyz field_0x00;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ s32 mBsPcId;
/* 0x18 */ u32 field_0x18[6];
public:
dSnap_Obj();
virtual ~dSnap_Obj() {}
void SetGeoSph(const Vec & c, f32 r);
void SetInf(u8, const fopAc_ac_c*, u8, u8, s16);
};
STATIC_ASSERT(sizeof(dSnap_Obj) == 0x34);
void dSnap_PhotoIndex2TableIndex(int);
void dSnap_GetFigRoomId(int);