encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_model / d_simple_model / d_stage + cleanup (#181)

Browse Source 
* d_model / d_simple_model / cleanup

* d_stage work

* set up saveHIO / remove asm

* d_a_itembase
This commit is contained in:
TakaRikka
2022-02-19 14:22:47 +01:00
committed by GitHub
parent d85ab6d159
commit 9ba9d7c06c
200 changed files with 5001 additions and 13241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DTextBox.h
+10 -4
View File
@@ -57,15 +57,21 @@ public:
/* 80300660 */ s32 setString(char const*, ...);
void setFontSize(f32 sizeX, f32 sizeY) {
f32 x;
if (sizeX > 0.0f) {
sizeX = 0.0f;
x = sizeX;
} else {
x = 0.0f;
}
field_0x11c = sizeX;
field_0x11c = x;
f32 y;
if (sizeY > 0.0f) {
sizeY = 0.0f;
y = sizeY;
} else {
y = 0.0f;
}
field_0x120 = sizeY;
field_0x120 = y;
}
void setFontSize(TFontSize size) { setFontSize(size.mSizeX, size.mSizeY); }
include/d/a/d_a_itembase.h
+48 -30
View File
@@ -1,9 +1,34 @@
#ifndef D_A_D_A_ITEMBASE_H
#define D_A_D_A_ITEMBASE_H
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class daItemBase_c {
struct daItemBase_data {
/* 0x00 */ f32 field_0x0;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
/* 0x18 */ s16 field_0x18;
/* 0x1A */ s16 field_0x1a;
/* 0x1C */ s16 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ s16 field_0x28;
/* 0x2A */ s16 field_0x2a;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ s16 field_0x34;
/* 0x36 */ s16 field_0x36;
};
class daItemBase_c : public fopAc_ac_c {
public:
u8 getItemNo();
void hide();
@@ -12,35 +37,33 @@ public:
u8 chkDraw();
void dead();
u8 chkDead();
void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
void DeleteBase(char const*);
bool clothCreate();
bool __CreateHeap();
void DrawBase();
void RotateYBase();
void setListStart();
int CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
int DeleteBase(char const*);
void setListEnd();
void settingBeforeDraw();
void setTevStr();
void setShadow();
void animEntry();
void animPlay(f32, f32, f32, f32, f32, f32);
void chkFlag(int);
void getTevFrm();
void getBtpFrm();
void getShadowSize();
void getCollisionH();
void getCollisionR();
void getData();
daItemBase_data& getData();
static u8 const m_data[56];
virtual int DrawBase();
virtual void setListStart();
virtual void settingBeforeDraw();
virtual void setTevStr();
virtual void setShadow();
virtual void animEntry();
virtual void RotateYBase();
virtual int clothCreate();
virtual int __CreateHeap();
virtual BOOL chkFlag(int);
virtual s8 getTevFrm();
virtual s8 getBtpFrm();
virtual u8 getShadowSize();
virtual u8 getCollisionH();
virtual u8 getCollisionR();
static daItemBase_data const m_data;
private:
#ifdef NONMATCHING
/* 0x568 */ void* field_0x568;
/* 0x56C */ request_of_phase_process_class* field_0x56c;
/* 0x570 */ u8 field_0x578[4];
/* 0x574 */ J3DModel* field_0x574;
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ mDoExt_btkAnm* field_0x578;
/* 0x57C */ mDoExt_bpkAnm* field_0x57c;
/* 0x580 */ mDoExt_brkAnm* field_0x580;
@@ -54,11 +77,6 @@ private:
/* 0x920 */ u8 field_0x920[0xA];
/* 0x92A */ u8 m_itemNo;
/* 0x92B */ u8 field_0x92b;
#endif
u8 unk0[0x92a];
u8 mItemNo;
u8 unk2347;
};
#endif /* D_A_D_A_ITEMBASE_H */
include/d/com/d_com_inf_game.h
+1033 -834
View File
File diff suppressed because it is too large Load Diff
include/d/com/d_com_static.h
+32
View File
@@ -2,5 +2,37 @@
#define D_COM_D_COM_STATIC_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class daSus_c {
public:
class data_c {
public:
/* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 80030FBC */ void reset();
/* 80030FCC */ void isSwitch();
/* 800310C8 */ void check(fopAc_ac_c*);
/* 80031038 */ void check(cXyz const&);
/* 80031150 */ void execute();
/* 80031F28 */ ~data_c();
/* 80031F64 */ data_c();
};
class room_c {
public:
/* 80031190 */ void add(daSus_c::data_c*);
/* 800311FC */ void reset();
/* 80031EE4 */ room_c();
};
/* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 800313BC */ void reset();
/* 800314D4 */ void check(fopAc_ac_c*);
/* 80031434 */ static bool check(s8, cXyz const&);
/* 800315A4 */ static void execute();
static u8 mData[1152];
static u8 mRoom[256];
};
#endif /* D_COM_D_COM_STATIC_H */
include/d/d_drawlist.h
+21 -3
View File
@@ -142,12 +142,14 @@ public:
/* 80055768 */ void reset();
/* 800557C8 */ void imageDraw(f32 (*)[4]);
/* 80055A14 */ void draw(f32 (*)[4]);
/* 80055C74 */ void setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
/* 80055C74 */ int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
/* 80055F1C */ void addReal(u32, J3DModel*);
/* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
/* 80055F84 */ int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
/* 80055FE8 */ void setSimpleTex(ResTIMG const*);
static u8 mSimpleTexObj[32];
static GXTexObj* getSimpleTex() { return &mSimpleTexObj; }
static GXTexObj mSimpleTexObj;
private:
/* 0x00000 */ u8 field_0x0;
@@ -218,15 +220,31 @@ public:
view_class* getView() { return mView; }
J3DDrawBuffer* getOpaListFilter() { return mListFilter; }
J3DDrawBuffer* getOpaListP0() { return mListP0; }
J3DDrawBuffer* getOpaListPacket() { return mOpaListPacket; }
void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, XLU_BUFFER); }
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); }
void setXluListSky() { setXluDrawList(mpXluListSky); }
void setOpaListSky() { setOpaDrawList(mOpaListSky); }
void setXluListDark() { setXluDrawList(mXluListDark); }
void setOpaListDark() { setOpaDrawList(mOpaListDark); }
void setOpaList() { setOpaDrawList(mOpaList); }
void setXluList() { setXluDrawList(mXluList); }
void setXluListBG() { setXluDrawList(mXluListBG); }
void setOpaListBG() { setOpaDrawList(mOpaListBG); }
void setXluList2DScreen() { setXluDrawList(mList2DScreen); }
int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4,
f32 param_5, _GXTexObj* param_6) {
return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5,
param_6);
}
int setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
f32 param_5, dKy_tevstr_c* param_6) {
return mShadowControl.setReal(param_0, param_1, param_2, param_3, param_4, param_5,
param_6);
}
static void offWipe() { data_80450ED0 = 0; }
static u8 mWipeDlst[72];
include/d/d_item_data.h
+80
View File
@@ -3,4 +3,84 @@
#include "dolphin/types.h"
struct dItem_itemInfo {
/* 0x0 */ u8 mShadowSize;
/* 0x1 */ u8 mH;
/* 0x2 */ u8 mR;
/* 0x3 */ u8 mFlag;
};
struct dItem_itemResource {
/* 0x00 */ char* mArcName;
/* 0x04 */ s16 mBmdName;
/* 0x06 */ s16 mBtkName;
/* 0x08 */ s16 mBckName;
/* 0x0A */ s16 mBrkName;
/* 0x0C */ s16 mBtpName;
/* 0x0E */ s8 mTevFrm;
/* 0x0F */ s8 mBtpFrm;
/* 0x10 */ s16 mTexture;
/* 0x12 */ u8 mTexScale;
/* 0x14 */ s16 field_0x14;
}; // Size: 0x18
struct dItem_fieldItemResource {
/* 0x0 */ char* mFieldArc;
/* 0x4 */ s16 mItemBmdName;
/* 0x6 */ s16 mItemBckName;
/* 0x8 */ s16 mItemBrkName;
/* 0xA */ u8 field_0xa;
/* 0xC */ u16 mHeapSize;
}; // Size: 0x10
struct dItem_data {
static char* getArcName(u8 index) { return item_resource[index].mArcName; }
static s16 getBtpName(u8 index) { return item_resource[index].mBtpName; }
static s16 getBrkName(u8 index) { return item_resource[index].mBrkName; }
static s16 getBxaName(u8 index) { return -1; }
static s16 getBckName(u8 index) { return item_resource[index].mBckName; }
static s16 getBpkName(u8 index) { return -1; }
static s16 getBtkName(u8 index) { return item_resource[index].mBtkName; }
static s16 getBmdName(u8 index) { return item_resource[index].mBmdName; }
static s8 getTevFrm(u8 index) { return item_resource[index].mTevFrm; }
static s8 getBtpFrm(u8 index) { return item_resource[index].mBtpFrm; }
static char* getFieldArc(u8 index) { return field_item_res[index].mFieldArc; }
static s16 getItemBmdName(u8 index) { return field_item_res[index].mItemBmdName; }
static s16 getItemBtkName(u8 index) { return -1; }
static s16 getItemBpkName(u8 index) { return -1; }
static s16 getItemBckName(u8 index) { return field_item_res[index].mItemBckName; }
static s16 getItemBxaName(u8 index) { return -1; }
static s16 getItemBrkName(u8 index) { return field_item_res[index].mItemBrkName; }
static s16 getItemBtpName(u8 index) { return -1; }
static BOOL chkFlag(u8 index, int flag) { return item_info[index].mFlag & flag; }
static u8 getShadowSize(u8 index) { return item_info[index].mShadowSize; }
static u8 getH(u8 index) { return item_info[index].mH; }
static u8 getR(u8 index) { return item_info[index].mR; }
static dItem_itemResource item_resource[255];
static dItem_fieldItemResource field_item_res[255];
static dItem_itemInfo item_info[255];
};
#endif /* D_D_ITEM_DATA_H */
include/d/d_lib.h
+3
View File
@@ -3,6 +3,9 @@
#include "dolphin/types.h"
struct JKRAramArchive;
u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
include/d/d_model.h
+49
View File
@@ -1,6 +1,55 @@
#ifndef D_D_MODEL_H
#define D_D_MODEL_H
#include "d/com/d_com_inf_game.h"
#include "dolphin/types.h"
class dMdl_obj_c {
public:
MtxP getMtx() { return mMtx; }
/* 0x00 */ Mtx mMtx;
/* 0x30 */ dMdl_obj_c* mpObj;
};
class dMdl_c : public J3DPacket {
public:
/* 8009C650 */ void create(J3DModelData*, u16, dKy_tevstr_c*);
/* 8009C668 */ void entryObj(dMdl_obj_c*);
/* 8009C930 */ dMdl_c();
/* 8009C4FC */ virtual void draw();
/* 8009C808 */ virtual ~dMdl_c();
J3DModelData* getModelData() { return mpModelData; }
u16 getMaterialId() { return mMaterialId; }
dKy_tevstr_c* getTevstr() { return mpTevstr; }
private:
/* 0x10 */ J3DModelData* mpModelData;
/* 0x14 */ dKy_tevstr_c* mpTevstr;
/* 0x18 */ u16 mMaterialId;
/* 0x1A */ bool field_0x1a;
/* 0x1C */ dMdl_obj_c* mpModelObj;
};
class dMdl_mng_c {
public:
dMdl_mng_c() { field_0x80 = 0; }
~dMdl_mng_c() {}
/* 8009C6DC */ dMdl_c* search(J3DModelData*, u16, dKy_tevstr_c*);
/* 8009C724 */ dMdl_c* entry(J3DModelData*, u16, dKy_tevstr_c*);
/* 8009C8D8 */ dMdl_c* entry(J3DModelData*, u16, int);
/* 8009C7AC */ void create();
/* 8009C864 */ void remove();
/* 8009C8C0 */ void reset();
static dMdl_mng_c* m_myObj;
private:
/* 0x00 */ dMdl_c field_0x0[4];
/* 0x80 */ u8 field_0x80;
};
#endif /* D_D_MODEL_H */
include/d/d_resorce.h
+8
View File
@@ -97,6 +97,10 @@ public:
return deleteRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
}
int deleteStageRes(const char* name) {
return deleteRes(name, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
}
void* getStageRes(const char* arcName, const char* resName) {
return getRes(arcName, resName, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
}
@@ -105,6 +109,10 @@ public:
return getResInfo(arcName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
}
dRes_info_c* getStageResInfo(const char* arcName) {
return getResInfo(arcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
}
/* 0x0000 */ dRes_info_c mObjectInfo[0x80];
/* 0x1200 */ dRes_info_c mStageInfo[0x40];
}; // Size: 0x1B00
include/d/d_simple_model.h
+55
View File
@@ -1,6 +1,61 @@
#ifndef D_D_SIMPLE_MODEL_H
#define D_D_SIMPLE_MODEL_H
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "dolphin/types.h"
class modelList_c {
public:
void init() {
mpModel = NULL;
field_0x4 = NULL;
}
void set(J3DModel* model) { mpModel = model; }
/* 0x0 */ J3DModel* mpModel;
/* 0x4 */ modelList_c* field_0x4;
};
class diff_model_c {
public:
/* 80048D60 */ diff_model_c();
/* 800490EC */ BOOL create(J3DModelData*, int, u8);
/* 800491F4 */ J3DModelData* getModelData();
/* 80049210 */ void remove(int);
/* 80049270 */ void draw();
/* 80049368 */ void init();
/* 80049388 */ BOOL isSame(J3DModelData*, int);
/* 800493FC */ s32 getRoomNo();
/* 80049408 */ void insert(modelList_c*);
J3DModel* getModel() { return mpModel; }
private:
/* 0x00 */ JKRSolidHeap* mpHeap;
/* 0x04 */ J3DModel* mpModel;
/* 0x08 */ int mCreateNum;
/* 0x0C */ modelList_c* mpList;
/* 0x10 */ u8 mDrawBG;
/* 0x11 */ s8 mRoomNo;
/* 0x12 */ u8 field_0x12;
}; // Size: 0x14
class dSmplMdl_draw_c {
public:
/* 80048CB4 */ dSmplMdl_draw_c();
/* 80048E0C */ void draw();
/* 80048EBC */ void entry(J3DModel*, int);
/* 80048F70 */ BOOL addModel(J3DModelData*, int, u8);
/* 80049058 */ int removeModel(J3DModelData*, int);
/* 80048D80 */ virtual ~dSmplMdl_draw_c();
private:
/* 0x04 */ diff_model_c mModel[8];
/* 0xA4 */ int mListCount;
/* 0xA8 */ modelList_c mList[500];
}; // Size: 0x1048
#endif /* D_D_SIMPLE_MODEL_H */
include/d/d_stage.h
+306 -150
View File
File diff suppressed because it is too large Load Diff
include/d/d_timer.h
+23
View File
@@ -1,8 +1,31 @@
#ifndef D_D_TIMER_H
#define D_D_TIMER_H
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
void dTimer_createStockTimer();
class dTimer_c {
public:
/* 8025CA0C */ void _create();
/* 8025CF04 */ void _execute();
/* 8025D33C */ void _draw();
/* 8025D3BC */ void _delete();
/* 8025D524 */ int deleteCheck();
/* 8025D618 */ void start(int, s16);
/* 8025D538 */ void start(int);
/* 8025D7C0 */ void stock_start(s16);
/* 8025D708 */ void stock_start();
/* 8025D7E8 */ void stop(u8);
/* 8025D86C */ void restart(u8);
/* 8025D920 */ void end(int);
/* 8025D9E0 */ void deleteRequest();
/* 8025D9F0 */ void getTimeMs();
/* 8025DA54 */ void getLimitTimeMs();
/* 8025DA9C */ void getRestTimeMs();
/* 8025DB10 */ void isStart();
/* 802613DC */ void createGetIn(cXyz);
};
#endif /* D_D_TIMER_H */
include/d/kankyo/d_kankyo.h
+9 -2
View File
@@ -17,6 +17,7 @@ void dKy_itudemo_se();
BOOL dKy_darkworld_spot_check(char const* stageName, int roomNo);
void dKy_darkworld_Area_set(char const* stageName, int roomNo);
void dKy_FiveSenses_fullthrottle_dark();
s32 dKy_daynight_check();
struct LIGHT_INFLUENCE {
/* 800CFC7C */ ~LIGHT_INFLUENCE();
@@ -132,8 +133,7 @@ public:
/* 0x32C */ cXyz field_0x32c;
/* 0x338 */ cXyz field_0x338;
/* 0x344 */ f32 field_0x344;
/* 0x348 */ int field_0x348;
/* 0x34C */ int field_0x34c;
/* 0x348 */ GXColorS10 field_0x348;
/* 0x350 */ int field_0x350;
/* 0x354 */ int field_0x354;
/* 0x358 */ u16 field_0x358;
@@ -200,6 +200,10 @@ public:
/* 801ADBBC */ virtual ~dScnKy_env_light_c();
void setLightTevColorType_MAJI(J3DModel* i_model, dKy_tevstr_c* tevstr) {
setLightTevColorType_MAJI(i_model->getModelData(), tevstr);
}
public:
/* 0x0000 */ // vtable
/* 0x0004 */ void* mpDmPalet;
@@ -489,5 +493,8 @@ s32 dKy_getdaytime_minute();
s32 dKy_get_dayofweek();
static void dKy_Sound_init();
void dKy_setLight_nowroom(char);
void dKy_setLight_nowroom_actor(dKy_tevstr_c*);
void dKy_setLight_again();
void dKy_GxFog_tevstr_set(dKy_tevstr_c*);
#endif /* D_KANKYO_D_KANKYO_H */
include/d/map/d_map_path_dmap.h
+6 -6
View File
@@ -29,12 +29,12 @@ public:
};
struct dMapInfo_n {
/* 8003ECA0 */ void chkGetCompass();
/* 8003ECD8 */ void chkGetMap();
/* 8003ED10 */ void isVisitedRoom(int);
/* 8003ED60 */ void correctionOriginPos(s8, Vec*);
/* 8003EDC0 */ void offsetPlus(dStage_FileList2_dt_c const*, Vec*);
/* 8003EDEC */ void rotAngle(dStage_FileList2_dt_c const*, Vec*);
/* 8003ECA0 */ bool chkGetCompass();
/* 8003ECD8 */ bool chkGetMap();
/* 8003ED10 */ static bool isVisitedRoom(int);
/* 8003ED60 */ static void correctionOriginPos(s8, Vec*);
/* 8003EDC0 */ static void offsetPlus(dStage_FileList2_dt_c const*, Vec*);
/* 8003EDEC */ static void rotAngle(dStage_FileList2_dt_c const*, Vec*);
/* 8003EE5C */ static Vec getMapPlayerPos();
/* 8003EF20 */ void getMapPlayerAngleY();
/* 8003EF70 */ void getConstRestartIconPointer();
include/d/meter/d_meter2_info.h
+5 -4
View File
@@ -44,10 +44,6 @@ struct dMenu_Letter {
static dMenu_LetterData letter_data[64];
};
struct dItem_data {
static void* item_resource[1530];
};
class dMw_c;
class dMeter2_c;
class J2DPicture;
@@ -151,6 +147,7 @@ public:
void onLifeGaugeSE() { mLifeGaugeSE = 1; }
void offLifeGaugeSE() { mLifeGaugeSE = 0; }
u8 getLifeGaugeSE() { return mLifeGaugeSE; }
const char* getSaveStageName() { return mSaveStageName; }
public:
/* 0x04 */ u8 unk4[4];
@@ -429,6 +426,10 @@ inline u8 dMeter2Info_getLifeGaugeSE() {
return g_meter2_info.getLifeGaugeSE();
}
inline const char* dMeter2Info_getSaveStageName() {
return g_meter2_info.getSaveStageName();
}
char* dMeter2Info_getNumberTextureName(int pIndex);
#endif /* D_METER_D_METER2_INFO_H */
include/d/particle/d_particle.h
+2 -2
View File
@@ -91,8 +91,8 @@ public:
/* 0x005 */ u8 field_0x5;
/* 0x006 */ u8 field_0x6;
/* 0x008 */ emitter_c mEmitter[0x80];
/* 0xC08 */
};
/* 0xC08 */ emitter_c* field_0xc08[0x100];
}; // Size: 0x1008
/* 8004BACC */ dPa_control_c();
/* 8004BB70 */ void getRM_ID(u16);
include/d/save/d_save.h
+195 -143
View File
File diff suppressed because it is too large Load Diff
include/d/save/d_save_HIO.h
+212
View File
@@ -2,5 +2,217 @@
#define D_SAVE_D_SAVE_HIO_H
#include "dolphin/types.h"
#include "global.h"
class dSvBit_childTransformHIO_c {
public:
/* 8025C0A0 */ dSvBit_childTransformHIO_c();
/* 8025C0D4 */ void init();
/* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool WF[4];
/* 0x09 */ bool field_0x9[4];
};
class dSvBit_childDarknessHIO_c {
public:
/* 8025C004 */ dSvBit_childDarknessHIO_c();
/* 8025C038 */ void init();
/* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool TW[6];
/* 0x0B */ bool field_0x9[6];
};
class dSvBit_childOtherHIO_c {
public:
/* 8025C13C */ dSvBit_childOtherHIO_c();
/* 8025C178 */ void init();
/* 8025C29C */ virtual ~dSvBit_childOtherHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 mDropNum;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ bool mLightVessel[4];
/* 0x0B */ bool field_0xb[4];
};
class dSvBit_childTbPerfectionHIO_c {
public:
/* 8025BF68 */ dSvBit_childTbPerfectionHIO_c();
/* 8025BF9C */ void init();
/* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x40];
/* 0x45 */ bool field_0x45[0x40];
};
class dSvBit_childTreasureHIO_c {
public:
/* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x08 */ dSvBit_childTbPerfectionHIO_c mPerfectSave;
};
class dSvBit_childSwZoneHIO_c {
public:
/* 8025BCB0 */ dSvBit_childSwZoneHIO_c();
/* 8025BCE4 */ void init();
/* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x20];
/* 0x25 */ bool field_0x25[0x20];
};
class dSvBit_childSwPerfectionHIO_c {
public:
/* 8025BB78 */ dSvBit_childSwPerfectionHIO_c();
/* 8025BBAC */ void init();
/* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x80];
/* 0x85 */ bool field_0x85[0x80];
};
class dSvBit_childSwOneZoneHIO_c {
public:
/* 8025BD10 */ dSvBit_childSwOneZoneHIO_c();
/* 8025BD44 */ void init();
/* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x10];
/* 0x15 */ bool field_0x15[0x10];
};
class dSvBit_childSwDungeonHIO_c {
public:
/* 8025BC14 */ dSvBit_childSwDungeonHIO_c();
/* 8025BC48 */ void init();
/* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x40];
/* 0x45 */ bool field_0x45[0x40];
};
class dSvBit_childSwitchHIO_c {
public:
/* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c();
private:
/* 0x004 */ u8 field_0x4;
/* 0x008 */ dSvBit_childSwPerfectionHIO_c field_0x8;
/* 0x110 */ dSvBit_childSwDungeonHIO_c field_0x110;
/* 0x198 */ dSvBit_childSwZoneHIO_c field_0x198;
/* 0x1E0 */ dSvBit_childSwOneZoneHIO_c field_0x1e0;
};
class dSvBit_childItZoneHIO_c {
public:
/* 8025BEA8 */ dSvBit_childItZoneHIO_c();
/* 8025BEDC */ void init();
/* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x20];
/* 0x25 */ bool field_0x25[0x20];
};
class dSvBit_childItPerfectionHIO_c {
public:
/* 8025BD70 */ dSvBit_childItPerfectionHIO_c();
/* 8025BDA4 */ void init();
/* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x20];
/* 0x25 */ bool field_0x25[0x20];
};
class dSvBit_childItOneZoneHIO_c {
public:
/* 8025BF08 */ dSvBit_childItOneZoneHIO_c();
/* 8025BF3C */ void init();
/* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x10];
/* 0x15 */ bool field_0x15[0x10];
};
class dSvBit_childItDungeonHIO_c {
public:
/* 8025BE0C */ dSvBit_childItDungeonHIO_c();
/* 8025BE40 */ void init();
/* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c();
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x80];
/* 0x85 */ bool field_0x85[0x80];
};
class dSvBit_childItemHIO_c {
public:
/* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c();
private:
/* 0x004 */ u8 field_0x4;
/* 0x008 */ dSvBit_childItPerfectionHIO_c mFullSave;
/* 0x050 */ dSvBit_childItDungeonHIO_c mDungeonSave;
/* 0x158 */ dSvBit_childItZoneHIO_c mZoneSave;
/* 0x1A0 */ dSvBit_childItOneZoneHIO_c mOneZoneSave;
};
class dSvBit_HIO_c {
public:
/* 8025C1F8 */ void init();
/* 8025C6FC */ virtual ~dSvBit_HIO_c();
private:
/* 0x004 */ u8 field_0x4;
/* 0x008 */ dSvBit_childSwitchHIO_c mSwitch;
/* 0x210 */ dSvBit_childItemHIO_c mItem;
/* 0x3D8 */ dSvBit_childTreasureHIO_c mTreasure;
/* 0x468 */ dSvBit_childDarknessHIO_c mDarkness;
/* 0x47C */ dSvBit_childTransformHIO_c mTransform;
/* 0x48C */ dSvBit_childOtherHIO_c mOther;
/* 0x49C */ bool mTransformFlag;
/* 0x49D */ bool field_0x49d;
};
STATIC_ASSERT(sizeof(dSvBit_HIO_c) == 0x4A0);
#endif /* D_SAVE_D_SAVE_HIO_H */
include/dolphin/gx/GX.h
+1
View File
@@ -912,6 +912,7 @@ void GXInitLightSpot(GXLightObj*, f32, GXSpotFn);
void GXInvalidateTexAll(void);
void GXLoadLightObjImm(GXLightObj*, GXLightID);
void GXLoadPosMtxImm(Mtx, u32);
void GXLoadNrmMtxImm(Mtx, u32);
void GXLoadTexMtxImm(Mtx, u32, GXTexMtxType);
void GXPixModeSync(void);
void GXProject(f32, f32, f32, Mtx, f32*, f32*, f32*, f32*, f32*);
include/f_op/f_op_camera_mng.h
+1
View File
@@ -18,6 +18,7 @@ public:
/* 0x224 */ leafdraw_method_class* pMthd;
};
u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3);
void fopCamM_Management(void);
u32 fopCamM_GetParam(camera_class* pCamera);
void fopCamM_Init(void);

Some files were not shown because too many files have changed in this diff Show More