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

d_a_am 50%

Browse Source
This commit is contained in:
LagoLunatic
2023-10-03 04:07:42 -04:00
parent b83f5a71fd
commit 7824fb54c0
22 changed files with 962 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_item.h
-2
View File
@@ -9,8 +9,6 @@ class daItem_c : public daItemBase_c {
public:
typedef void (daItem_c::*daItem_c_ModeFunc)();
daItem_c() : mPtclFollowCb(0, 0), mPtclSmokeCb(1) {}
float getYOffset();
void set_mtx();
void set_mtx_base(J3DModel*, cXyz, csXyz);
include/d/actor/d_a_player.h
+1
View File
@@ -94,6 +94,7 @@ public:
s16 getBodyAngleX() { return mBodyAngle.x; }
s16 getBodyAngleY() { return mBodyAngle.y; }
void changeDemoMoveAngle(s16 angle) { mDemo.setMoveAngle(angle); }
u8 getCutType() const { return mAttackState; }
virtual MtxP getLeftHandMatrix() = 0;
virtual MtxP getRightHandMatrix() = 0;
include/d/d_bg_s_acch.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
void ClrWallHit();
void SetWallR(f32);
void CalcWallRR();
void SetWall(f32, f32);
void SetWall(f32 i_halfHeight, f32 i_radius);
void SetWallHDirect(f32);
virtual ~dBgS_AcchCir() {}
include/d/d_com_inf_game.h
+37 -1
View File
@@ -18,6 +18,7 @@
#include "d/d_wood.h"
#include "d/d_demo.h"
#include "d/d_timer.h"
#include "SSystem/SComponent/c_data_tbl.h"
class JKRArchive;
class JKRExpHeap;
@@ -54,11 +55,42 @@ public:
/* 0x10 */ u8 mTimerType;
};
class dADM_CharTbl : public cDT {
public:
/* 0x28 */ s32 mIndex_ARG;
/* 0x2C */ s32 mIndex_N_ITEM0;
/* 0x30 */ s32 mIndex_N_ITEM1;
/* 0x34 */ s32 mIndex_N_ITEM2;
/* 0x38 */ s32 mIndex_N_ITEM3;
/* 0x3C */ s32 mIndex_N_ITEM4;
/* 0x40 */ s32 mIndex_N_ITEM5;
/* 0x44 */ s32 mIndex_N_ITEM6;
/* 0x48 */ s32 mIndex_N_ITEM7;
/* 0x4C */ s32 mIndex_N_ITEM8;
/* 0x50 */ s32 mIndex_N_ITEM9;
/* 0x54 */ s32 mIndex_N_ITEM10;
/* 0x58 */ s32 mIndex_N_ITEM11;
/* 0x5C */ s32 mIndex_N_ITEM12;
/* 0x60 */ s32 mIndex_N_ITEM13;
/* 0x64 */ s32 mIndex_N_ITEM14;
/* 0x68 */ s32 mIndex_N_ITEM15;
/* 0x6C */ s32 mIndex_percent;
/* 0x70 */ s32 mIndex_ITEM0;
/* 0x74 */ s32 mIndex_ITEM1;
/* 0x78 */ s32 mIndex_ITEM2;
/* 0x7C */ s32 mIndex_ITEM3;
/* 0x80 */ s32 mIndex_ITEM4;
/* 0x84 */ s32 mIndex_ITEM5;
/* 0x88 */ s32 mIndex_ITEM6;
/* 0x8C */ s32 mIndex_ITEM7;
};
STATIC_ASSERT(sizeof(dADM_CharTbl) == 0x90);
class dADM {
public:
/* 0x00 */ int mBlockCount;
/* 0x04 */ void* mpData;
/* 0x08 */ u8 mCharTbl[0x90];
/* 0x08 */ dADM_CharTbl mCharTbl;
public:
dADM();
@@ -1186,6 +1218,10 @@ inline u8 dComIfGp_getMiniGameType() {
inline dDlst_window_c * dComIfGp_getWindow(int idx) { return &g_dComIfG_gameInfo.play.mDlstWindow[idx]; }
inline dADM_CharTbl* dComIfGp_CharTbl() {
return &g_dComIfG_gameInfo.play.mADM.mCharTbl;
}
/**
* === EVENT ===*/
include/d/d_jnt_hit.h
+14 -5
View File
@@ -3,12 +3,13 @@
#include "global.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
struct __jnt_hit_data_c {
public:
/* 0x0 */ s16 mJointIndex;
/* 0x2 */ s16 field_0x2;
/* 0x0 */ s16 field_0x0;
/* 0x2 */ s16 mJointIndex;
/* 0x4 */ f32 field_0x4;
/* 0x8 */ cXyz* field_0x8;
};
@@ -16,9 +17,9 @@ public:
class JntHit_c {
public:
void CreateInit();
void CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float);
void Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float);
void SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, float);
void CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, f32);
void Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, f32);
void SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, f32);
void HitBufferUpdate(int*, cXyz*, int, csXyz*, cXyz*);
s32 searchJntHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*);
@@ -34,4 +35,12 @@ public:
/* 0x1A */ u8 field_0x1A[0x20 - 0x1A];
};
class JntHit_HIO_c {
public:
JntHit_HIO_c();
virtual ~JntHit_HIO_c();
};
JntHit_c* JntHit_create(J3DModel* model, __jnt_hit_data_c* jntHitData, s16 hitDataCount);
#endif /* D_JNT_HIT_H */
include/d/d_particle.h
+4 -3
View File
@@ -36,7 +36,7 @@ public:
class dPa_followEcallBack : public dPa_levelEcallBack {
public:
dPa_followEcallBack(u8, u8);
dPa_followEcallBack(u8=0, u8=0);
virtual ~dPa_followEcallBack();
virtual void execute(JPABaseEmitter*);
@@ -45,6 +45,7 @@ public:
virtual void end();
JPABaseEmitter* getEmitter() { return mpEmitter; }
void setRateOff(u8 param_0) { field_0x11 = param_0; }
/* 0x04 */ JPABaseEmitter* mpEmitter;
/* 0x08 */ u8 field_0x08[0x10 - 0x08];
@@ -58,8 +59,8 @@ STATIC_ASSERT(sizeof(dPa_followEcallBack) == 0x14);
class dPa_smokeEcallBack : public dPa_followEcallBack {
public:
dPa_smokeEcallBack(u8);
virtual ~dPa_smokeEcallBack();
dPa_smokeEcallBack(u8=1);
virtual ~dPa_smokeEcallBack() {}
/* 0x14 */ s8 field_0x14;
/* 0x15 */ u8 field_0x15;
include/d/d_snap.h
+17 -1
View File
@@ -1,7 +1,23 @@
#ifndef D_SNAP_H
#define D_SNAP_H
void dSnap_DebugDraw();
#include "f_op/f_op_actor.h"
class dSnap_Obj;
void dSnap_PhotoIndex2TableIndex(int);
void dSnap_GetFigRoomId(int);
void dSnap_MatDl();
void dSnap_AlphaClearDL();
void dSnap_Create();
void dSnap_ReleaseShutter();
void dSnap_Execute();
void dSnap_GetResult();
void dSnap_GetResultDetail();
void dSnap_RegistSnapObj(dSnap_Obj&);
void dSnap_RegistFig(unsigned char, fopAc_ac_c*, float, float, float);
void dSnap_RegistFig(unsigned char, fopAc_ac_c*, const Vec&, short, float, float, float);
void dSnap_DebugDraw();
void dSnap_Delete();
#endif /* D_SNAP_H */