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

match dEvDt_Next_Stage

Browse Source
This commit is contained in:
lepelog
2022-06-15 22:37:02 +02:00
parent 8945d46f09
commit faea874741
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_stage.h
+8 -5
View File
@@ -57,6 +57,10 @@ struct stage_scls_info_class {
/* 0xA */ u8 field_0xa;
/* 0xB */ u8 field_0xb;
/* 0xC */ s8 mWipe;
char* getStage() { return mStage; }
int getRoom() { return mRoom; }
}; // Size: 0xD
struct stage_scls_info_dummy_class {
@@ -889,8 +893,7 @@ inline s16 dStage_stagInfo_GetUpButton(stage_stag_info_class* p_info) {
inline u32 dStage_stagInfo_GetArg0(stage_stag_info_class* p_info) {
return (p_info->field_0x0c >> 0x14) & 0xFF;
}
inline int dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) {
inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) {
return p_info->field_0xb & 0xF;
}
@@ -898,12 +901,12 @@ inline s8 dStage_sclsInfo_getWipe(stage_scls_info_class* p_info) {
return p_info->mWipe;
}
inline u32 dStage_sclsInfo_getWipeTime(stage_scls_info_class* p_info) {
return (p_info->field_0xb & 0xF0) >> 5;
inline s32 dStage_sclsInfo_getWipeTime(stage_scls_info_class* p_info) {
return (p_info->field_0xb >> 5) & 7;
}
inline int dStage_sclsInfo_getTimeH(stage_scls_info_class* p_info) {
return ((p_info->field_0xa & 0xF0) >> 4) | (p_info->field_0xb & 0x10);
return (u8)((p_info->field_0xa >> 4) & 0xF) | (p_info->field_0xb & 0x10 & ~0xF);
}
inline u32 dStage_FileList_dt_getMiniMap(dStage_FileList_dt_c* p_fList) {