mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-08 18:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from LagoLunatic/item

Browse Source 
d_item_data & d_a_itembase OK
This commit is contained in:
Jasper St. Pierre
2023-09-22 19:48:04 -07:00
committed by GitHub
parent 7c32410878 267b501438
commit c8292b3624
19 changed files with 10545 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JParticle/JPAEmitter.h
+13 -3
View File
@@ -12,8 +12,6 @@
#include "dolphin/gx/GXStruct.h"
#include "dolphin/mtx/mtx.h"
class JPACallBackBase;
class JPACallBackBase2;
class JPADataBlockLinkInfo;
enum {
@@ -26,6 +24,18 @@ enum {
JPAEmtrStts_Immortal = 0x40,
};
template<typename T>
class JPACallBackBase {
public:
JPACallBackBase() {}
virtual ~JPACallBackBase();
virtual void init(JPABaseEmitter*);
virtual void execute(JPABaseEmitter*);
virtual void executeAfter(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
};
class JPABaseEmitter {
public:
typedef void (JPABaseEmitter::*VolumeFunc)();
@@ -111,7 +121,7 @@ public:
/* 0x188 */ JSUPtrList mChildParticles;
/* 0x194 */ JSUPtrList* mpPtclVacList;
/* 0x198 */ JPADataBlockLinkInfo* mpDataLinkInfo;
/* 0x19C */ JPACallBackBase* mpEmitterCallBack;
/* 0x19C */ JPACallBackBase<JPABaseEmitter>* mpEmitterCallBack;
/* 0x1A0 */ JPACallBackBase2* mpParticleCallBack;
/* 0x1A4 */ JMath::TRandom_fast_ mRandomSeed;
/* 0x1A8 */ Mtx mGlobalRotation;
include/d/actor/d_a_item.h
+8 -4
View File
@@ -6,6 +6,8 @@
class daItem_c : public daItemBase_c {
public:
daItem_c() : mPtclFollowCb(0, 0), mPtclSmokeCb(1) {}
float getYOffset();
void set_mtx();
void set_mtx_base(J3DModel*, cXyz, csXyz);
@@ -54,6 +56,8 @@ public:
s32 setLock();
s32 releaseLock();
s32 checkActionNow();
static dCcD_SrcCyl m_cyl_src;
public:
/* 0x63C */ cXyz mScaleTarget;
@@ -70,10 +74,10 @@ public:
/* 0x669 */ u8 mStatusFlags;
/* 0x66A */ u8 mMode;
/* 0x66B */ u8 mCurState;
/* 0x66C */ u8 field23_0x66c[0x6BC - 0x66C];
// /* 0x674 */ dPa_rippleEcallBack mPtclRippleCb;
// /* 0x688 */ dPa_followEcallBack mPtclFollowCb;
// /* 0x69C */ dPa_smokeEcallBack mPtclSmokeCb;
/* 0x66C */ u8 field23_0x66c[0x674 - 0x66C];
/* 0x674 */ dPa_rippleEcallBack mPtclRippleCb;
/* 0x688 */ dPa_followEcallBack mPtclFollowCb;
/* 0x69C */ dPa_smokeEcallBack mPtclSmokeCb;
/* 0x6BC */ JPABaseEmitter* mpParticleEmitter;
};
include/d/actor/d_a_itembase.h
+15 -15
View File
@@ -36,9 +36,9 @@ STATIC_ASSERT(sizeof(daItemBase_c_m_data) == 0x4C);
struct daItemBase_c : public fopAc_ac_c {
public:
s32 DeleteBase(const char*);
s32 CreateItemHeap(const char*, short, short, short, short, short, short, short);
virtual s32 DrawBase();
BOOL DeleteBase(const char*);
BOOL CreateItemHeap(const char*, short, short, short, short, short, short, short);
virtual BOOL DrawBase();
virtual void setListStart();
void setListEnd();
virtual void settingBeforeDraw();
@@ -46,7 +46,7 @@ public:
virtual void setShadow();
virtual void animEntry();
void animPlay(float, float, float, float, float);
virtual s32 clothCreate();
virtual BOOL clothCreate();
void getItemNo();
void getHeight();
@@ -65,21 +65,21 @@ public:
public:
/* 0x294 */ request_of_phase_process_class mPhs;
/* 0x29C */ J3DModel* mModel;
/* 0x2A0 */ J3DModel* mModelArrow[2]; // Extra models for arrow bundles
/* 0x2A8 */ mDoExt_btkAnm* mBtkAnm1;
/* 0x2AC */ mDoExt_btkAnm* mBtkAnm2;
/* 0x2B0 */ mDoExt_brkAnm* mBrkAnm1;
/* 0x2B4 */ mDoExt_brkAnm* mBrkAnm2;
/* 0x2B8 */ mDoExt_bckAnm* mBckAnm;
/* 0x29C */ J3DModel* mpModel;
/* 0x2A0 */ J3DModel* mpModelArrow[2]; // Extra models for arrow bundles
/* 0x2A8 */ mDoExt_btkAnm* mpBtkAnm1;
/* 0x2AC */ mDoExt_btkAnm* mpBtkAnm2;
/* 0x2B0 */ mDoExt_brkAnm* mpBrkAnm1;
/* 0x2B4 */ mDoExt_brkAnm* mpBrkAnm2;
/* 0x2B8 */ mDoExt_bckAnm* mpBckAnm;
/* 0x2BC */ dBgS_ObjAcch mAcch;
/* 0x480 */ dBgS_AcchCir mAcchCir;
/* 0x4C0 */ dCcD_Stts mStts;
/* 0x4FC */ dCcD_Cyl mCyl;
/* 0x62C */ u8 field14_0x62c[0x630 - 0x62C];
/* 0x630 */ int mPickupFlag;
/* 0x634 */ int field19_0x634;
/* 0x638 */ short field20_0x638;
/* 0x62C */ s32 mShadowId;
/* 0x630 */ s32 mPickupFlag;
/* 0x634 */ s32 field_0x634;
/* 0x638 */ s16 field_0x638;
/* 0x63A */ u8 m_itemNo;
/* 0x63B */ u8 mDrawFlags;
};
include/d/actor/d_a_player_link.h
+3 -1
View File
@@ -1037,6 +1037,8 @@ public:
void procCutKesa_init();
void procCutKesa();
void checkNoControll() const;
J3DAnmTevRegKey* getBombBrk() { return mpBombBrk; }
/* 0x0320 */ request_of_phase_process_class mPhsLoad;
/* 0x0328 */ J3DModelData* mpModelData;
@@ -1093,7 +1095,7 @@ public:
/* 0x2E98 */ J3DModel* mpHeldItemModel;
/* 0x2E9C */ mDoExt_bckAnm mSwordAnim;
/* 0x2EAC */ u8 field_0x2EAC[0x2EB0 - 0x2EAC];
/* 0x2EB0 */ J3DAnmTevRegKey* field_0x2eb0;
/* 0x2EB0 */ J3DAnmTevRegKey* mpBombBrk;
/* 0x2EB4 */ J3DAnmTevRegKey* mpGwp00BrkData;
/* 0x2EB8 */ J3DAnmTextureSRTKey* mpGwp00BtkData;
/* 0x2EBC */ u8 field_0x2EBC[0x2ED4 - 0x2EBC];
include/d/actor/d_a_shop_item.h
+3 -3
View File
@@ -14,7 +14,7 @@ struct daShopItem_c : public daItemBase_c {
char* getShopArcname();
s16 getShopBmdIdx();
void CreateInit();
int _create();
inline int _create();
bool _execute();
void set_mtx();
bool _draw();
@@ -23,7 +23,7 @@ struct daShopItem_c : public daItemBase_c {
void setListStart() {}
void settingBeforeDraw();
void setTevStr();
s32 clothCreate();
BOOL clothCreate();
//funcs in d_a_shop_item_static
cXyz* getScaleP();
@@ -35,7 +35,7 @@ struct daShopItem_c : public daItemBase_c {
static const char m_cloth_arcname[];
static const f32 m_cullfar_max;
static const u8 mModelType[256];
static const u8 mModelType[255];
static const daShopItem_c_m_data mData[255];
/* 0x63C */ request_of_phase_process_class field_0x63C;
include/d/d_com_inf_game.h
+33
View File
@@ -1128,6 +1128,10 @@ inline void dComIfGp_evmng_remove() {
* === DRAWLIST ===
*/
int dComIfGd_setShadow(u32 id, s8 param_2, J3DModel* pModel, cXyz* pPos, f32 param_5, f32 param_6,
f32 y, f32 param_8, cBgS_PolyInfo& pFloorPoly, dKy_tevstr_c* param_10,
s16 rotY, f32 param_12, GXTexObj* pTexObj);
inline int dComIfGd_setSimpleShadow(cXyz* pPos, f32 param_1, f32 param_2, cXyz* param_3, s16 angle,
f32 param_5, GXTexObj* pTex) {
return g_dComIfG_gameInfo.drawlist.setSimpleShadow(pPos, param_1, param_2, param_3, angle,
@@ -1174,15 +1178,44 @@ inline void dComIfGd_setList() {
g_dComIfG_gameInfo.drawlist.setXluList();
}
inline void dComIfGd_setListMaskOff() {
g_dComIfG_gameInfo.drawlist.setOpaListMaskOff();
g_dComIfG_gameInfo.drawlist.setXluListMaskOff();
}
inline void dComIfGd_setListSky() {
g_dComIfG_gameInfo.drawlist.setOpaListSky();
g_dComIfG_gameInfo.drawlist.setXluListSky();
}
inline void dComIfGd_setListP0() {
g_dComIfG_gameInfo.drawlist.setOpaListP0();
g_dComIfG_gameInfo.drawlist.setXluListP0();
}
inline void dComIfGd_setListP1() {
g_dComIfG_gameInfo.drawlist.setOpaListP1();
g_dComIfG_gameInfo.drawlist.setXluListP1();
}
inline void dComIfGd_setListBG() {
g_dComIfG_gameInfo.drawlist.setOpaListBG();
}
inline void dComIfGd_setXluListBG() {
g_dComIfG_gameInfo.drawlist.setXluListBG();
}
inline void dComIfGd_setListFilter() {
g_dComIfG_gameInfo.drawlist.setOpaListFilter();
g_dComIfG_gameInfo.drawlist.setXluListFilter();
}
inline void dComIfGd_setList2D() {
g_dComIfG_gameInfo.drawlist.setOpaList2D();
g_dComIfG_gameInfo.drawlist.setXluList2D();
}
inline void dComIfGd_entryZSortXluList(J3DPacket* i_packet, cXyz& param_1) {
g_dComIfG_gameInfo.drawlist.entryZSortXluList(i_packet, param_1);
}
include/d/d_drawlist.h
+10
View File
@@ -214,10 +214,20 @@ public:
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); }
void setOpaList() { setOpaDrawList(mpBufInvisibleModelOpa); }
void setXluList() { setXluDrawList(mpBufInvisibleModelXlu); }
void setOpaListMaskOff() { setOpaDrawList(mpBufInvisibleModelMaskOffOpa); }
void setXluListMaskOff() { setXluDrawList(mpBufInvisibleModelMaskOffXlu); }
void setOpaListSky() { setOpaDrawList(mpBufSkyOpa); }
void setXluListSky() { setXluDrawList(mpBufSkyXlu); }
void setOpaListP0() { setOpaDrawList(mpLinkBuf); }
void setXluListP0() { setXluDrawList(mpLinkBuf); }
void setOpaListP1() { setOpaDrawList(field_0x0000c); }
void setXluListP1() { setXluDrawList(field_0x00010); }
void setOpaListBG() { setOpaDrawList(mpBufWorldOpa); }
void setXluListBG() { setXluDrawList(mpBufWorldXlu); }
void setOpaListFilter() { setOpaDrawList(mpWetherFxBuffer); }
void setXluListFilter() { setXluDrawList(mpWetherFxBuffer); }
void setOpaList2D() { setOpaDrawList(field_0x00038); }
void setXluList2D() { setXluDrawList(field_0x00038); }
void entryZSortXluList(J3DPacket* i_packet, cXyz& param_1) {
entryZSortXluDrawList(mpBufInvisibleModelXlu, i_packet, param_1);
include/d/d_item_data.h
+65 -40
View File
@@ -263,70 +263,95 @@ enum ItemTable {
};
struct dItem_data_item_resource {
/* 0x00 */ char* mModelArcName;
/* 0x04 */ char* mIconFilename;
/* 0x08 */ s16 mModelFileIdx;
/* 0x0A */ s16 mBtkFileIdx;
/* 0x0C */ s16 mBrkFileIdx;
/* 0x0E */ s16 field5_0xe;
/* 0x10 */ s16 field6_0x10;
/* 0x12 */ s16 field7_0x12;
/* 0x14 */ s8 mTevRegAnimFrameIndex; // If specified, keep the BRK animation on this frame.
/* 0x15 */ u8 field9_0x15;
/* 0x16 */ s16 mNameMessageId;
/* 0x18 */ u8 temp[8];
/* 0x20 */ u16 mMaxHeapSize;
/* 0x22 */ u8 field20_0x22;
/* 0x23 */ u8 field21_0x23;
/* 0x00 */ char* mArcname;
/* 0x04 */ char* mTexture; // Filename in /files/res/Msg/itemicon.arc of its inventory icon.
/* 0x08 */ s16 mBmdIdx;
/* 0x0A */ s16 mSrtIdx; // BTK
/* 0x0C */ s16 mSrtIdx2; // BTK
/* 0x0E */ s16 mTevIdx; // BRK
/* 0x10 */ s16 mTevIdx2; // BRK
/* 0x12 */ s16 mBckIdx;
/* 0x14 */ s8 mTevFrm; // If specified, keep the BRK animation on this frame.
/* 0x16 */ s16 mItemMesgNum; // Message containing this item's name
/* 0x18 */ u32 mUnused; // Always 0, doesn't seem to be read
/* 0x1C */ u32 mUnknown; // Varies between items, but doesn't seem to be read
/* 0x20 */ u16 mHeapSize;
};
STATIC_ASSERT(sizeof(dItem_data_item_resource) == 0x24);
struct dItem_data_field_item_res {
/* 0x00 */ char * mModelArcName;
/* 0x04 */ short mModelFileId;
/* 0x06 */ short mBtkAnmResIdx1;
/* 0x08 */ short mBtkAnmResIdx2;
/* 0x0A */ short mBrkAnmResIdx1;
/* 0x0C */ short mBrkAnmResIdx2;
/* 0x0E */ short mBckAnmResIdx;
/* 0x10 */ u8 mTevRegAnimFrameIndex;
/* 0x11 */ u8 field8_0x11;
/* 0x12 */ u8 field9_0x12;
/* 0x13 */ u8 field10_0x13;
/* 0x14 */ u8 field11_0x14;
/* 0x15 */ u8 field12_0x15;
/* 0x16 */ u8 field13_0x16;
/* 0x17 */ u8 field14_0x17;
/* 0x00 */ char* mArc;
/* 0x04 */ s16 mBmdIdx;
/* 0x06 */ s16 mSrtIdx; // BTK
/* 0x08 */ s16 mSrtIdx2; // BTK
/* 0x0A */ s16 mTevIdx; // BRK
/* 0x0C */ s16 mTevIdx2; // BRK
/* 0x0E */ s16 mBckIdx;
/* 0x10 */ s8 mTevFrm; // Unused, the equivalent in item_resource is used instead.
/* 0x14 */ u32 mUnknown;
/* 0x18 */ u16 mHeapSize;
/* 0x1A */ u8 field16_0x1a;
/* 0x1B */ u8 field17_0x1b;
};
STATIC_ASSERT(sizeof(dItem_data_field_item_res) == 0x1C);
struct dItem_data_item_info {
/* 0x00 */ u8 mMaybeShadowRelated;
/* 0x00 */ u8 mShadowSize;
/* 0x01 */ u8 mCollisionH; // Cylinder Height
/* 0x02 */ u8 mCollisionR; // Cylinder Radius
/* 0x03 */ u8 mSpecialBehaviors;
/* 0x03 */ u8 mFlag;
};
STATIC_ASSERT(sizeof(dItem_data_item_info) == 0x4);
struct dItem_data_effect_info {
/* 0x00 */ u16 m_appear;
/* 0x02 */ u16 m_sp_effect;
};
STATIC_ASSERT(sizeof(dItem_data_effect_info) == 0x4);
class dItem_data {
public:
static char* item_arcname_tbl[0x70];
static char* item_texture_tbl[0x74];
static dItem_data_item_resource item_resource[0x100];
static dItem_data_field_item_res field_item_res[0x100];
static dItem_data_item_info item_info[0x100];
static dItem_data_effect_info effect_info[0x81];
static u32 getHeapSize(u8 itemNo) { return item_resource[itemNo].mMaxHeapSize; }
static u32 getFieldHeapSize(u8 itemNo) { return field_item_res[itemNo].mHeapSize; }
static char* getArcname(u8 no) { return item_resource[no].mArcname; }
static char* getTexture(u8 no) { return item_resource[no].mTexture; }
static s16 getBmdIdx(u8 no) { return item_resource[no].mBmdIdx; }
static s16 getSrtIdx(u8 no) { return item_resource[no].mSrtIdx; }
static s16 getSrtIdx2(u8 no) { return item_resource[no].mSrtIdx2; }
static s16 getTevIdx(u8 no) { return item_resource[no].mTevIdx; }
static s16 getTevIdx2(u8 no) { return item_resource[no].mTevIdx2; }
static s16 getBckIdx(u8 no) { return item_resource[no].mBckIdx; }
// static s16 getBmtIdx(u8 no) { return item_resource[no].mBmtIdx; }
static s8 getTevFrm(u8 no) { return item_resource[no].mTevFrm; }
static s16 getItemMesgNum(u8 no) { return item_resource[no].mItemMesgNum; }
static u32 getHeapSize(u8 no) { return item_resource[no].mHeapSize; }
static bool checkAppearEffect(u8 itemNo);
static s16 getAppearEffect(u8 itemNo);
static bool checkSpecialEffect(u8 itemNo);
static u16 getSpecialEffect(u8 itemNo);
static char* getFieldArc(u8 no) { return field_item_res[no].mArc; }
static s16 getFieldBmdIdx(u8 no) { return field_item_res[no].mBmdIdx; }
static s16 getFieldSrtIdx(u8 no) { return field_item_res[no].mSrtIdx; }
static s16 getFieldSrtIdx2(u8 no) { return field_item_res[no].mSrtIdx2; }
static s16 getFieldTevIdx(u8 no) { return field_item_res[no].mTevIdx; }
static s16 getFieldTevIdx2(u8 no) { return field_item_res[no].mTevIdx2; }
static s16 getFieldBckIdx(u8 no) { return field_item_res[no].mBckIdx; }
// static s16 getFieldBmtIdx(u8 no) { return field_item_res[no].mBmtIdx; }
static u32 getFieldHeapSize(u8 no) { return field_item_res[no].mHeapSize; }
static u8 getShadowSize(u8 no) { return item_info[no].mShadowSize; }
static u8 getH(u8 no) { return item_info[no].mCollisionH; }
static u8 getR(u8 no) { return item_info[no].mCollisionR; }
static bool chkFlag(u8 no, u32 mask) { return item_info[no].mFlag & mask; }
static bool checkAppearEffect(u8 no);
static u16 getAppearEffect(u8 no);
static bool checkSpecialEffect(u8 no);
static u16 getSpecialEffect(u8 no);
};
#endif /* D_ITEM_DATA_H */
include/d/d_particle.h
+7 -14
View File
@@ -29,18 +29,7 @@ public:
/* 0x13 */ u8 mbAffectedByWind;
};
class JPACallBackBase {
public:
JPACallBackBase();
virtual ~JPACallBackBase();
virtual void init(JPABaseEmitter*);
virtual void execute(JPABaseEmitter*);
virtual void executeAfter(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
};
class dPa_levelEcallBack : public JPACallBackBase {
class dPa_levelEcallBack : public JPACallBackBase<JPABaseEmitter*> {
public:
virtual ~dPa_levelEcallBack() {}
};
@@ -69,6 +58,9 @@ STATIC_ASSERT(sizeof(dPa_followEcallBack) == 0x14);
class dPa_smokeEcallBack : dPa_followEcallBack {
public:
dPa_smokeEcallBack(u8);
virtual ~dPa_smokeEcallBack();
/* 0x14 */ s8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ _GXColor field_0x16;
@@ -163,13 +155,14 @@ public:
class dPa_rippleEcallBack : public dPa_levelEcallBack {
public:
dPa_rippleEcallBack() { mpBaseEmitter = NULL; }
~dPa_rippleEcallBack();
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
void end();
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
~dPa_rippleEcallBack();
/* 0x04 */ JPABaseEmitter* mpBaseEmitter;
/* 0x08 */ cXyz* mPos;
/* 0x0C */ u32 mFlags;
include/d/d_particle_name.h
+4
View File
@@ -4,6 +4,10 @@
#include "dolphin/types.h"
namespace dPa_name {
enum {
ID_SCENE_END = 0x8466,
};
u16 j_o_id[];
u16 s_o_id[];
}
include/m_Do/m_Do_ext.h
+2 -2
View File
@@ -45,13 +45,13 @@ class mDoExt_btkAnm : public mDoExt_baseAnm {
public:
mDoExt_btkAnm() { mpTexMtxAnm = NULL; }
int init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
int i_attribute, f32 i_rate, s16 i_start, s16 i_end, bool i_modify, bool i_entry);
int i_attribute, f32 i_rate, s16 i_start, s16 i_end, bool i_modify, int i_entry);
void entry(J3DMaterialTable* i_matTable, f32 i_frame);
void entry(J3DModelData *i_modelData, f32 i_frame);
void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
int init(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk, int i_anmPlay, int i_attribute,
f32 i_rate, s16 i_start, s16 i_end, bool i_modify, bool i_entry);
f32 i_rate, s16 i_start, s16 i_end, bool i_modify, int i_entry);
int remove(J3DModelData* i_modelData) { return i_modelData->removeTexMtxAnimator(mpAnm); }
void entryFrame() { entryFrame(getFrame()); }
include/m_Do/m_Do_graphic.h
+4
View File
@@ -47,6 +47,7 @@ public:
static bool isAutoForcus() { return data_80450BE7; } */
static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); }
static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); }
static BOOL isMonotone() { return mMonotone; }
static ResTIMG* getFrameBufferTimg() { return mFrameBufferTimg; }
static void* getFrameBufferTex() { return mFrameBufferTex; }
@@ -74,6 +75,9 @@ public:
static bool mBlureFlag;
static u8 mBlureRate;
static u8 mFade;
static u8 mMonotone;
static s16 mMonotoneRate;
static s16 mMonotoneRateSpeed;
};
#endif /* M_DO_M_DO_GRAPHIC_H */