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

A few m_Do_ext funcs

Browse Source
This commit is contained in:
LagoLunatic
2023-10-14 23:29:28 -04:00
parent db8f4615b2
commit 98140ed1cd
4 changed files with 185 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JAZelAudio/JAIZelBasic.h
+42 -2
View File
@@ -9,6 +9,11 @@
class Vec;
class JAISound;
class JKRSolidHeap;
namespace JAInter {
class Actor;
};
class JAIAnimeFrameSoundData;
class JAIZelBasic {
public:
JAIZelBasic();
@@ -249,9 +254,44 @@ public:
/* 0x1F44 */ u8 field_0x1F44[0x20F4 - 0x1F44];
};
class JAIZelAnime {
struct JAIAnimeSound__Slot {
/* 0x0 */ u8 mbIsPlaying;
/* 0x4 */ JAISound* mpSound;
/* 0x8 */ void* mpData;
};
class JAIAnimeSound {
public:
/* 0x0 */ u8 field_0x0[0x98];
JAIAnimeSound();
public:
/* 0x00 */ JAIAnimeSound__Slot mSlots[8];
/* 0x60 */ u32 m60;
/* 0x64 */ u32 m64;
/* 0x68 */ u32 m68;
/* 0x6C */ u32 m6C;
/* 0x70 */ void* m70[2];
/* 0x78 */ int mDataCounterInc;
/* 0x7C */ int mDataCounterLimit;
/* 0x80 */ u32 mDataCounter;
/* 0x84 */ int mLoopCount;
/* 0x88 */ f32 mCurrentTime;
/* 0x8C */ u8 m8C[0x90 - 0x8C];
/* 0x90 */ u16* mpData;
/* 0x94 */ /* vtable */
virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
void stop();
}; // Size: 0x98
class JAIZelAnime : public JAIAnimeSound {
public:
JAIZelAnime() { }
virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
};
#endif /* JAZELAUDIO_JAIZELBASIC_H */
include/d/d_com_inf_game.h
+4
View File
@@ -391,6 +391,8 @@ public:
void setMenuArchive(JKRArchive * pArc) { mpMenuArchive = pArc; }
void setFont0Archive(JKRArchive * pArc) { mpFont0Archive = pArc; }
void setFont1Archive(JKRArchive * pArc) { mpFont1Archive = pArc; }
JKRArchive* getFontArchive() { return mpFont0Archive; }
JKRArchive* getRubyArchive() { return mpFont1Archive; }
void setAnmArchive(JKRArchive * pArc) { mpAnmArchive = pArc; }
void setLkDArc(JKRArchive * pArc) { mpLkDArc = pArc; }
void setFmapArchive(JKRArchive * pArc) { mpFmapArchive = pArc; }
@@ -1821,6 +1823,8 @@ inline void dComIfGp_setTmsgArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play
inline void dComIfGp_setMenuArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMenuArchive(pArc); }
inline void dComIfGp_setFont0Archive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFont0Archive(pArc); }
inline void dComIfGp_setFont1Archive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFont1Archive(pArc); }
inline JKRArchive* dComIfGp_getFontArchive() { return g_dComIfG_gameInfo.play.getFontArchive(); }
inline JKRArchive* dComIfGp_getRubyArchive() { return g_dComIfG_gameInfo.play.getRubyArchive(); }
inline void dComIfGp_setLkDArc(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setLkDArc(pArc); }
inline void dComIfGp_setFmapArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFmapArchive(pArc); }
inline void dComIfGp_setItemResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setItemResArchive(pArc); }
include/m_Do/m_Do_ext.h
+26 -1
View File
@@ -5,6 +5,7 @@
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/JUtility/JUTFont.h"
#include "JAZelAudio/JAIZelBasic.h"
#include "d/d_kankyo.h"
class JKRArchive;
@@ -298,7 +299,13 @@ public:
virtual void execute(u16) = 0;
};
class mDoExt_zelAnime;
class mDoExt_zelAnime : public JAIZelAnime {
public:
mDoExt_zelAnime() { }
public:
/* 0x98 */ u8 m8C[0x9C - 0x98];
}; // Size: 0x9C
class mDoExt_McaMorf : public J3DMtxCalcMaya {
public:
@@ -505,6 +512,12 @@ public:
~mDoExt_3Dline_c();
int init(u16, int, int);
public:
/* 0x00 */ cXyz* mpSegments;
/* 0x04 */ u8* mpSize;
/* 0x08 */ cXyz* mPosArr[2];
/* 0x10 */ cXy* mTexArr[2];
};
class mDoExt_3DlineMat0_c {
@@ -525,6 +538,18 @@ public:
void update(u16, f32, GXColor&, u16, dKy_tevstr_c*);
void update(u16, GXColor&, dKy_tevstr_c*);
int getMaterialID();
public:
/* 0x00 */ mDoExt_3DlineMat_c parent;
/* 0x08 */ GXTexObj mTexObj;
/* 0x28 */ GXColor mColor;
/* 0x2C */ dKy_tevstr_c* mpTevStr;
/* 0x30 */ u16 mNumLines;
/* 0x32 */ u16 m32;
/* 0x34 */ u16 m34;
/* 0x36 */ u8 mCurArr;
/* 0x37 */ u8 m37[0x38 - 0x37];
/* 0x38 */ mDoExt_3Dline_c* mpLines;
};
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag);