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

Align dKy_darkworld_check with debug return type

Browse Source
This commit is contained in:
hatal175
2025-08-29 03:06:41 +03:00
parent e09f037fa3
commit f0b9e5f8fb
5 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc.h
+2 -2
View File
@@ -502,7 +502,7 @@ public:
/* 0xA80 */ f32 mExpressionMorfFrame;
/* 0xA84 */ f32 mMorfFrames;
/* 0xA88 */ bool mCreating;
/* 0xA89 */ bool mTwilight;
/* 0xA89 */ u8 mTwilight;
/* 0xA8C */ dBgS_GndChk field_0xa8c;
/* 0xAE0 */ dBgS_LinChk mLinChk;
/* 0xB50 */ daNpcT_MotionSeqMngr_c mFaceMotionSeqMngr;
@@ -1053,7 +1053,7 @@ protected:
/* 0x9F1 */ u8 field_0x9f1;
/* 0x9F2 */ bool mHide;
/* 0x9F3 */ u8 field_0x9f3;
/* 0x9F4 */ bool mTwilight;
/* 0x9F4 */ u8 mTwilight;
/* 0x9F5 */ u8 field_0x9f5;
/* 0x9F6 */ u8 field_0x9f6;
/* 0x9F8 */ dMsgFlow_c mFlow;
include/d/actor/d_a_passer_mng.h
+19 -10
View File
@@ -26,34 +26,43 @@ public:
u8 getDetailLevel() { return subtype; }
u8 getPathID() { return fopAcM_GetParam(this); }
u8 getIntervalTime() { return fopAcM_GetParam(this) >> 24; }
int getStartTime() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
u8 getStartTime() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
u8 getEndTime() { return (fopAcM_GetParam(this) >> 16) & 0xff; }
u8 getMaxNum() { return shape_angle.x; }
u8 getGroupNo() { return (shape_angle.x >> 8) & 0xff; }
int getTimeHour() {
int hour;
if (dKy_darkworld_check()) {
return dKy_getDarktime_hour();
}
return dKy_getdaytime_hour();
hour = dKy_getDarktime_hour();
} else {
hour = dKy_getdaytime_hour();
}
return hour;
}
int getTimeMinute() {
int minute;
if (dKy_darkworld_check()) {
return dKy_getDarktime_minute();
}
return dKy_getdaytime_minute();
minute = dKy_getDarktime_minute();
} else {
minute = dKy_getdaytime_minute();
}
return minute;
}
int getTime() {
int getTime() {
return getTimeHour() * 60 + getTimeMinute();
}
int getDayOfWeek() {
int dayOfWeek;
if (dKy_darkworld_check()) {
return dKy_getDarktime_week();
dayOfWeek = dKy_getDarktime_week();
} else {
dayOfWeek = dKy_get_dayofweek();
}
return dKy_get_dayofweek();
return dayOfWeek;
}
int getChildNum() {
include/d/d_kankyo.h
+1 -1
View File
@@ -579,7 +579,7 @@ int dKy_WolfEyeLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXCo
BOOL dKy_TeachWind_existence_chk();
u8 dKy_darkworld_stage_check(char const* stageName, int roomNo);
BOOL dKy_withwarp_capture_check();
bool dKy_darkworld_check();
u8 dKy_darkworld_check();
void dKy_undwater_filter_draw();
BOOL dKy_camera_water_in_status_check();
int dKy_Outdoor_check();