mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-04 11:19:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_kankyo debug work (#2918)

Browse Source 
* Global: Define DEBUG as 0 if not already defined

* Clean up DEBUG-guarded code

* d_kankyo debug almost matching
This commit is contained in:
Max Roncace
2025-12-06 16:39:30 -05:00
committed by GitHub
parent cf492884ea
commit 556f5bd786
7 changed files with 3635 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/ShieldD/symbols.txt
+1 -1
View File
@@ -64547,7 +64547,7 @@ dShopSystem_item_count = .sbss:0x8074C95C; // type:object size:0x4 scope:global
lbl_8074C960 = .sbss:0x8074C960; // type:object size:0x8 data:byte hash:0x0F86F830
dShopSystem_cameraActor = .sbss:0x8074C968; // type:object size:0x8 scope:global data:4byte hash:0x2A77C5ED
dShopSystem_camera_count = .sbss:0x8074C970; // type:object size:0x4 scope:global data:4byte hash:0xACB709DA
lbl_8074C978 = .sbss:0x8074C978; // type:object size:0x1 data:byte hash:0x98067E38 dhash:0x4ED1802D
@LOCAL@setDaytime__18dScnKy_env_light_cFv@data_8074c978 = .sbss:0x8074C978; // type:object size:0x1 data:byte hash:0x98067E38 dhash:0x4ED1802D
@LOCAL@setLight__18dScnKy_env_light_cFv@S_fuwan_sin = .sbss:0x8074C97A; // type:object size:0x2 scope:local data:2byte hash:0x51289156 dhash:0xA18EAC9A
lbl_8074C97C = .sbss:0x8074C97C; // type:object size:0x1 data:byte hash:0x1F86B096 dhash:0x69B2C747
lbl_8074C97D = .sbss:0x8074C97D; // type:object size:0x1 data:byte hash:0x3752C2F1 dhash:0x0B5EF1FA
include/JSystem/J3DGraphBase/J3DStruct.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
J3DLightObj() { mInfo = j3dDefaultLightInfo; }
void load(u32) const;
J3DLightInfo& getLightInfo() { return mInfo; }
J3DLightInfo* getLightInfo() { return &mInfo; }
J3DLightObj& operator=(J3DLightObj const& other) {
mInfo = other.mInfo;
return *this;
include/d/d_kankyo.h
+10 -16
View File
@@ -784,20 +784,14 @@ public:
/* 0x29C */ u8 field_0x29c;
/* 0x29D */ u8 field_0x29d;
/* 0x29E */ u8 field_0x29e;
/* 0x29F */ u8 field_0x29f;
/* 0x2A0 */ u8 field_0x2a0;
/* 0x2A1 */ u8 field_0x2a1;
/* 0x2A2 */ u8 field_0x2a2;
/* 0x2A3 */ u8 field_0x2a3;
/* 0x2A4 */ u8 field_0x2a4;
/* 0x2A5 */ u8 field_0x2a5;
/* 0x2A6 */ u8 field_0x2a6;
/* 0x2A7 */ u8 field_0x2a7;
/* 0x2A8 */ u8 field_0x2a8;
/* 0x2A9 */ u8 field_0x2a9;
/* 0x2AA */ u8 field_0x2aa;
/* 0x29F */ color_RGB_class unk_color_1;
/* 0x2A2 */ u8 unk_alpha_1;
/* 0x2A3 */ color_RGB_class unk_color_2;
/* 0x2A6 */ u8 unk_alpha_2;
/* 0x2A7 */ color_RGB_class unk_color_3;
/* 0x2AA */ u8 unk_alpha_3;
/* 0x2AB */ color_RGB_class camera_light_col;
/* 0x2AE */ u8 field_0x2ae;
/* 0x2AE */ u8 camera_light_alpha;
/* 0x2B0 */ f32 camera_light_y_shift;
/* 0x2B4 */ f32 camera_light_power;
/* 0x2B8 */ f32 camera_light_cutoff;
@@ -842,7 +836,7 @@ public:
/* 0x30E */ u8 twilight_sense_saturation_mode;
/* 0x30F */ u8 twilight_sense_pat;
/* 0x310 */ u8 twilight_sense_pat_tv_display_ON;
/* 0x311 */ u8 field_0x311;
/* 0x311 */ u8 use_debug;
/* 0x312 */ u8 field_0x312;
/* 0x313 */ u8 camera_light_adjust_ON;
/* 0x314 */ f32 field_0x314;
@@ -850,11 +844,11 @@ public:
/* 0x31C */ f32 influence_multiplier;
/* 0x320 */ f32 cutoff_multiplier;
/* 0x324 */ color_RGB_class possessed_zelda_light_col;
/* 0x327 */ u8 field_0x327;
/* 0x327 */ u8 possessed_zelda_light_alpha;
/* 0x328 */ f32 possessed_zelda_light_height;
/* 0x32C */ f32 possessed_zelda_light_power;
/* 0x330 */ color_RGB_class beast_ganon_light_col;
/* 0x333 */ u8 field_0x333;
/* 0x333 */ u8 beast_ganon_light_alpha;
/* 0x334 */ f32 beast_ganon_light_height;
/* 0x338 */ f32 beast_ganon_light_power;
/* 0x33C */ color_RGB_class water_in_light_col;
include/d/d_kankyo_static.h
+2 -2
View File
@@ -12,7 +12,7 @@
*/
static void dKankyo_DayProc() {
dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]);
dComIfGs_offTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[91]);
}
#endif /* D_KANKYO_STATIC_H */
#endif /* D_KANKYO_STATIC_H */
src/d/actor/d_grass.inc
+4 -4
View File
@@ -556,10 +556,10 @@ void dGrass_packet_c::draw() {
f32 sp58 = 1.0f - temp_f27;
temp_f27 += 0.5f * sp58;
J3DLightInfo& sp40 = sp44->mLights[0].getLightInfo();
sp98.r = sp40.mColor.r * temp_f27;
sp98.g = sp40.mColor.g * temp_f27;
sp98.b = sp40.mColor.b * temp_f27;
J3DLightInfo* sp40 = sp44->mLights[0].getLightInfo();
sp98.r = sp40->mColor.r * temp_f27;
sp98.g = sp40->mColor.g * temp_f27;
sp98.b = sp40->mColor.b * temp_f27;
sp98.a = var_f29;
if (memcmp(dComIfGp_getStartStageName(), "D_MN01", 6) == 0) {
src/d/d_event_manager.cpp
+5 -5
View File
@@ -329,12 +329,11 @@ int dEvent_manager_c::create() {
}
bool dEvent_manager_c::setObjectArchive(char* arcname) {
char* rt = NULL;
void* rt = NULL;
if (arcname != NULL) {
char* res = (char*)dComIfG_getObjectRes(arcname, DataFileName);
rt = res;
int base_status = mEventList[BASE_ACTOR].init(res, -1);
rt = dComIfG_getObjectRes(arcname, DataFileName);
int base_status = mEventList[BASE_ACTOR].init((char*)rt, -1);
#if DEBUG
if (base_status) {
@@ -1382,7 +1381,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) {
shutterActor = fopAcM_Search((fopAcIt_JudgeFunc)findShutterCallBack, &prms);
if (shutterActor != NULL && param_1) {
cXyz goal(shutterActor->home.pos);
s16 angle = prms.actor->home.angle.y + 0x8000;
s16 angle = prms.actor->home.angle.y;
angle = angle + 0x8000;
goal.x += cM_ssin(angle) * 100;
goal.z += cM_scos(angle) * 100;
src/d/d_kankyo.cpp
+3612 -464
View File
File diff suppressed because it is too large Load Diff