mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 10:45:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

stag inlines and cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-10-07 23:38:54 -04:00
parent 43d5aaa0e8
commit 40a4d0a1d9
8 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_agb.h
+2 -2
View File
@@ -142,8 +142,8 @@ public:
struct daAgb_Switch {
/* 0x0 */ u8 field_0x0;
/* 0x1 */ u8 field_0x1;
/* 0x1 */ u8 field_0x2;
/* 0x1 */ u8 stageNo;
/* 0x1 */ u8 roomNo;
/* 0x3 */ u8 field_0x3;
/* 0x4 */ u8 field_0x4;
u8 field_0x5[0x8 - 0x5];
include/d/actor/d_a_agbsw0.h
+1 -1
View File
@@ -9,7 +9,7 @@ class daAgb_c;
struct agb_mail_struct {
/* 0x00 */ u16 msgNo;
/* 0x02 */ u8 swToSet;
/* 0x03 */ u8 stageSaveTbl;
/* 0x03 */ u8 stageNo;
/* 0x04 */ u8 roomNo;
/* 0x05 */ u8 reactType;
/* 0x06 */ u8 swToCheck;
include/d/d_map.h
+2 -2
View File
@@ -220,9 +220,9 @@ public:
static void setMapChgSizeRealSize() {}
static void create();
static void isEnableEnlargementScroll();
static BOOL isEnableEnlargementScroll();
static bool isEnableDispMap();
static void getKindMapType();
static int getKindMapType();
static void remove();
static void setImage(int, int, f32);
static void deleteImage(int);
include/d/d_stage.h
+19 -5
View File
@@ -60,7 +60,7 @@ public:
struct stage_stag_info_class {
/* 0x00 */ f32 field_0x0;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ u8 mCameraType;
/* 0x08 */ u8 mDefaultCameraType;
/* 0x09 */ u8 field_0x09;
/* 0x0A */ u16 field_0x0a;
/* 0x0C */ u32 field_0x0c;
@@ -1007,6 +1007,15 @@ void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int i_roomNo);
dStage_objectNameInf* dStage_searchName(const char*);
const char* dStage_getName2(s16 i_procName, s8 i_subtype);
inline u8 dStage_stagInfo_DefaultCameraType(stage_stag_info_class* p_info) {
return p_info->mDefaultCameraType;
}
inline s32 dStage_stagInfo_ChkKeyDisp(stage_stag_info_class* i_stagInfo) {
return i_stagInfo->field_0x09 & 1;
}
inline s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* i_stagInfo) {
return (i_stagInfo->field_0x09 >> 1) & 0x7F;
}
@@ -1015,6 +1024,10 @@ inline u32 dStage_stagInfo_GetSTType(stage_stag_info_class* i_stagInfo) {
return (i_stagInfo->field_0x0c >> 16) & 7;
}
inline u8 dStage_stagInfo_GetUpButton(stage_stag_info_class* i_stagInfo) {
return i_stagInfo->field_0x0a & 3;
}
inline u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* i_stagInfo) {
return (i_stagInfo->field_0x0a >> 0x3) & 0xFF;
}
@@ -1023,19 +1036,20 @@ inline s8 dStage_stagInfo_GetTimeH(stage_stag_info_class* p_info) {
return (p_info->field_0x0c >> 8) & 0xFF;
}
inline u8 dStage_stagInfo_GetCullPoint(stage_stag_info_class* p_info) {
return p_info->field_0x10 & 0xFFFF;
}
inline u8 dStage_stagInfo_getStartSch(stage_stag_info_class* p_info) {
return (p_info->field_0x10 >> 0x10) & 0xFF;
}
inline u8 dStage_stagInfo_GetSchSec(stage_stag_info_class* p_info) {
return p_info->field_0x0c & 0xFF;
}
// TODO:
// dStage_stagInfo_GetAgbCon__FP21stage_stag_info_class
// dStage_stagInfo_DefaultCameraType__FP21stage_stag_info_class
// dStage_stagInfo_GetCullPoint__FP21stage_stag_info_class
// dStage_stagInfo_GetUpButton__FP21stage_stag_info_class
// dStage_stagInfo_ChkKeyDisp__FP21stage_stag_info_class
inline u8 dStage_roomRead_dt_c_GetLoadRoomIndex(u8 param_0) {
return param_0 & 0x3F;