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

Make some more TUs compile

Browse Source
This commit is contained in:
Jcw87
2023-12-14 23:55:29 -08:00
parent ee0726d0e5
commit 3e007c7ea9
23 changed files with 774 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_title.h
+14
View File
@@ -5,7 +5,21 @@
class daTitle_proc_c {
public:
daTitle_proc_c();
~daTitle_proc_c();
void proc_init3D();
void proc_init2D();
void setEnterMode();
void set_mtx();
void calc_2d_alpha();
void proc_execute();
void model_draw();
void proc_draw();
BOOL draw();
static void daTitle_Kirakira_Sound_flag_on();
static bool daTitle_Kirakira_Sound_flag[];
};
class daTitle_c : public fopAc_ac_c {
include/d/d_demo.h
+94 -16
View File
@@ -3,14 +3,15 @@
#include "dolphin/types.h"
#include "JSystem/JStage/JSGActor.h"
#include "JSystem/JStage/JSGAmbientLight.h"
#include "JSystem/JStage/JSGCamera.h"
#include "JSystem/JStage/JSGFog.h"
#include "JSystem/JStage/JSGLight.h"
#include "JSystem/JStage/JSGSystem.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
class dDemo_actor_c;
class dDemo_camera_c;
class dDemo_ambient_c;
class dDemo_light_c;
class dDemo_system_c;
class TControl;
class dMesg_tControl;
@@ -18,11 +19,35 @@ class fopAc_ac_c;
class dDemo_actor_c : public JStage::TActor {
public:
dDemo_actor_c();
~dDemo_actor_c();
void getActor();
void setActor(fopAc_ac_c*);
void getP_BtpData(const char*);
void getP_BrkData(const char*);
void getP_BtkData(const char*);
void getPrm_Morf();
void JSGSetData(u32, const void*, u32);
void JSGSetTranslation(const Vec&);
void JSGSetScaling(const Vec&);
void JSGSetRotation(const Vec&);
void JSGSetShape(u32);
void JSGSetAnimation(u32);
void JSGSetAnimationFrame(f32);
void JSGSetAnimationTransition(f32);
void JSGSetTextureAnimation(u32);
void JSGSetTextureAnimationFrame(f32);
s32 JSGFindNodeID(const char*) const;
int JSGGetNodeTransformation(u32, f32(*)[4]) const;
f32 JSGGetAnimationFrameMax() const;
f32 JSGGetTextureAnimationFrameMax() const;
void JSGGetTranslation(Vec*) const;
void JSGGetScaling(Vec*) const;
void JSGGetRotation(Vec*) const;
bool checkEnable(u16 mask) { return mFlags & mask; }
csXyz* getRatate() { return &mRotation; }
/* 0x04 */ u16 mFlags;
/* 0x06 */ u8 field_0x06[0x08 - 0x06];
/* 0x08 */ cXyz mTranslation;
@@ -48,6 +73,53 @@ public:
/* 0x68 */ s32 mBrkId;
};
class dDemo_camera_c : public JStage::TCamera {
public:
~dDemo_camera_c();
f32 JSGGetProjectionNear() const;
void JSGSetProjectionNear(f32);
f32 JSGGetProjectionFar() const;
void JSGSetProjectionFar(f32);
f32 JSGGetProjectionFovy() const;
void JSGSetProjectionFovy(f32);
f32 JSGGetProjectionAspect() const;
void JSGSetProjectionAspect(f32);
void JSGGetViewPosition(Vec*) const;
void JSGSetViewPosition(const Vec&);
void JSGGetViewUpVector(Vec*) const;
void JSGSetViewUpVector(const Vec&);
void JSGGetViewTargetPosition(Vec*) const;
void JSGSetViewTargetPosition(const Vec&);
f32 JSGGetViewRoll() const;
void JSGSetViewRoll(f32);
};
class dDemo_ambient_c : public JStage::TAmbientLight {
public:
~dDemo_ambient_c();
void JSGSetColor(_GXColor);
};
class dDemo_light_c : public JStage::TLight {
public:
~dDemo_light_c();
void JSGSetLightType(JStage::TELight);
void JSGSetPosition(const Vec&);
void JSGSetColor(_GXColor);
void JSGSetDistanceAttenuation(f32, f32, _GXDistAttnFn);
void JSGSetAngleAttenuation(f32, _GXSpotFn);
void JSGSetDirection(const Vec&);
};
class dDemo_fog_c : public JStage::TFog {
public:
~dDemo_fog_c();
void JSGSetFogFunction(_GXFogType);
void JSGSetStartZ(f32);
void JSGSetEndZ(f32);
void JSGSetColor(_GXColor);
};
class dDemo_object_c {
public:
dDemo_object_c();
@@ -71,6 +143,12 @@ public:
/* 0xAC */ u8 field_0xac[4];
};
class dDemo_system_c : public JStage::TSystem {
public:
~dDemo_system_c();
bool JSGFindObject(const char*, JStage::TEObject) const;
};
class dDemo_manager_c {
public:
dDemo_manager_c();
@@ -79,19 +157,19 @@ public:
void create(u8 const*, cXyz*, f32);
void remove();
void update();
int getFrame() { return mFrame; }
u32 getFrameNoMsg() { return mFrameNoMsg; }
s32 getMode() { return mMode; }
/* 0x00 */ dDemo_system_c* mpSystem;
/* 0x04 */ TControl* mpControl;
/* 0x08 */ void* mpStage;
/* 0x0C */ void* mpAudio;
/* 0x10 */ void* mpParticle;
/* 0x14 */ void* field_0x14;
/* 0x18 */ dMesg_tControl* mpMesgControl;
/* 0x1C */ void* mpMessage;
/* 0x00 */ dDemo_system_c* mSystem;
/* 0x04 */ TControl* mControl;
/* 0x08 */ void* mStage;
/* 0x0C */ void* mAudio;
/* 0x10 */ void* mParticle;
/* 0x14 */ void* mFactory;
/* 0x18 */ dMesg_tControl* mMesgControl;
/* 0x1C */ void* mMessage;
/* 0x20 */ dDemo_object_c mDemoObj;
/* 0xD0 */ void* field_0xd0;
/* 0xD4 */ int mFrame;
@@ -102,4 +180,4 @@ public:
class mDoExt_McaMorf;
BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int, u16*, u32, s8);
#endif /* D_DEMO_H */
#endif /* D_DEMO_H */
include/d/d_drawlist.h
+1 -1
View File
@@ -14,7 +14,7 @@ class dDlst_base_c {
public:
dDlst_base_c() {}
virtual ~dDlst_base_c() {}
virtual void draw();
virtual void draw() {}
};
class dDlst_2D_c : public dDlst_base_c {
include/d/d_event_manager.h
+7
View File
@@ -10,7 +10,9 @@ class fopAc_ac_c;
class dEvent_exception_c {
public:
dEvent_exception_c() { mEventInfoIdx = -1; }
void init();
int setStartDemo(int eventInfoIdx);
void getEventName();
/* 0x0 */ s32 mEventInfoIdx;
/* 0x4 */ u8 field_0x4;
@@ -78,6 +80,11 @@ public:
/* 0x03C */ dEvDtFlag_c mFlag;
};
class dEv_seach_prm {
public:
dEv_seach_prm(const char*, u32, u32);
};
inline int dEvmng_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
}
include/d/d_map.h
+148 -2
View File
@@ -1,9 +1,155 @@
#ifndef D_MAP_H
#define D_MAP_H
#include "dolphin/types.h"
#include "d/d_drawlist.h"
struct ResTIMG;
struct dmap_dmap_tlut_s;
class fopAc_ac_c;
struct map_dt_c;
class stage_map_info_class;
class dMap_2DMtMapSpcl_tex_c {
public:
dMap_2DMtMapSpcl_tex_c();
~dMap_2DMtMapSpcl_tex_c();
void init(ResTIMG*, u32, const _GXColor&);
void setScroll(f32, f32, f32, f32);
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ GXTexObj field_0x4;
/* 0x24 */ GXTlutObj field_0x24;
/* 0x30 */ GXColor field_0x30;
/* 0x34 */ u8 field_0x34[0x44 - 0x34];
/* 0x44 */ u32 field_0x44;
};
class dMap_2DMtMapSpcl_c : public dDlst_base_c {
public:
dMap_2DMtMapSpcl_c() {}
~dMap_2DMtMapSpcl_c() {}
void init(int, dMap_2DMtMapSpcl_tex_c*);
void setPos(s16, s16, s16, s16);
void draw();
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 field_0x5;
/* 0x08 */ dMap_2DMtMapSpcl_tex_c* field_0x8;
/* 0x0C */ short field_0xc;
/* 0x0E */ short field_0xe;
/* 0x10 */ short field_0x10;
/* 0x12 */ short field_0x12;
};
class dMap_2DAGBScrDsp_c : public dDlst_base_c {
public:
~dMap_2DAGBScrDsp_c() {}
void setImage(ResTIMG*, map_dt_c*);
void init(map_dt_c*, ResTIMG*, f32, f32, s16, s16, s16, s16, f32, f32, u8);
void getScrnPrm(f32, f32, int, f32, int*, f32*, f32*);
void getScrnPrmXY(f32, f32, f32, f32, int, int, f32, f32, int*, int*, f32*, f32*, f32*, f32*);
void calc_standard_prm(u16, u16, f32, f32, s16, s16, s16, s16, f32, f32, int*, int*, int*, int*, f32*, f32*, f32*, f32*, f32*, f32*);
void draw();
void setPos(s16, s16, s16, s16);
void setScale(f32, f32);
/* 0x04 */ map_dt_c* field_0x4;
/* 0x08 */ ResTIMG* field_0x8;
/* 0x0C */ GXTexObj field_0xc;
/* 0x2C */ GXTlutObj field_0x2c;
};
class dMap_RoomInfo_c {
public:
dMap_RoomInfo_c();
~dMap_RoomInfo_c();
void getRoomDspFloorNo(u8, int);
void init(dMap_RoomInfo_c*, int);
void getRoomImage(int, u8, int, ResTIMG**, ResTIMG**, map_dt_c**, stage_map_info_class**, u8*);
void makeRoomDspFloorNoTbl(int);
void roomEntryRoom(int, u8, int, u8, dMap_RoomInfo_c*, s16, s16, f32);
void Changeimage(u8, u8, int, s16, s16, f32);
void deleteRoom();
void enlagementSizeTextureCordCalc(f32*, f32*, f32*, f32*, f32, f32, f32, f32, f32, f32);
void roomDrawRoomEnlargementSize(int, int, int, int, f32, f32, f32, f32, u8);
void roomDrawRoomRealSize(int, int, int, int, f32, f32, f32, f32, f32, f32, u8);
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u8 field_0x2[10];
/* 0x0C */ u8 field_0xc;
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ dMap_2DMtMapSpcl_c field_0x30;
/* 0x44 */ dMap_2DMtMapSpcl_tex_c field_0x44[1];
/* 0x8C */ dMap_2DAGBScrDsp_c field_0x8c;
/* 0xE4 */ dMap_RoomInfo_c* field_0xe4;
/* 0xE8 */ void* field_0xe8;
};
class dMap_RoomInfoCtrl_c {
public:
void roomExistenceCheck(int, dMap_RoomInfo_c**);
void getNextRoomP(dMap_RoomInfo_c*);
void ctrlEntryRoom(int, u8, int, u8, s16, s16, f32);
void deleteRoom(int);
void ctrlDrawRoomEnlargementSize(int, int, int, int, int, f32, f32, f32, f32, u8);
void ctrlDrawRoomRealSize(int, int, int, int, int, f32, f32, f32, f32, f32, f32, u8);
void init();
void checkFloorMoveImageChangeRoom(u8, u8, int, s16, s16, f32);
};
class dMap_2DSQ_c : public dDlst_base_c {
public:
~dMap_2DSQ_c();
void draw();
};
class dMap_2DTri_c : public dDlst_base_c {
public:
~dMap_2DTri_c();
void init(s16, s16, const _GXColor&, f32, f32, s16);
void draw();
void setPos(s16, s16);
};
class dMap_2DPoint_c : public dDlst_base_c {
public:
dMap_2DPoint_c();
~dMap_2DPoint_c();
void init(s16, s16, const _GXColor&, u8);
void draw();
};
class dMap_2DAGBCursor_c : public dDlst_base_c {
public:
~dMap_2DAGBCursor_c();
void init(s16, s16, const _GXColor&, u8);
void draw();
};
class dMap_2DT2_c : public dDlst_base_c {
public:
dMap_2DT2_c();
~dMap_2DT2_c();
void draw();
void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32, s16);
};
class dMap_Dmap_c : public dDlst_base_c {
public:
~dMap_Dmap_c();
void setTlut(dmap_dmap_tlut_s*, u8, u8, u8, f32);
void setFloorTextureOne(u8);
void init(s16, s16, s16, s16, s16, s16, s16, s16, s16, u8, u8, u8, u8, u8);
void draw();
};
class dMap_c {
public:
@@ -104,4 +250,4 @@ inline void dMap_drawPoint(u8 param_1, f32 param_2, f32 param_3, f32 param_4, s8
dMap_c::drawPointSingle(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9);
}
#endif /* D_MAP_H */
#endif /* D_MAP_H */
include/d/d_meter.h
+61
View File
@@ -1,6 +1,67 @@
#ifndef D_METER_H
#define D_METER_H
#include "d/d_drawlist.h"
class J2DPane;
class fopAc_ac_c;
class fopMsgM_pane_class;
class msg_class;
class sub_meter_class;
class dMeter_HIO_c {
public:
dMeter_HIO_c();
virtual ~dMeter_HIO_c();
};
class dMeter_menuHIO_c {
public:
dMeter_menuHIO_c();
virtual ~dMeter_menuHIO_c();
};
class dMeter_msg_HIO_c {
public:
dMeter_msg_HIO_c();
virtual ~dMeter_msg_HIO_c();
};
class dMeter_message_HIO_c {
public:
dMeter_message_HIO_c();
virtual ~dMeter_message_HIO_c();
};
class dDlst_2DMETER1_c : public dDlst_base_c {
public:
virtual ~dDlst_2DMETER1_c();
virtual void draw();
};
class dDlst_2DMETER2_c : public dDlst_base_c {
public:
virtual ~dDlst_2DMETER2_c();
virtual void draw();
};
class dMeter_map_HIO_c {
public:
dMeter_map_HIO_c();
virtual ~dMeter_map_HIO_c();
};
class mapCtrlDisp_c {
public:
void initMapCtrlDisp();
void moveMapCtrlDisp();
};
class dMeter_info_c {
public:
~dMeter_info_c() {}
};
bool dMenu_flag();
void dMenu_flagSet(u8);
include/d/d_metronome.h
+70
View File
@@ -0,0 +1,70 @@
#ifndef D_METRONOME_H
#define D_METRONOME_H
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JUtility/TColor.h"
#include "d/d_drawlist.h"
#include "f_op/f_op_msg_mng.h"
#include "m_Do/m_Do_hostIO.h"
class dMn_HIO_c : public mDoHIO_entry_c {
public:
dMn_HIO_c();
virtual ~dMn_HIO_c() {}
public:
/* 0x04 */ f32 mEchoScale;
/* 0x08 */ s16 mShiftTiming;
/* 0x0A */ s16 mFlashTiming;
/* 0x0C */ JUtility::TColor mWhiteColor0;
/* 0x10 */ JUtility::TColor mWhiteColor1;
/* 0x14 */ JUtility::TColor mBlackColor0;
/* 0x18 */ JUtility::TColor mBlackColor1;
/* 0x1C */ u8 mAlphaOrig;
/* 0x1D */ u8 mTimingTrail;
};
class dMetronome_c : public dDlst_base_c {
public:
void screenSet();
void metronomeMove();
void melodyInit(u8);
void melodyMove();
void melodyGuideShow(s32, s16);
void melodyShow();
void melodyDemo();
void melodyFlash();
void melodyShift();
void initialize();
void _create();
void _delete();
void _move();
void _draw();
BOOL _open();
BOOL _close();
public:
/* 0x004 */ J2DScreen* scrn;
/* 0x008 */ fopMsgM_pane_class pane_cn[7];
/* 0x190 */ fopMsgM_pane_class pane_wn[7];
/* 0x318 */ fopMsgM_pane_class pane_pk[7];
/* 0x4A0 */ fopMsgM_pane_class pane_i12[7];
/* 0x628 */ fopMsgM_pane_class pane_i11[7];
/* 0x7B0 */ fopMsgM_pane_class pane_bs[7];
/* 0x938 */ fopMsgM_pane_class pane_timing[21]; // Metronome dots at the top
/* 0xDD0 */ fopMsgM_pane_class pane_echo; // Metronome "echo" when it hits the center dot.
/* 0xE08 */ JPABaseEmitter * mpEmitter;
/* 0xE0C */ f32 mCurRate;
/* 0xE10 */ f32 mPosX;
/* 0xE14 */ s32 field_0xE14;
/* 0xE18 */ s32 mNote[7];
/* 0xE34 */ s32 mCurTimer;
/* 0xE38 */ u8 field_0xE38;
/* 0xE39 */ u8 mMelodyNum;
/* 0xE3A */ u8 mAction;
/* 0xE3B */ u8 mbOpen;
};
#endif /* D_METRONOME_H */
include/d/d_s_open.h
+48
View File
@@ -0,0 +1,48 @@
#ifndef D_S_OPEN
#define D_S_OPEN
#include "d/d_drawlist.h"
#include "f_op/f_op_scene.h"
class J2DScreen;
class dScnOpen_message_c {
public:
dScnOpen_message_c(JKRExpHeap*);
virtual ~dScnOpen_message_c();
void set_message(u32, int);
void exec();
};
class dScnOpen_proc_c : public dDlst_base_c {
public:
dScnOpen_proc_c();
virtual ~dScnOpen_proc_c();
void proc_execute();
void proc_draw();
virtual void draw();
/* 0x004 */ JKRExpHeap* exp_heap;
/* 0x008 */ dScnOpen_message_c* m_message;
/* 0x00C */ J2DScreen* m_Screen;
/* 0x010 */ u8 pad[0x2a0];
/* 0x2B0 */ s32 field_0x2b0;
/* 0x010 */ u8 pad2[0x014];
};
class dScnOpen_c : public scene_class {
public:
~dScnOpen_c();
void changeGameScene();
s32 create();
BOOL draw();
BOOL execute();
/* 0x1C4 */ request_of_phase_process_class mPhs;
/* 0x1CC */ JKRSolidHeap* solid_heap;
/* 0x1D0 */ dScnOpen_proc_c* mpProc;
/* 0x1D4 */ u8 field_0x1d4;
};
#endif /* D_S_OPEN */
include/d/d_snap.h
+65 -2
View File
@@ -1,6 +1,7 @@
#ifndef D_SNAP_H
#define D_SNAP_H
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "f_op/f_op_actor.h"
class dSnap_Obj {
@@ -9,14 +10,76 @@ public:
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ s32 mBsPcId;
/* 0x18 */ u32 field_0x18[6];
/* 0x18 */ u8 field_0x18;
/* 0x19 */ u8 field_0x19;
/* 0x1A */ u8 field_0x1a;
/* 0x1B */ u8 field_0x1b;
/* 0x1C */ s16 field_0x1c;
/* 0x1E */ s16 field_0x1e;
/* 0x20 */ s32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ s16 field_0x28;
/* 0x2A */ s16 field_0x2a;
/* 0x2C */ s16 field_0x2c;
/* 0x2E */ s16 field_0x2e;
public:
dSnap_Obj();
virtual ~dSnap_Obj() {}
void CalcArea2D();
void draw();
void SetGeo(const Vec&, f32, f32, s16);
void SetGeoSph(const Vec & c, f32 r);
void SetInf(u8, const fopAc_ac_c*, u8, u8, s16);
void SetAreaClear();
void SetArea(s16, s16);
void ChkPhoto(int);
void ChkSuccess(s32, f32);
void ChkCamCull() const;
};
class dSnap_RegistObjElm {
public:
/* 0x00 */ dSnap_Obj field_0x0;
/* 0x34 */ u8 field_0x34[4];
dSnap_RegistObjElm();
virtual ~dSnap_RegistObjElm();
void Init();
void Regist(const dSnap_Obj&);
};
class dSnap_packet : public J3DPacket {
public:
virtual ~dSnap_packet();
void Create();
void ReleaseShutter();
void ChkReleaseShutter();
void Execute();
void Regist(const dSnap_Obj&);
virtual void draw();
void ClearAlphaBuffer();
void Judge();
void FindPhoto(int, int);
void JudgePost();
void JudgeBikutsuki();
void JudgeCoupleLook();
void JudgeGF();
void JudgeGenzo();
void JudgeObasan4();
void JudgeTestM();
void JudgeGene();
void JudgeFigure(int);
void SetResult();
/* 0x010 */ u8 field_0x10[0x18 - 0x10];
/* 0x018 */ dSnap_RegistObjElm field_0x18[0x3f];
/* 0xEDC */ int field_0xedc;
/* 0xEE0 */ int field_0xee0;
/* 0xEE4 */ u8 field_0xee4;
static void (dSnap_packet::*m_judge_tbl[])();
};
STATIC_ASSERT(sizeof(dSnap_Obj) == 0x34);
@@ -36,4 +99,4 @@ void dSnap_RegistFig(unsigned char, fopAc_ac_c*, const Vec&, short, float, float
void dSnap_DebugDraw();
void dSnap_Delete();
#endif /* D_SNAP_H */
#endif /* D_SNAP_H */
include/f_op/f_op_actor.h
+1
View File
@@ -125,6 +125,7 @@ enum dEvt_Condition_e {
dEvtCnd_CANTALKITEM_e = 0x0020,
};
// TODO: move to d_event.h
class dEvt_info_c {
public:
dEvt_info_c();
include/m_Do/m_Do_MemCardRWmng.h
+22
View File
@@ -0,0 +1,22 @@
#ifndef M_DO_M_DO_MEMCARDRWMNG_H
#define M_DO_M_DO_MEMCARDRWMNG_H
#include "dolphin/types.h"
typedef struct CARDFileInfo CARDFileInfo;
struct mDoMemCdRWm_HeaderData;
void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32);
void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32);
void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*);
void mDoMemCdRWm_SetCardStat(CARDFileInfo*);
void mDoMemCdRWm_CheckCardStat(CARDFileInfo*);
void mDoMemCdRWm_CalcCheckSum(void*, u32);
void mDoMemCdRWm_CalcCheckSumPictData(void*, u32);
void mDoMemCdRWm_TestCheckSumPictData(void*);
void mDoMemCdRWm_SetCheckSumPictData(u8*);
void mDoMemCdRWm_CalcCheckSumGameData(void*, u32);
void mDoMemCdRWm_TestCheckSumGameData(void*);
void mDoMemCdRWm_SetCheckSumGameData(u8*, u8);
#endif /* M_DO_M_DO_MEMCARDRWMNG_H */