mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 14:55:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_save / pane_class / rename some data (#205)

Browse Source 
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc
This commit is contained in:
TakaRikka
2022-07-04 12:21:57 -07:00
committed by GitHub
parent b68cfbc0e6
commit 929c5cfa5a
572 changed files with 4756 additions and 8007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/bg/d_bg_s.h
+2 -2
View File
@@ -80,8 +80,8 @@ public:
bool GetMonkeyBarsCode(cBgS_PolyInfo const&);
bool GetUnderwaterRoofCode(cBgS_PolyInfo const&);
s32 GetWallCode(cBgS_PolyInfo const&);
BOOL GetPolyAtt0(cBgS_PolyInfo const&);
bool GetPolyAtt1(cBgS_PolyInfo const&);
int GetPolyAtt0(cBgS_PolyInfo const&);
int GetPolyAtt1(cBgS_PolyInfo const&);
bool GetGroundCode(cBgS_PolyInfo const&);
s32 GetCamMoveBG(cBgS_PolyInfo const&);
s32 GetRoomCamId(cBgS_PolyInfo const&);
include/d/bg/d_bg_w.h
+4 -4
View File
@@ -125,8 +125,8 @@ public:
virtual bool GetUnderwaterRoofCode(int) = 0;
virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0;
virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0;
virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual bool GetPolyAtt1(cBgS_PolyInfo const&) = 0;
virtual int GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual int GetPolyAtt1(cBgS_PolyInfo const&) = 0;
virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0;
virtual void GetIronBallThrough(int) = 0;
virtual u32 GetAttackThrough(int) = 0;
@@ -225,8 +225,8 @@ public:
/* 8007B4B4 */ virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&);
/* 8007B6AC */ virtual void GetLinkNo(cBgS_PolyInfo const&);
/* 8007B6D8 */ virtual s32 GetWallCode(cBgS_PolyInfo const&);
/* 8007B704 */ virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&);
/* 8007B734 */ virtual bool GetPolyAtt1(cBgS_PolyInfo const&);
/* 8007B704 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&);
/* 8007B734 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&);
/* 8007B760 */ virtual bool GetGroundCode(cBgS_PolyInfo const&);
/* 8007B7DC */ virtual void GetIronBallThrough(int);
/* 8007B800 */ virtual u32 GetAttackThrough(int);
include/d/bg/d_bg_w_base.h
+2 -2
View File
@@ -66,8 +66,8 @@ public:
virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0;
virtual void GetLinkNo(cBgS_PolyInfo const&) = 0;
virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0;
virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual bool GetPolyAtt1(cBgS_PolyInfo const&) = 0;
virtual int GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual int GetPolyAtt1(cBgS_PolyInfo const&) = 0;
virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0;
virtual void GetIronBallThrough(int) = 0;
virtual u32 GetAttackThrough(int) = 0;
include/d/bg/d_bg_w_kcol.h
+2 -2
View File
@@ -62,8 +62,8 @@ public:
/* 80082B3C */ virtual void GetMonkeyBarsCode(cBgS_PolyInfo const&);
/* 80082D24 */ virtual void GetLinkNo(cBgS_PolyInfo const&);
/* 80082D54 */ virtual s32 GetWallCode(cBgS_PolyInfo const&);
/* 80082D84 */ virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&);
/* 80082DB4 */ virtual void GetPolyAtt1(cBgS_PolyInfo const&);
/* 80082D84 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&);
/* 80082DB4 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&);
/* 80082DE4 */ virtual void GetGroundCode(cBgS_PolyInfo const&);
/* 80082E14 */ virtual void GetIronBallThrough(int);
/* 80082E40 */ virtual void GetAttackThrough(int);
include/d/com/d_com_inf_game.h
+32 -6
View File
@@ -796,6 +796,7 @@ void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo,
BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no);
void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
void dComIfGs_PolyDamageOff_Set(s8 param_0);
inline void dComIfGs_init() {
g_dComIfG_gameInfo.info.init();
@@ -1298,6 +1299,14 @@ inline u8 dComIfGs_getDataNum() {
return g_dComIfG_gameInfo.info.getDataNum();
}
inline void dComIfGs_setDataNum(u8 num) {
return g_dComIfG_gameInfo.info.setDataNum(num);
}
inline void dComIfGs_setNewFile(u8 file) {
return g_dComIfG_gameInfo.info.setNewFile(file);
}
inline char* dComIfGs_getPlayerName() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName();
}
@@ -1469,12 +1478,6 @@ inline void dComIfGs_setMemoryToCard(u8* p_saveData, int dataNum) {
}
inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) {
g_dComIfG_gameInfo.play.setItemLifeCount(amount, type);
}
inline void i_dComIfGp_setItemRupeeCount(int amount) {
g_dComIfG_gameInfo.play.setItemRupeeCount(amount);
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
@@ -1502,6 +1505,13 @@ void dComIfGp_world_dark_set(u8);
u8 dComIfGp_getNowLevel();
void dComIfGp_calcNowRegion();
inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) {
g_dComIfG_gameInfo.play.setItemLifeCount(amount, type);
}
inline void i_dComIfGp_setItemRupeeCount(int amount) {
g_dComIfG_gameInfo.play.setItemRupeeCount(amount);
}
inline dStage_startStage_c* dComIfGp_getStartStage() {
return g_dComIfG_gameInfo.play.getStartStage();
}
@@ -1914,6 +1924,22 @@ inline stage_stag_info_class* dComIfGp_getStageStagInfo() {
return g_dComIfG_gameInfo.play.getStage().getStagInfo();
}
inline stage_envr_info_class* dComIfGp_getStageEnvrInfo() {
return g_dComIfG_gameInfo.play.getStage().getEnvrInfo();
}
inline stage_palette_info_class* dComIfGp_getStagePaletteInfo() {
return g_dComIfG_gameInfo.play.getStage().getPaletteInfo();
}
inline stage_pselect_info_class* dComIfGp_getStagePselectInfo() {
return g_dComIfG_gameInfo.play.getStage().getPselectInfo();
}
inline stage_vrbox_info_class* dComIfGp_getStageVrboxcolInfo() {
return g_dComIfG_gameInfo.play.getStage().getVrboxInfo();
}
inline u8 dComIfGp_isHeapLockFlag() {
return g_dComIfG_gameInfo.play.isHeapLockFlag();
}
include/d/d_stage.h
+27 -9
View File
@@ -30,6 +30,15 @@ public:
/* 0x1D */ u8 mFlagID;
}; // Size: 0x20
enum StageType {
/* 0x0 */ ST_FIELD,
/* 0x1 */ ST_DUNGEON,
/* 0x2 */ ST_ROOM,
/* 0x3 */ ST_BOSS_ROOM,
/* 0x4 */ ST_CASTLE_TOWN,
/* 0x5 */ ST_CLOUD_SEA,
};
struct stage_stag_info_class {
/* 0x00 */ f32 field_0x0;
/* 0x04 */ f32 field_0x4;
@@ -95,8 +104,8 @@ struct stage_map_info_dummy_class {
};
struct stage_envr_info_class {
// Env
};
/* 0x0 */ u8 field_0x0[0x41];
}; // Size: 0x41
struct stage_camera2_data_class {
/* 0x00 */ int field_0x0;
@@ -658,11 +667,11 @@ public:
STATIC_ASSERT(sizeof(dStage_roomStatus_c) == 0x404);
extern s8 struct_80450D64; // gStayNo
extern s8 gLastStayNo;
extern s8 gNextStayNo;
extern s8 gTimePass;
extern u8 data_80450D68;
extern s8 mStayNo__20dStage_roomControl_c; // gStayNo
extern s8 mOldStayNo__20dStage_roomControl_c;
extern s8 mNextStayNo__20dStage_roomControl_c;
extern s8 m_time_pass__20dStage_roomControl_c;
extern u8 mNoChangeRoom__20dStage_roomControl_c;
class dStage_roomControl_c {
public:
@@ -701,7 +710,7 @@ public:
/* 8025BAAC */ void setZoneNo(int, int);
static s32 GetTimePass();
static s8 getStayNo() { return struct_80450D64; }
static s8 getStayNo() { return mStayNo; }
static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; }
static s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; }
dKy_tevstr_c* getTevStr(int i_roomNo) { return &mStatus[i_roomNo].mKyTevStr; }
@@ -714,7 +723,7 @@ public:
static char* getArcBankName() { return mArcBankName; }
static void setRoomReadId(s8 id) { data_804505F0 = id; }
static s8 getRoomReadId() { return data_804505F0; }
static void offNoChangeRoom() { data_80450D68 = false; }
static void offNoChangeRoom() { mNoChangeRoom = false; }
static void setProcID(u32 id) { mProcID = id; }
static u32 getProcID() { return mProcID; }
static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
@@ -733,6 +742,11 @@ public:
static char* mArcBankName;
static char* mArcBankData;
static roomDzs_c m_roomDzs;
static s8 mStayNo;
static s8 mOldStayNo;
static s8 mNextStayNo;
static s8 m_time_pass;
static u8 mNoChangeRoom;
private:
/* 0x0 */ u8 field_0x0[4];
@@ -911,6 +925,10 @@ inline s32 i_dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) {
return param_0->field_0x09 >> 1 & 0x1f;
}
inline s8 dStage_stagInfo_GetTimeH(stage_stag_info_class* p_info) {
return p_info->field_0x0c >> 8;
}
inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) {
return p_info->field_0xb & 0xF;
}
include/d/file/d_file_sel_info.h
+4
View File
@@ -18,6 +18,10 @@ public:
/* 801924A0 */ virtual ~dFile_info_c();
void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; }
CPaneMgrAlpha* getDatBase() { return mDatBase; }
CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; }
private:
/* 0x04 */ JKRArchive* mArchive;
/* 0x08 */ dDlst_FileInfo_c mFileInfo;
include/d/file/d_file_sel_warning.h
+5
View File
@@ -20,6 +20,11 @@ public:
/* 80192240 */ void setFontColor(JUtility::TColor, JUtility::TColor);
/* 80191C18 */ virtual ~dFile_warning_c();
u8 getStatus() { return mStatus; }
u8 field_0x4[0x3D - 0x4];
/* 0x3D */ u8 mStatus;
};
#endif /* D_FILE_D_FILE_SEL_WARNING_H */
include/d/kankyo/d_kankyo.h
+191 -151
View File
@@ -27,24 +27,32 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const* param_0);
void dKy_depth_dist_set(void* param_0);
void dKy_instant_rainchg();
void dKy_instant_timechg(f32);
static void dKy_set_vrboxsoracol_ratio(f32 ratio);
static void dKy_set_vrboxkumocol_ratio(f32 ratio);
void dKy_actor_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 param_3);
void dKy_fog_startendz_set(f32 param_0, f32 param_1, f32 param_2);
static void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 param_3);
struct LIGHT_INFLUENCE {
/* 800CFC7C */ ~LIGHT_INFLUENCE();
/* 8019F4F8 */ LIGHT_INFLUENCE();
/* 800CFC7C */ ~LIGHT_INFLUENCE() {}
/* 8019F4F8 */ LIGHT_INFLUENCE() {}
/* 0x00 */ cXyz mPosition;
/* 0x0C */ GXColorS10 mColor;
/* 0x14 */ f32 mPow;
/* 0x18 */ f32 mFluctuation; // ?
/* 0x1C */ int field_0x1c;
/* 0x18 */ f32 mFluctuation;
/* 0x1C */ int mIndex;
};
struct WIND_INFLUENCE {
/* 0x00 */ cXyz field_0x00;
/* 0x0C */ cXyz field_0x0c;
/* 0x18 */ u8 field_0x18[0xC];
/* 0x00 */ cXyz mPosition;
/* 0x0C */ cXyz mDirection;
/* 0x18 */ f32 mRadius;
/* 0x1C */ f32 mStrength;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ int field_0x24;
/* 0x28 */ u8 field_0x28;
/* 0x28 */ u8 mConstant;
/* 0x29 */ u8 field_0x29;
};
@@ -52,15 +60,18 @@ struct WIND_INF_ENTITY {
/* 8019F4B8 */ ~WIND_INF_ENTITY();
/* 8019F4F4 */ WIND_INF_ENTITY();
/* 0x00 */ u8 field_0x0[0x10];
/* 0x10 */ WIND_INFLUENCE field_0x10;
/* 0x00 */ u8 mInUse;
/* 0x04 */ f32 mMinRadius;
/* 0x08 */ f32 mSpeed;
/* 0x0C */ f32 mStrengthMaxVel;
/* 0x10 */ WIND_INFLUENCE mInfluence;
}; // Size: 0x3C
struct EFLIGHT_PROC {
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x04 */ int field_0x4;
/* 0x08 */ u8 field_0x8[0x20]; // LIGHT_INFLUENCE?
/* 0x00 */ u8 mState;
/* 0x01 */ u8 mFrame;
/* 0x04 */ int mLightType;
/* 0x08 */ LIGHT_INFLUENCE field_0x8;
};
struct SND_INFLUENCE {
@@ -88,8 +99,7 @@ struct DUNGEON_LIGHT {
/* 0x24 */ u8 mAngleAttenuation;
/* 0x25 */ u8 mDistAttenuation;
/* 0x26 */ u8 field_0x26[6];
/* 0x2C */ // LIGHT_INFLUENCE field_0x2c; this breaks ctor for some reason
u8 field_0x2c[0x20];
/* 0x2C */ LIGHT_INFLUENCE field_0x2c;
}; // Size: 0x4C
struct BOSS_LIGHT {
@@ -115,10 +125,10 @@ struct GB_WIND_INFLUENCE {
};
struct EF_THUNDER {
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x00 */ u8 mStatus;
/* 0x01 */ u8 mStateTimer;
/* 0x02 */ u8 field_0x2;
/* 0x04 */ int field_0x4;
/* 0x04 */ int mMode;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
@@ -126,7 +136,7 @@ struct EF_THUNDER {
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ u8 field_0x20[4];
/* 0x24 */ u8 field_0x24[0x20]; // LIGHT_INFLUENCE?
/* 0x24 */ LIGHT_INFLUENCE mLightInfluence;
};
struct GB_MAPLE_COL_CHANGE {
@@ -135,20 +145,42 @@ struct GB_MAPLE_COL_CHANGE {
/* 0x00 */ J3DLightObj field_0x0;
}; // Size: 0x74
// most of these members are guesses, fix later
struct LightStatus {
/* 0x00 */ Vec field_0x0;
/* 0x0C */ Vec field_0xc;
/* 0x18 */ GXColor field_0x18;
/* 0x1C */ Vec field_0x1c;
/* 0x28 */ Vec field_0x28;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ Vec mLightDir;
/* 0x44 */ f32 mCutoff;
/* 0x48 */ GXSpotFn mSpotFn;
/* 0x4C */ f32 mRefDist;
/* 0x50 */ f32 mRefBrightness;
/* 0x54 */ GXDistAttnFn mDistFn;
/* 0x58 */ u32 field_0x58[2][6]; //?
/* 0x88 */ f32 field_0x88;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ u32 field_0x98[2][8]; //?
/* 0xD8 */ f32 field_0xd8;
/* 0xDC */ f32 field_0xdc;
/* 0xE0 */ f32 field_0xe0;
/* 0xE4 */ f32 field_0xe4;
}; // Size: 0xE8
class dKy_tevstr_c {
public:
/* 0x000 */ J3DLightObj field_0x000;
/* 0x000 */ J3DLightObj mLightObj;
/* 0x074 */ J3DLightObj field_0x074[6];
/* 0x32C */ cXyz field_0x32c;
/* 0x338 */ cXyz field_0x338;
/* 0x338 */ cXyz mLightPosWorld;
/* 0x344 */ f32 field_0x344;
/* 0x348 */ GXColorS10 field_0x348;
/* 0x350 */ int field_0x350;
/* 0x354 */ int field_0x354;
/* 0x358 */ u16 field_0x358;
/* 0x35A */ u16 field_0x35a;
/* 0x35C */ u16 field_0x35c;
/* 0x35E */ u16 field_0x35e;
/* 0x348 */ GXColorS10 mColorC0;
/* 0x350 */ GXColorS10 mColorK0;
/* 0x358 */ GXColorS10 mFogColor;
/* 0x360 */ u8 field_0x360;
/* 0x361 */ u8 field_0x361;
/* 0x362 */ u8 field_0x362;
@@ -157,28 +189,54 @@ public:
/* 0x365 */ u8 field_0x365;
/* 0x366 */ u8 field_0x366;
/* 0x367 */ u8 field_0x367;
/* 0x368 */ f32 field_0x368;
/* 0x36C */ f32 field_0x36c;
/* 0x368 */ f32 mFogStartZ;
/* 0x36C */ f32 mFogEndZ;
/* 0x370 */ f32 field_0x370;
/* 0x374 */ f32 field_0x374;
/* 0x378 */ u16 field_0x378;
/* 0x37A */ u8 field_0x37a;
/* 0x37B */ u8 field_0x37b;
/* 0x37C */ u8 field_0x37c;
/* 0x37D */ u8 field_0x37d;
/* 0x37E */ u8 field_0x37e;
/* 0x37F */ u8 field_0x37f;
/* 0x380 */ u8 field_0x380;
/* 0x381 */ u8 field_0x381;
/* 0x382 */ u8 field_0x382;
/* 0x383 */ u8 field_0x383;
/* 0x37B */ u8 mInitTimer;
/* 0x37C */ u8 mEnvrIdxCurr;
/* 0x37D */ u8 mEnvrIdxPrev;
/* 0x37E */ u8 mColpatCurr;
/* 0x37F */ u8 mColpatPrev;
/* 0x380 */ s8 mRoomNo;
/* 0x381 */ u8 mEnvrIdxOverride;
/* 0x382 */ u8 mLightMode;
/* 0x383 */ u8 mInitType;
/* 0x384 */ u8 field_0x384;
/* 0x385 */ u8 field_0x385;
}; // Size = 0x388?
}; // Size = 0x388
STATIC_ASSERT(sizeof(dKy_tevstr_c) == 0x388);
class fopAc_ac_c;
class dKyd_lightSchejule;
class stage_palette_info_class;
class stage_pselect_info_class;
class stage_envr_info_class;
class stage_vrbox_info_class;
class stage_plight_info_class;
struct dKy_pol_arg_struct {
u8 data[8];
};
struct dKy_color_data_struct {
u8 data[8];
};
struct dKy_pol_efftbl_struct {
u8 data[8];
};
struct dKy_pol_effcol_struct {
u8 data[8];
};
struct dKy_pol_sound_struct {
u8 data[8];
};
class dScnKy_env_light_c {
public:
@@ -215,26 +273,26 @@ public:
public:
/* 0x0000 */ // vtable
/* 0x0004 */ void* mpDmPalet;
/* 0x0008 */ void* mpDmPselect;
/* 0x000C */ void* mpDmEnvr;
/* 0x0010 */ void* mpDmVrbox;
/* 0x0014 */ void* mpSchedule;
/* 0x0018 */ u8 field_0x18[0x20]; // LIGHT_INFLUENCE?
/* 0x0038 */ LIGHT_INFLUENCE field_0x38[30];
/* 0x0004 */ stage_palette_info_class* mpDmPalet;
/* 0x0008 */ stage_pselect_info_class* mpDmPselect;
/* 0x000C */ stage_envr_info_class* mpDmEnvr;
/* 0x0010 */ stage_vrbox_info_class* mpDmVrbox;
/* 0x0014 */ dKyd_lightSchejule* mpSchedule;
/* 0x0018 */ LIGHT_INFLUENCE mBaseLightInfluence;
/* 0x0038 */ LIGHT_INFLUENCE mLightInfluence[30];
/* 0x03F8 */ LIGHT_INFLUENCE* mPointLight[100];
/* 0x0588 */ LIGHT_INFLUENCE* mEfPLight[5];
/* 0x059C */ u8 field_0x59c[400];
/* 0x072C */ LIGHT_INFLUENCE* field_0x72c[5];
/* 0x0740 */ u8 field_0x740[0x20]; // LIGHT_INFLUENCE?
/* 0x0740 */ LIGHT_INFLUENCE field_0x740;
/* 0x0760 */ u8 field_0x760[4];
/* 0x0764 */ LIGHT_INFLUENCE mBGpartsActiveLight[2];
/* 0x07A4 */ EFLIGHT_PROC field_0x7a4;
/* 0x07CC */ void* stagPlightInfo; // might be part of EFLIGHT_PROC
/* 0x07A4 */ EFLIGHT_PROC mSwordLight;
/* 0x07CC */ stage_plight_info_class* stagPlightInfo; // might be part of EFLIGHT_PROC
/* 0x07D0 */ WIND_INFLUENCE* mPntWind[30];
/* 0x0848 */ WIND_INF_ENTITY field_0x848[5];
/* 0x0848 */ WIND_INF_ENTITY mWindInfluenceEntity[5];
/* 0x0974 */ SND_INFLUENCE mSound;
/* 0x098C */ u8 field_0x98c;
/* 0x098C */ u8 field_0x98c; // often set to room no
/* 0x0990 */ DALKMIST_INFLUENCE* mDalkmistInf[10];
/* 0x09B8 */ DUNGEON_LIGHT mDungeonLights[8];
/* 0x0C18 */ BOSS_LIGHT field_0x0c18[8];
@@ -244,42 +302,42 @@ public:
/* 0x0E60 */ f32 field_0xe60;
/* 0x0E64 */ u16 field_0xe64;
/* 0x0E66 */ u16 field_0xe66;
/* 0x0E68 */ s16 field_0xe68;
/* 0x0E6A */ s16 field_0xe6a;
/* 0x0E68 */ s16 mEvtWindAngleX;
/* 0x0E6A */ s16 mEvtWindAngleY;
/* 0x0E6C */ u8 field_0xe6c;
/* 0x0E6D */ u8 field_0xe6d;
/* 0x0E6E */ u8 field_0xe6e; // E5C - E6E might all be part of GB_WIND_INFLUENCE
/* 0x0E6D */ u8 mEvtWindSet;
/* 0x0E6E */ u8 mTeachWindExist;
/* 0x0E6F */ u8 field_0xe6f;
/* 0x0E70 */ bool mSunPacketEnabled;
/* 0x0E70 */ bool mSunInitialized;
/* 0x0E74 */ dKankyo_sun_Packet* mpSunPacket;
/* 0x0E78 */ dKankyo_sunlenz_Packet* mpSunLenzPacket;
/* 0x0E7C */ bool mRainPacketEnabled;
/* 0x0E7C */ bool mRainInitialized;
/* 0x0E80 */ int mRainCount;
/* 0x0E84 */ dKankyo_rain_Packet* mpRainPacket;
/* 0x0E88 */ bool mSnowPacketEnabled;
/* 0x0E88 */ bool mSnowInitialized;
/* 0x0E8C */ int mSnowCount;
/* 0x0E90 */ u8 field_0xe90;
/* 0x0E91 */ u8 field_0xe91;
/* 0x0E92 */ bool field_0xe92;
/* 0x0E94 */ dKankyo_snow_Packet* mpSnowPacket;
/* 0x0E98 */ bool mStarPacketEnabled;
/* 0x0E98 */ bool mStarInitialized;
/* 0x0E9C */ int mStarCount;
/* 0x0EA0 */ f32 mStarDensity;
/* 0x0EA4 */ dKankyo_star_Packet* mpStarPacket;
/* 0x0EA8 */ bool mHousiPacketEnabled;
/* 0x0EA8 */ bool mHousiInitialized;
/* 0x0EA9 */ u8 field_0xea9;
/* 0x0EAC */ int field_0xeac;
/* 0x0EAC */ int mHousiCount;
/* 0x0EB0 */ dKankyo_housi_Packet* mpHousiPacket;
/* 0x0EB4 */ u8 mCloudPacketEnabled;
/* 0x0EB5 */ u8 field_0xeb5;
/* 0x0EB8 */ int field_0xeb8;
/* 0x0EB4 */ u8 mCloudInitialized;
/* 0x0EB5 */ u8 mMoyaMode;
/* 0x0EB8 */ int mMoyaCount;
/* 0x0EBC */ f32 field_0xebc;
/* 0x0EC0 */ dKankyo_cloud_Packet* mpCloudPacket;
/* 0x0EC4 */ u8 field_0xec4;
/* 0x0EC8 */ int field_0xec8;
/* 0x0EC4 */ u8 mVrkumoStatus;
/* 0x0EC8 */ int mVrkumoCount;
/* 0x0ECC */ f32 field_0xecc;
/* 0x0ED0 */ dKankyo_vrkumo_Packet* mpVrkumoPacket;
/* 0x0ED4 */ EF_THUNDER field_0xed4;
/* 0x0ED4 */ EF_THUNDER mThunderEff;
/* 0x0F18 */ u8 field_0xf18[4];
/* 0x0F1C */ dKankyo_shstar_Packet* mpShstarPacket;
/* 0x0F20 */ u8 mOdourPacketStatus;
@@ -300,10 +358,10 @@ public:
/* 0x1038 */ u8 field_0x1038;
/* 0x103C */ int field_0x103c;
/* 0x1040 */ u8 field_0x1040[4];
/* 0x1044 */ u8 mMudPacketEnabled;
/* 0x1044 */ u8 mMudInitialized;
/* 0x1048 */ int field_0x1048;
/* 0x104C */ dKankyo_mud_Packet* mpMudPacket;
/* 0x1050 */ u8 mEvilPacketEnabled;
/* 0x1050 */ u8 mEvilInitialized;
/* 0x1051 */ u8 field_0x1051;
/* 0x1054 */ int field_0x1054;
/* 0x1058 */ dKankyo_evil_Packet* mpEvilPacket;
@@ -312,10 +370,10 @@ public:
/* 0x1064 */ f32 field_0x1064;
/* 0x1068 */ f32 field_0x1068;
/* 0x106C */ f32 field_0x106c;
/* 0x1070 */ cXyz field_0x1070;
/* 0x1070 */ cXyz mSunPos2;
/* 0x107C */ cXyz mPLightNearPos;
/* 0x1088 */ cXyz field_0x1088;
/* 0x1094 */ cXyz field_0x1094;
/* 0x1088 */ cXyz mSunPos;
/* 0x1094 */ cXyz mMoonPos;
/* 0x10A0 */ cXyz field_0x10a0;
/* 0x10AC */ GXFogAdjTable mXFogTbl;
/* 0x10C0 */ GXColorS10 mSkyColor;
@@ -346,58 +404,40 @@ public:
/* 0x1122 */ s16 mTerrainAmbienceBG3_G;
/* 0x1124 */ s16 mTerrainAmbienceBG3_B;
/* 0x1126 */ s16 mFakeFogA;
/* 0x1128 */ _GXColorS10 field_0x1128;
/* 0x1128 */ GXColorS10 field_0x1128;
/* 0x1130 */ u8 field_0x1130[0x28];
/* 0x1158 */ _GXColorS10 mFogColor;
/* 0x1160 */ s16 field_0x1160;
/* 0x1162 */ s16 field_0x1162;
/* 0x1164 */ s16 field_0x1164;
/* 0x1166 */ u8 field_0x1166[10];
/* 0x1170 */ s16 field_0x1170;
/* 0x1172 */ s16 field_0x1172;
/* 0x1174 */ s16 field_0x1174;
/* 0x1176 */ u8 field_0x1176[10];
/* 0x1180 */ s16 field_0x1180;
/* 0x1182 */ s16 field_0x1182;
/* 0x1184 */ s16 field_0x1184;
/* 0x1186 */ u8 field_0x1186[10];
/* 0x1190 */ s16 field_0x1190;
/* 0x1192 */ s16 field_0x1192;
/* 0x1194 */ s16 field_0x1194;
/* 0x1196 */ u8 field_0x1196[10];
/* 0x11A0 */ s16 field_0x11a0;
/* 0x11A2 */ s16 field_0x11a2;
/* 0x11A4 */ s16 field_0x11a4;
/* 0x11A6 */ u8 field_0x11a6[10];
/* 0x11B0 */ s16 field_0x11b0;
/* 0x11B2 */ s16 field_0x11b2;
/* 0x11B4 */ s16 field_0x11b4;
/* 0x11B6 */ s16 field_0x11b6;
/* 0x11B8 */ s16 field_0x11b8;
/* 0x11BA */ s16 field_0x11ba;
/* 0x11BC */ s16 field_0x11bc;
/* 0x11BE */ u8 field_0x11be[2];
/* 0x11C0 */ s16 field_0x11c0;
/* 0x11C2 */ s16 field_0x11c2;
/* 0x11C4 */ s16 field_0x11c4;
/* 0x1158 */ GXColorS10 mFogColor;
/* 0x1160 */ GXColorS10 mActorAddColAmb;
/* 0x1168 */ u8 field_0x1168[8];
/* 0x1170 */ GXColorS10 mBgAddColAmb;
/* 0x1178 */ u8 field_0x1178[8];
/* 0x1180 */ GXColorS10 mBg1AddColAmb;
/* 0x1188 */ u8 field_0x1188[8];
/* 0x1190 */ GXColorS10 mBg2AddColAmb;
/* 0x1198 */ u8 field_0x1198[8];
/* 0x11A0 */ GXColorS10 mBg3AddColAmb;
/* 0x11A8 */ u8 field_0x11a8[8];
/* 0x11B0 */ GXColorS10 mFogAddCol;
/* 0x11B8 */ GXColorS10 mVrboxAddcolSky0;
/* 0x11C0 */ GXColorS10 mVrboxAddcolKasumi;
/* 0x11C8 */ f32 field_0x11c8;
/* 0x11CC */ f32 field_0x11cc;
/* 0x11D0 */ f32 field_0x11d0;
/* 0x11D4 */ f32 field_0x11d4;
/* 0x11D8 */ f32 field_0x11d8;
/* 0x11DC */ f32 field_0x11dc;
/* 0x11E0 */ f32 field_0x11e0;
/* 0x11D4 */ f32 mDiceWeatherChangeTime;
/* 0x11D8 */ f32 mDiceWeatherTime;
/* 0x11DC */ f32 mColPatBlend;
/* 0x11E0 */ f32 mColPatBlendGather;
/* 0x11E4 */ f32 mFogNear;
/* 0x11E8 */ f32 mFogFar;
/* 0x11EC */ f32 field_0x11ec;
/* 0x11F0 */ f32 field_0x11f0;
/* 0x11F4 */ f32 field_0x11f4;
/* 0x11F8 */ f32 field_0x11f8;
/* 0x11FC */ f32 field_0x11fc;
/* 0x1200 */ f32 field_0x1200;
/* 0x1204 */ f32 field_0x1204;
/* 0x1208 */ f32 field_0x1208;
/* 0x120C */ f32 field_0x120c;
/* 0x11F8 */ f32 mColAllcolRatio;
/* 0x11FC */ f32 mColActColRatio;
/* 0x1200 */ f32 mColBgColRatio;
/* 0x1204 */ f32 mColFogColRatio;
/* 0x1208 */ f32 mColVrboxSoraColRatio;
/* 0x120C */ f32 mColVrboxKumocolRatio;
/* 0x1210 */ f32 field_0x1210;
/* 0x1214 */ f32 mAllcolRatio;
/* 0x1218 */ f32 mActcolRatio;
@@ -428,59 +468,59 @@ public:
/* 0x127C */ f32 field_0x127c;
/* 0x1280 */ int field_0x1280;
/* 0x1284 */ u8 field_0x1284[4];
/* 0x1288 */ int field_0x1288;
/* 0x1288 */ u32 mMoyaSE;
/* 0x128C */ u8 field_0x128c[12];
/* 0x1298 */ int field_0x1298;
/* 0x129C */ int field_0x129c;
/* 0x1298 */ int mDiceWeatherCounter;
/* 0x129C */ int mRainCountOrig;
/* 0x12A0 */ int field_0x12a0;
/* 0x12A4 */ int field_0x12a4;
/* 0x12A8 */ int field_0x12a8;
/* 0x12A4 */ int mPlayerPLightIdx;
/* 0x12A8 */ int mPlayerEfLightIdx;
/* 0x12AC */ u8 field_0x12ac[4];
/* 0x12B0 */ int field_0x12b0;
/* 0x12B4 */ int field_0x12b4;
/* 0x12B4 */ int mSchbitTimer;
/* 0x12B8 */ u8 field_0x12b8[4];
/* 0x12BC */ u16 field_0x12bc;
/* 0x12BC */ u16 mFogAdjCenter;
/* 0x12BE */ u16 mDate;
/* 0x12C0 */ u16 mActorLightEffect;
/* 0x12C2 */ u8 field_0x12c2;
/* 0x12C3 */ u8 field_0x12c3;
/* 0x12C4 */ u8 field_0x12c4;
/* 0x12C5 */ u8 mWeatherPalette;
/* 0x12C2 */ u8 mColPatPrev;
/* 0x12C3 */ u8 mColPatCurr;
/* 0x12C4 */ u8 mColpatPrevGather;
/* 0x12C5 */ u8 mColpatCurrGather;
/* 0x12C6 */ s8 mNowRoom;
/* 0x12C7 */ u8 field_0x12c7;
/* 0x12C8 */ u8 field_0x12c8;
/* 0x12C9 */ u8 field_0x12c9;
/* 0x12CA */ u8 field_0x12ca;
/* 0x12CB */ u8 field_0x12cb;
/* 0x12C7 */ u8 mEnvrIdxCurr;
/* 0x12C8 */ u8 mColpatWeather;
/* 0x12C9 */ u8 mDiceWeatherMode;
/* 0x12CA */ u8 mDiceWeatherState;
/* 0x12CB */ u8 mDiceWeatherCurrPattern;
/* 0x12CC */ u8 field_0x12cc;
/* 0x12CD */ u8 field_0x12cd;
/* 0x12CE */ u8 field_0x12ce;
/* 0x12CF */ u8 field_0x12cf;
/* 0x12D0 */ u8 field_0x12d0;
/* 0x12CD */ u8 mColPatMode;
/* 0x12CE */ u8 mColPatModeGather;
/* 0x12CF */ u8 mFogAdjEnable;
/* 0x12D0 */ u8 mFogAdjTableType;
/* 0x12D1 */ u8 mItemGetCol_chg;
/* 0x12D2 */ u8 field_0x12d2;
/* 0x12D3 */ u8 field_0x12d3;
/* 0x12D4 */ bool field_0x12d4; // related to vrbox color
/* 0x12D5 */ u8 field_0x12d5;
/* 0x12D2 */ u8 mInitAnmTimer;
/* 0x12D3 */ u8 mSchBit;
/* 0x12D4 */ bool mVrboxInvisible;
/* 0x12D5 */ u8 mContrastFlag;
/* 0x12D6 */ u8 field_0x12d6;
/* 0x12D7 */ u8 mShadowMode;
/* 0x12D8 */ u8 mCameraInWater;
/* 0x12DC */ void* mResPolEfftbl;
/* 0x12E0 */ void* mResPolEffcol;
/* 0x12E4 */ void* mResPolEfftbl2;
/* 0x12E8 */ void* mResPolEffcol2;
/* 0x12EC */ void* mResPolSound;
/* 0x12F0 */ void* mResPolArg;
/* 0x12F4 */ void* mResColorDataTbl;
/* 0x12DC */ dKy_pol_efftbl_struct* mResPolEfftbl;
/* 0x12E0 */ dKy_pol_effcol_struct* mResPolEffcol;
/* 0x12E4 */ dKy_pol_efftbl_struct* mResPolEfftbl2;
/* 0x12E8 */ dKy_pol_effcol_struct* mResPolEffcol2;
/* 0x12EC */ dKy_pol_sound_struct* mResPolSound;
/* 0x12F0 */ dKy_pol_arg_struct* mResPolArg;
/* 0x12F4 */ dKy_color_data_struct* mResColorDataTbl;
/* 0x12F8 */ s8 mFogDensity;
/* 0x12F9 */ u8 field_0x12f9;
/* 0x12FA */ u8 field_0x12fa;
/* 0x12FB */ u8 field_0x12fb;
/* 0x12FC */ u8 field_0x12fc;
/* 0x12FC */ s8 field_0x12fc;
/* 0x12FD */ u8 mDarktimeWeek;
/* 0x12FE */ u8 field_0x12fe;
/* 0x1300 */ u16 field_0x1300;
/* 0x1302 */ u16 field_0x1302;
/* 0x1300 */ s16 field_0x1300;
/* 0x1302 */ s16 field_0x1302;
/* 0x1304 */ f32 mWaterSurfaceShineRate;
/* 0x1308 */ u8 field_0x1308;
/* 0x1309 */ u8 field_0x1309;
include/d/kankyo/d_kankyo_wether.h
+79 -46
View File
@@ -19,13 +19,15 @@ static void dKyw_wind_init();
static void dKyw_pntwind_init();
f32 dKyw_get_wind_pow();
static void squal_proc();
void dKyw_rain_set(int count);
void dKyw_wind_set();
class dKankyo_sun_Packet : public J3DPacket {
public:
virtual void draw();
virtual ~dKankyo_sun_Packet();
/* 0x10 */ cXyz field_0x10[2];
/* 0x10 */ cXyz mPos[2];
/* 0x28 */ u8 field_0x28;
/* 0x29 */ u8 field_0x29;
/* 0x2C */ u8* mpResMoon;
@@ -54,29 +56,35 @@ public:
virtual void draw();
virtual ~dKankyo_sunlenz_Packet();
/* 0x10 */ GXColor field_0x10;
/* 0x10 */ GXColor mColor;
/* 0x14 */ u8* mpResBall;
/* 0x18 */ u8 field_0x18[4];
/* 0x1C */ u8* mpResRing_A;
/* 0x20 */ u8* mpResLenz;
/* 0x24 */ cXyz field_0x24[8];
/* 0x24 */ cXyz mPositions[8];
/* 0x84 */ u8 field_0x84[8];
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ u8 field_0x94[4];
/* 0x98 */ f32 field_0x98;
/* 0x9C */ u8 field_0x9c[2];
/* 0x9E */ u8 field_0x9e;
/* 0x9E */ bool mDrawLenzInSky;
}; // Size: 0xA0
struct RAIN_EFF {
/* 80056CD0 */ ~RAIN_EFF();
/* 80056D0C */ RAIN_EFF();
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ u8 field_0x1c[0x1c];
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 mAlpha;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ s16 mTimer;
}; // Size: 0x38
class dKankyo_rain_Packet : public J3DPacket {
@@ -85,20 +93,39 @@ public:
virtual ~dKankyo_rain_Packet();
private:
/* 0x0010 */ u8* field_0x10;
/* 0x0014 */ u8 field_0x14[4];
/* 0x0018 */ RAIN_EFF field_0x18[250];
/* 0x36C8 */ u8 field_0x36c8[0x50];
/* 0x0010 */ u8* mpTex;
/* 0x0014 */ u8* mpTex2;
/* 0x0018 */ RAIN_EFF mRainEff[250];
/* 0x36C8 */ f32 field_0x36c8;
/* 0x36CC */ f32 field_0x36cc;
/* 0x36D0 */ s16 mRainCount;
/* 0x36D2 */ u8 field_0x36D2[6];
/* 0x36D8 */ cXyz mCamEyePos;
/* 0x36E4 */ cXyz mCamCenterPos;
/* 0x36F0 */ cXyz mCenterDelta;
/* 0x36FC */ f32 mCenterDeltaMul;
/* 0x3700 */ f32 field_0x3700;
/* 0x3704 */ f32 mSibukiAlpha;
/* 0x3708 */ f32 mOverheadFade;
/* 0x370C */ f32 mFwdFade1;
/* 0x3710 */ f32 mFwdFade2;
/* 0x3714 */ u8 mStatus;
}; // Size: 0x3718
struct SNOW_EFF {
/* 80056D58 */ ~SNOW_EFF();
/* 80056D94 */ SNOW_EFF();
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ u8 field_0x1c[0x1c];
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ f32 mPosWaveX;
/* 0x20 */ f32 mPosWaveZ;
/* 0x24 */ f32 mGravity;
/* 0x28 */ f32 mWindSpeed;
/* 0x2C */ f32 mScale;
/* 0x30 */ u8 field_0x30[4];
/* 0x34 */ s16 mTimer;
}; // Size: 0x38
class dKankyo_snow_Packet : public J3DPacket {
@@ -107,8 +134,8 @@ public:
virtual ~dKankyo_snow_Packet();
private:
/* 0x10 */ u8* field_0x10;
/* 0x14 */ SNOW_EFF field_0x14[500];
/* 0x10 */ u8* mpTex;
/* 0x14 */ SNOW_EFF mSnowEff[500];
};
struct STAR_EFF {
@@ -135,11 +162,14 @@ struct HOUSI_EFF {
/* 80056EA8 */ ~HOUSI_EFF();
/* 80056EE4 */ HOUSI_EFF();
/* 0x00 */ u8 field_0x0;
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cXyz field_0x1c;
/* 0x28 */ u8 field_0x28[0x28];
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ cXyz mSpeed;
/* 0x28 */ cXyz mScale;
/* 0x34 */ u8 field_0x34[0x40 - 0x34];
/* 0x40 */ f32 mAlpha;
/* 0x44 */ u8 field_0x44[0x50 - 0x44];
}; // Size: 0x50
class dKankyo_housi_Packet : public J3DPacket {
@@ -149,7 +179,7 @@ public:
/* 0x0010 */ cXyz field_0x10;
/* 0x001C */ u8* mpResTex;
/* 0x0020 */ HOUSI_EFF field_0x18[300];
/* 0x0020 */ HOUSI_EFF mHousiEff[300];
/* 0x5DE0 */ u8 field_0x5de0[8];
/* 0x5DE8 */ f32 field_0x5de8;
/* 0x5DEC */ u8 field_0x5dec[4];
@@ -159,10 +189,10 @@ struct CLOUD_EFF {
/* 80056E38 */ ~CLOUD_EFF();
/* 80056E74 */ CLOUD_EFF();
/* 0x00 */ u8 field_0x0;
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cXyz field_0x1c;
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ cXyz mPntWindSpeed;
/* 0x28 */ u8 field_0x28[0x10];
}; // Size: 0x38
@@ -172,18 +202,21 @@ public:
virtual ~dKankyo_cloud_Packet();
/* 0x10 */ u8* mpResTex;
/* 0x14 */ int field_0x14;
/* 0x18 */ CLOUD_EFF field_0x18[50];
/* 0x14 */ int mCount;
/* 0x18 */ CLOUD_EFF mCloudEff[50];
}; // Size: 0xB08
struct VRKUMO_EFF {
/* 80056F18 */ ~VRKUMO_EFF();
/* 80056F54 */ VRKUMO_EFF();
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ u8 field_0x1c[0x10];
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ f32 mHeight;
/* 0x20 */ f32 mAlpha;
/* 0x24 */ f32 mDistFalloff;
/* 0x28 */ f32 mSpeed;
}; // Size: 0x2C
class dKankyo_vrkumo_Packet : public J3DPacket {
@@ -192,11 +225,11 @@ public:
virtual ~dKankyo_vrkumo_Packet();
private:
/* 0x0010 */ GXColor field_0x10;
/* 0x0010 */ GXColor mColor;
/* 0x0014 */ u8* mpResCloudtx_01;
/* 0x0018 */ u8* mpResCloudtx_02;
/* 0x001C */ u8* mpResCloudtx_03;
/* 0x0020 */ VRKUMO_EFF field_0x20[100];
/* 0x0020 */ VRKUMO_EFF mVrkumoEff[100];
/* 0x1150 */ f32 field_0x1150;
/* 0x1154 */ f32 field_0x1154;
}; // Size: 0x1158
@@ -208,9 +241,9 @@ struct EF_ODOUR_EFF {
/* 80056F8C */ ~EF_ODOUR_EFF();
/* 80056FC8 */ EF_ODOUR_EFF();
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ u8 field_0x1c[0x14];
}; // Size: 0x30
@@ -220,7 +253,7 @@ public:
virtual ~dKankyo_odour_Packet();
/* 0x00010 */ u8* mpResTex;
/* 0x00014 */ EF_ODOUR_EFF field_0x18[2000];
/* 0x00014 */ EF_ODOUR_EFF mOdourEff[2000];
/* 0x17714 */ u8 field_0x17714[0x14];
}; // Size: 0x17728
@@ -228,9 +261,9 @@ struct EF_MUD_EFF {
/* 80056FFC */ ~EF_MUD_EFF();
/* 80057038 */ EF_MUD_EFF();
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ cXyz field_0x1c;
/* 0x28 */ u8 field_0x28[0x20];
}; // Size: 0x48
@@ -250,9 +283,9 @@ struct EF_EVIL_EFF {
/* 8005706C */ ~EF_EVIL_EFF();
/* 800570A8 */ EF_EVIL_EFF();
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ csXyz field_0x1c;
/* 0x22 */ u8 field_0x22[0x22];
}; // Size: 0x44
include/d/menu/d_menu_save.h
+68 -53
View File
@@ -61,6 +61,17 @@ public:
class dMenu_save_c {
public:
enum {
TYPE_DEFAULT = 1,
TYPE_WHITE_EVENT = 3,
TYPE_BLACK_EVENT
};
enum {
CURSOR_NO,
CURSOR_YES,
};
enum {
/* 0x00 */ PROC_SAVE_QUESTION,
/* 0x01 */ PROC_SAVE_QUESTION2,
@@ -211,7 +222,7 @@ public:
/* 801F4724 */ void yesnoCancelAnmSet();
/* 801F47DC */ void saveYesNoCancelMove();
/* 801F485C */ void headerTxtSet(u16);
/* 801F4928 */ void headerTxtChangeAnm();
/* 801F4928 */ bool headerTxtChangeAnm();
/* 801F4A10 */ void errDispInitSet(int);
/* 801F4B84 */ void msgWindowInitOpen();
/* 801F4D10 */ void msgWindowOpen();
@@ -223,25 +234,25 @@ public:
/* 801F5190 */ bool errorTxtChangeAnm();
/* 801F5278 */ void saveSelectOpenInit();
/* 801F533C */ void selectDataBaseMoveAnmInitSet(int, int);
/* 801F53D4 */ void selectDataBaseMoveAnm();
/* 801F53D4 */ bool selectDataBaseMoveAnm();
/* 801F54C0 */ void saveSelectOpenAnmSet();
/* 801F5508 */ void selectDataMoveAnmInitSet(int, int);
/* 801F5600 */ void selectDataMoveAnm();
/* 801F5744 */ void yesnoMenuMoveAnmInitSet(int, int, u8);
/* 801F5600 */ bool selectDataMoveAnm();
/* 801F5744 */ void yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_2);
/* 801F58C8 */ bool yesnoMenuMoveAnm();
/* 801F5AE4 */ void yesnoSelectMoveAnm(u8);
/* 801F5AE4 */ bool yesnoSelectMoveAnm(u8);
/* 801F5D84 */ void yesnoCursorShow();
/* 801F5EF4 */ void errorMoveAnmInitSet(int, int);
/* 801F5F84 */ void errorMoveAnm();
/* 801F5F84 */ bool errorMoveAnm();
/* 801F60A4 */ void modoruTxtDispAnmInit(u8);
/* 801F6120 */ void modoruTxtDispAnm();
/* 801F6120 */ bool modoruTxtDispAnm();
/* 801F61FC */ void ketteiTxtDispAnmInit(u8);
/* 801F6278 */ bool ketteiTxtDispAnm();
/* 801F6354 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801F6390 */ void selectWakuAlpahAnm(u8);
/* 801F6390 */ bool selectWakuAlpahAnm(u8);
/* 801F6458 */ void selFileCursorShow();
/* 801F6608 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801F6654 */ void yesnoWakuAlpahAnm(u8);
/* 801F6654 */ bool yesnoWakuAlpahAnm(u8);
/* 801F67B8 */ void dataSave();
/* 801F67F0 */ void setSaveData();
/* 801F6954 */ void setInitSaveData();
@@ -258,7 +269,7 @@ private:
/* 0x0008 */ mDoDvdThd_mountArchive_c* mpMount;
/* 0x000C */ STControl* stick;
/* 0x0010 */ dDlst_MenuSaveExplain_c mMenuSaveExplain;
/* 0x0018 */ dDlst_MenuSave_c mMenuSave;
/* 0x0018 */ dDlst_MenuSave_c mSaveSel;
/* 0x002C */ dSelect_cursor_c* mSelIcon;
/* 0x0030 */ dFile_warning_c* mWarning;
/* 0x0034 */ dFile_info_c* mFileInfo[3];
@@ -267,81 +278,85 @@ private:
/* 0x0048 */ J2DAnmTransformKey* field_0x48;
/* 0x004C */ J2DAnmTransformKey* field_0x4c;
/* 0x0050 */ s32 field_0x50;
/* 0x0054 */ u8 field_0x54;
/* 0x0058 */ CPaneMgr* field_0x58;
/* 0x005C */ int field_0x5c;
/* 0x0060 */ int field_0x60;
/* 0x0054 */ u8 mSelectedFile;
/* 0x0055 */ u8 mLastSelFile;
/* 0x0058 */ CPaneMgr* mpSelectMoveBase;
/* 0x005C */ int mDataBaseMoveAnmFrame;
/* 0x0060 */ int mDataBaseMoveFrameMax;
/* 0x0064 */ u8 field_0x64;
/* 0x0065 */ u8 field_0x65;
/* 0x0068 */ CPaneMgr* field_0x68[3];
/* 0x0074 */ u8 field_0x74[0x10];
/* 0x0084 */ CPaneMgr* field_0x84[2];
/* 0x008C */ u8 field_0x8c[0x10];
/* 0x0068 */ CPaneMgr* mpSelData[3];
/* 0x0074 */ int field_0x74[3];
/* 0x0080 */ int field_0x80;
/* 0x0084 */ CPaneMgr* mpNoYes[2];
/* 0x008C */ int field_0x8c[2];
/* 0x0094 */ int mYesNoMoveAnmFrame;
/* 0x0098 */ int mYesNoMoveAnmMax;
/* 0x009C */ u8 field_0x9c;
/* 0x009D */ u8 field_0x9d;
/* 0x009E */ u8 field_0x9e;
/* 0x00A0 */ int field_0xa0;
/* 0x00A0 */ J2DPane* field_0xa0;
/* 0x00A4 */ u8 field_0xa4[0x10];
/* 0x00B4 */ J2DPane* field_0xb4;
/* 0x00B8 */ int field_0xb8;
/* 0x00BC */ int field_0xbc;
/* 0x00C0 */ CPaneMgr* field_0xc0[2];
/* 0x00C8 */ char* field_0xc8[2];
/* 0x00D0 */ u8 field_0xd0;
/* 0x00D1 */ u8 field_0xd1;
/* 0x00C0 */ CPaneMgrAlpha* mpErrTxtPane[2];
/* 0x00C8 */ char* mpErrTxt[2];
/* 0x00D0 */ u8 mErrTxtType;
/* 0x00D1 */ u8 mErrTxtAnmComplete;
/* 0x00D2 */ u8 field_0xd2;
/* 0x00D3 */ u8 field_0xd3;
/* 0x00D4 */ CPaneMgr* field_0xd4[3];
/* 0x00E0 */ CPaneMgr* field_0xe0[3];
/* 0x00EC */ CPaneMgr* field_0xec[3];
/* 0x00F8 */ CPaneMgr* field_0xf8[3];
/* 0x00D4 */ CPaneMgr* mpSelWakuMoyo[3];
/* 0x00E0 */ CPaneMgr* mpSelWakuGold[3];
/* 0x00EC */ CPaneMgr* mpSelWakuGold2[3];
/* 0x00F8 */ CPaneMgr* mpBookWaku[3];
/* 0x0104 */ u8 field_0x104[3];
/* 0x0107 */ u8 field_0x107[3];
/* 0x010A */ u8 field_0x10a[3];
/* 0x010D */ u8 field_0x10d[11];
/* 0x0118 */ CPaneMgr* field_0x118[2];
/* 0x0120 */ CPaneMgr* field_0x120[2];
/* 0x0128 */ CPaneMgr* field_0x128[2];
/* 0x0130 */ u8 field_0x130[2];
/* 0x0132 */ u8 field_0x132[2];
/* 0x0134 */ u8 field_0x134[2];
/* 0x0138 */ CPaneMgr* field_0x138[2];
/* 0x0140 */ J2DAnmColorKey* field_0x140;
/* 0x0144 */ int field_0x144;
/* 0x0148 */ J2DAnmTextureSRTKey* field_0x148;
/* 0x014C */ int field_0x14c;
/* 0x0118 */ CPaneMgr* mNoYesBase[2];
/* 0x0120 */ CPaneMgr* mNoYesGold[2];
/* 0x0128 */ CPaneMgr* mNoYesGold2[2];
/* 0x0130 */ u8 mNoYesWakuStartAlpha[2];
/* 0x0132 */ u8 mNoYesWakuEndAlpha[2];
/* 0x0134 */ u8 mNoYesWakuAnmTimer[2];
/* 0x0138 */ CPaneMgr* mpNoYesTxt[2];
/* 0x0140 */ J2DAnmColorKey* mpFileWakuAnm;
/* 0x0144 */ int mFileWakuAnmFrame;
/* 0x0148 */ J2DAnmTextureSRTKey* mpFileWakuRotAnm;
/* 0x014C */ int mFileWakuRotAnmFrame;
/* 0x0150 */ J2DAnmColorKey* field_0x150;
/* 0x0154 */ int field_0x154;
/* 0x0158 */ J2DAnmTextureSRTKey* field_0x158;
/* 0x015C */ int field_0x15c;
/* 0x0160 */ J2DAnmTevRegKey* field_0x160;
/* 0x0164 */ int field_0x164;
/* 0x0168 */ CPaneMgr* field_0x168[2];
/* 0x0170 */ char* field_0x170[2];
/* 0x0178 */ u8 field_0x178;
/* 0x0179 */ u8 field_0x179;
/* 0x0168 */ CPaneMgrAlpha* mpHeaderTxtPane[2];
/* 0x0170 */ char* mpHeaderTxt[2];
/* 0x0178 */ u8 mHeaderTxtType; // 0: Select Menu 1: YesNo Menu
/* 0x0179 */ u8 mHeaderAnmComplete;
/* 0x017A */ u8 field_0x17a;
/* 0x017B */ u8 field_0x17b;
/* 0x017C */ CPaneMgr* field_0x17c[3];
/* 0x0188 */ CPaneMgr* field_0x188[3];
/* 0x0194 */ CPaneMgr* field_0x194;
/* 0x0198 */ CPaneMgr* field_0x198;
/* 0x017C */ CPaneMgrAlpha* mpDataBase[3];
/* 0x0188 */ CPaneMgrAlpha* mpNoDataBase[3];
/* 0x0194 */ CPaneMgrAlpha* mpBBtnIcon;
/* 0x0198 */ CPaneMgrAlpha* mpABtnIcon;
/* 0x019C */ u8 field_0x19c;
/* 0x019D */ u8 field_0x19d;
/* 0x01A0 */ CPaneMgr* field_0x1a0;
/* 0x01A4 */ CPaneMgr* field_0x1a4;
/* 0x01A0 */ CPaneMgrAlpha* mpBackTxt;
/* 0x01A4 */ CPaneMgrAlpha* mpConfirmTxt;
/* 0x01A8 */ u8 field_0x1a8;
/* 0x01A9 */ u8 field_0x1a9;
/* 0x01AA */ u8 field_0x1aa[3];
/* 0x01AD */ u8 field_0x1ad[3];
/* 0x01B0 */ u8 field_0x1b0;
/* 0x01B0 */ u8 mDisplayMenu;
/* 0x01B1 */ u8 field_0x1b1;
/* 0x01B2 */ u8 mMenuProc;
/* 0x01B3 */ u8 field_0x1b3;
/* 0x01B4 */ u8 field_0x1b4;
/* 0x01B5 */ u8 field_0x1b5;
/* 0x01B6 */ u8 field_0x1b6;
/* 0x01B7 */ u8 field_0x1b7;
/* 0x01B5 */ u8 mErrProc;
/* 0x01B6 */ u8 mYesNoCursor;
/* 0x01B7 */ u8 mYesNoPrevCursor;
/* 0x01B8 */ u8 field_0x1b8;
/* 0x01B9 */ u8 field_0x1b9;
/* 0x01BA */ u8 mSaveStatus;
@@ -351,7 +366,7 @@ private:
/* 0x01BE */ u8 field_0x1be;
/* 0x01BF */ u8 field_0x1bf;
/* 0x01C0 */ u8 field_0x1c0;
/* 0x01CC */ void (dMenu_save_c::*field_0x1cc)();
/* 0x01CC */ void (dMenu_save_c::*mpErrFunc)();
/* 0x01D0 */ u8 mSaveBuffer[0xA94 * 3];
/* 0x218C */ dMsgScrnExplain_c* mpScrnExplain;
/* 0x2190 */ u8 field_0x2190;
include/d/meter/d_meter2_info.h
+4
View File
@@ -459,6 +459,10 @@ inline u8 dMeter2Info_getMiniGameItemSetFlag() {
return g_meter2_info.getMiniGameItemSetFlag();
}
inline void dMeter2Info_setMiniGameItem(u8 item) {
g_meter2_info.setMiniGameItem(item);
}
inline void dMeter2Info_resetMiniGameItem(bool param_0) {
g_meter2_info.resetMiniGameItem(param_0);
}
include/d/msg/d_msg_string.h
+1 -2
View File
@@ -4,9 +4,8 @@
#include "d/msg/d_msg_string_base.h"
#include "d/msg/d_msg_out_font.h"
class dMsgString_c {
class dMsgString_c : public dMsgStringBase_c {
public:
/* 80249C20 */ dMsgString_c();
/* 80249CA0 */ dMsgString_c(u8);
/* 80249D28 */ ~dMsgString_c();
include/d/pane/d_pane_class.h
+7 -4
View File
@@ -25,11 +25,11 @@ public:
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254638 */ void paneScale(f32, f32);
/* 802547CC */ bool scaleAnime(s16, f32, f32, u8);
/* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor,
/* 802548BC */ bool colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor,
JUtility::TColor, u8);
/* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16);
/* 80254C90 */ Vec getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16);
/* 80254EBC */ Vec getGlobalVtxCenter(J2DPane*, bool, s16);
/* 80254FB8 */ void getBounds(J2DPane*);
/* 80254FB8 */ JGeometry::TBox2<f32>* getBounds(J2DPane*);
Vec getGlobalVtxCenter(bool param_0, s16 param_1) {
return getGlobalVtxCenter(getPanePtr(), param_0, param_1);
@@ -39,6 +39,7 @@ public:
void scale(f32 h, f32 v) { getPanePtr()->scale(h, v); }
void scaleAnimeStart(s16 v) { mScaleAnime = v; }
void colorAnimeStart(s16 start) { mColorAnime = start; }
f32 getPosX() { return getPanePtr()->getBounds().i.x; }
f32 getPosY() { return getPanePtr()->getBounds().i.y; }
@@ -58,9 +59,11 @@ public:
f32 getInitPosX() { return mInitPos.x; }
f32 getInitPosY() { return mInitPos.y; }
JUtility::TColor getInitBlack() { return mInitBlack; }
private:
/* 0x1C */ void* mpFirstStackSize;
/* 0x20 */ void* field_0x20;
/* 0x20 */ s16* field_0x20;
/* 0x24 */ JGeometry::TVec2<f32> mInitPos;
/* 0x2C */ JGeometry::TVec2<f32> mGlobalPos;
/* 0x34 */ JGeometry::TVec2<f32> mInitSize;
include/d/pane/d_pane_class_alpha.h
+24 -16
View File
@@ -6,16 +6,6 @@
#include "JSystem/JKernel/JKRExpHeap.h"
#include "dolphin/types.h"
struct CPaneMgrAlphaMorf {
/* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80255CAC */ ~CPaneMgrAlphaMorf();
/* 80255D48 */ void initiateAlphaMorf();
/* 80255DD0 */ void setBackupAlpha();
/* 80255E28 */ void setAlphaMorfRate(f32);
/* 80255E98 */ void childPaneBackupAlpha(J2DPane*);
/* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32);
};
class CPaneMgrAlpha {
public:
/* 8025546C */ virtual ~CPaneMgrAlpha();
@@ -26,29 +16,47 @@ public:
/* 802554E0 */ void initiateAlpha(J2DPane*, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 8025564C */ bool isVisible();
/* 80255658 */ f32 rateCalc(s16, s16, u8);
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ f32 getAlphaRate();
/* 80255878 */ void alphaAnime(s16, u8, u8, u8);
/* 80255964 */ void alphaAnimeLoop(s16, u8, u8, u8);
/* 80255878 */ bool alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcType);
/* 80255964 */ bool alphaAnimeLoop(s16, u8, u8, u8);
/* 80255A60 */ void childPaneCount(J2DPane*);
/* 80255ACC */ void childPaneGetAlpha(J2DPane*);
/* 80255B5C */ void childPaneSetAlpha(J2DPane*, u8);
J2DPane* getPanePtr() { return (J2DPane*)mWindow; }
J2DPane* getPanePtr() { return mPane; }
u8 getAlpha() { return getPanePtr()->getAlpha(); }
s16 getAlphaTimer() { return mAlphaTimer; }
void alphaAnimeStart(s16 start) { mAlphaTimer = start; }
/* 0x04 */ J2DWindow* mWindow;
/* 0x04 */ J2DPane* mPane;
/* 0x08 */ JKRExpHeap* heap;
/* 0x0C */ void* mpFirstStackAlpha;
/* 0x10 */ void* field_0x10;
/* 0x10 */ u8* field_0x10;
/* 0x14 */ s16 mChildPaneCount;
/* 0x16 */ s16 mAlphaTimer;
/* 0x18 */ u8 mInitAlpha;
/* 0x19 */ u8 mFlags;
};
class CPaneMgrAlphaMorf : public CPaneMgrAlpha {
public:
/* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80255D48 */ void initiateAlphaMorf();
/* 80255DD0 */ void setBackupAlpha();
/* 80255E28 */ void setAlphaMorfRate(f32);
/* 80255E98 */ void childPaneBackupAlpha(J2DPane*);
/* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32);
/* 80255CAC */ virtual ~CPaneMgrAlphaMorf();
private:
/* 0x1C */ void* mpFirstSaveAlpha;
/* 0x20 */ u8* field_0x20;
/* 0x24 */ void* mpFirstGetAlpha;
/* 0x28 */ u8* field_0x28;
};
#endif /* D_PANE_D_PANE_CLASS_ALPHA_H */
include/d/s/d_s_play.h
+7 -4
View File
@@ -57,8 +57,8 @@ private:
/* 0x14 */ dScnPly_env_debugHIO_c mDebug;
};
extern s8 struct_80451124;
extern s8 data_80451125; // sPauseTimer
extern s8 pauseTimer__9dScnPly_c;
extern s8 nextPauseTimer__9dScnPly_c; // sPauseTimer
class dScnPly_c : public scene_class {
public:
@@ -66,8 +66,11 @@ public:
/* 80259AC4 */ bool resetGame();
/* 80259BFC */ void offReset();
static bool isPause() { return struct_80451124 == 0; }
static void setPauseTimer(s8 time) { data_80451125 = time; }
static bool isPause() { return pauseTimer == 0; }
static void setPauseTimer(s8 time) { nextPauseTimer = time; }
static s8 pauseTimer;
static s8 nextPauseTimer;
/* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand;
/* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0;
include/d/save/d_save.h
+2
View File
@@ -1085,9 +1085,11 @@ public:
void initDan(s8 i_stage) { mDan.init(i_stage); }
void resetDan() { mDan.reset(); }
u8 getDataNum() const { return mDataNum; }
void setDataNum(u8 num) { mDataNum = num; }
void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
void setNoFile(u8 file) { mNoFile = file; }
u8 getNewFile() const { return mNewFile; }
void setNewFile(u8 file) { mNewFile |= file; }
static const int MEMORY_SWITCH = 0x80;
static const int DAN_SWITCH = 0x40;