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

Debug JStudio fix + match one retail func (#2378)

Browse Source 
* Fix debug build

* Minor fixes

* Match daAlink_c::getDemoLookActor

* Fix JStudio paths in ShieldD splits

* Fix JStudio not compiling on debug

* Fix JStudio not compiling on retail, add fake header
This commit is contained in:
LagoLunatic
2025-04-06 20:57:52 -04:00
committed by GitHub
parent 98db9a297a
commit 4e30ad564a
12 changed files with 124 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_demo.inc
-1
View File
@@ -984,7 +984,6 @@ void daAlink_c::endDemoMode() {
}
/* 801180EC-80118170 112A2C 0084+00 2/2 0/0 0/0 .text getDemoLookActor__9daAlink_cFv */
// NONMATCHING - weird gameinfo load
fopAc_ac_c* daAlink_c::getDemoLookActor() {
if (mDemo.getParam0() == 1) {
return dComIfGp_event_getPt1();
src/d/actor/d_a_obj_lv8Lift.cpp
+3 -2
View File
@@ -45,14 +45,15 @@ f32 const daL8Lift_c::mSpeed[16] = {
/* 80C88860-80C88928 000220 00C8+00 1/0 0/0 0/0 .text CreateHeap__10daL8Lift_cFv */
int daL8Lift_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L8Lift", 5);
JUT_ASSERT(190, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
if (!mpModel) {
return 0;
}
mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("L8Lift", 8),
int res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("L8Lift", 8),
1, 0, 1.0f, 0, -1);
JUT_ASSERT("d_a_obj_lv8Lift.cpp", 0xcf, "res == 1");
JUT_ASSERT(207, res == 1);
return 1;
}
src/d/d_ev_camera.cpp
+2 -2
View File
@@ -991,7 +991,7 @@ bool dCamera_c::restorePosEvCamera() {
/* 80090174-80090230 08AAB4 00BC+00 0/0 1/0 0/0 .text talktoEvCamera__9dCamera_cFv */
bool dCamera_c::talktoEvCamera() {
dComIfGp_event_getPt1();
fopAc_ac_c* r27 = (fopAc_ac_c*)dComIfGp_event_getPt1();
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][3];
if (mCurCamStyleTimer == 0) {
@@ -1005,7 +1005,7 @@ bool dCamera_c::talktoEvCamera() {
#if DEBUG
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
u32 id = mCamParam.Id(style);
OS_REPORT("camera: event: %16s = %d (%c%c%c%c)\n", "style", style, (u8)(id >> 0x18), (u8)(id >> 0x10), (u8)(id >> 0x8), (u8)(id));
OS_REPORT("camera: event: %16s = %d (%c%c%c%c)\n", "style", style, (id >> 0x18) & 0xFF, (id >> 0x10) & 0xFF, (id >> 0x8) & 0xFF, (id) & 0xFF);
}
#endif