mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-13 03:59:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Demo work

Browse Source
This commit is contained in:
LagoLunatic
2025-05-28 01:39:07 -04:00
parent 255d01c6db
commit b9190842b7
26 changed files with 389 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_rd.h
+7 -1
View File
@@ -47,7 +47,13 @@ public:
/* 0x7C */ JntHit_HIO_c m7C;
};
class daRd_c : public fopEn_enemy_c {
class daRd_c
#if VERSION == VERSION_DEMO
: public fopAc_ac_c
#else
: public fopEn_enemy_c
#endif
{
public:
enum Proc_e {
PROC_INIT = 0,
include/d/d_demo.h
+5 -1
View File
@@ -352,6 +352,10 @@ private:
};
class mDoExt_McaMorf;
BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int, u16*, u32, s8);
#if VERSION == VERSION_DEMO
BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int = 0, u16* = NULL);
#else
BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int = 0, u16* = NULL, u32 = 0, s8 = 0);
#endif
#endif /* D_DEMO_H */
include/d/d_ky_thunder.h
+7
View File
@@ -25,11 +25,18 @@ public:
public:
/* 0x0F8 */ JKRSolidHeap * solid_heap;
/* 0x0FC */ dThunder_modelInfo_c mModelInfo;
#if VERSION == VERSION_DEMO
/* 0x134 */ cXyz mPos;
/* 0x140 */ f32 mBtkTime;
/* 0x144 */ cXyz mScale;
/* 0x150 */ f32 mRot;
#else
/* 0x134 */ cXyz mScale;
/* 0x140 */ cXyz mPos;
/* 0x14C */ cXyz mPosNeg;
/* 0x158 */ f32 mRot;
/* 0x15C */ f32 mBtkTime;
#endif
};
#endif /* D_KY_THUNDER_H */
include/d/d_timer.h
+11 -4
View File
@@ -13,7 +13,7 @@ class JKRSolidHeap;
class dDlst_TimerScrnDraw_c : public dDlst_base_c {
public:
dDlst_TimerScrnDraw_c() {
field_0x234 = 0;
mAnimeTimer = 0;
mRupeeNum = -1;
field_0x235 = 0;
}
@@ -36,7 +36,7 @@ public:
f32 acc(s16 param_0, s16 param_1, s16 param_2) {
return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2));
}
void animeTimerReset() {}
void animeTimerReset() { mAnimeTimer = 0; }
public:
/* 0x004 */ J2DScreen* scrn;
@@ -54,7 +54,7 @@ public:
/* 0x220 */ J2DPane* mRupeeNumberShadow[3];
/* 0x22C */ J2DPicture* mIconPicture;
/* 0x230 */ s32 mRupeeNum;
/* 0x234 */ s8 field_0x234;
/* 0x234 */ s8 mAnimeTimer;
/* 0x235 */ u8 field_0x235;
/* 0x236 */ u8 field_0x236;
/* 0x237 */ u8 field_0x237;
@@ -81,6 +81,13 @@ public:
s32 getLimitTimeMs();
s32 getRestTimeMs();
void setTimerPos(f32 x, f32 y) { mpScrnDraw->setTimerPos(x, y); }
void setRupeePos(f32 x, f32 y) { mpScrnDraw->setRupeePos(x, y); }
void setShowType(u8 type) { mpScrnDraw->setShowType(type); }
void setIconType(void* tex, u8 type) { mpScrnDraw->setIconType(tex, type); }
void timerHide() { mpScrnDraw->hide(); }
u8 getStatus() { return mStatus; }
/* 0x0FC */ dDlst_TimerScrnDraw_c* mpScrnDraw;
/* 0x100 */ void* iconTex;
/* 0x104 */ request_of_phase_process_class mPhs;
@@ -101,7 +108,7 @@ public:
/* 0x160 */ s16 field_0x160;
/* 0x162 */ u8 field_0x162;
/* 0x163 */ u8 field_0x163;
/* 0x164 */ u8 mState;
/* 0x164 */ u8 mStatus;
/* 0x168 */ s32 mSeTimeLeft;
/* 0x16C */ u32 mSeTableIndex;
/* 0x170 */ JKRSolidHeap* mpSolidHeap;