mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-23 21:46:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

couple more fixes, revert e_pm for now

Browse Source
This commit is contained in:
TakaRikka
2026-07-18 21:17:29 -07:00
parent d3e05a4f37
commit 9696c12563
3 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/include/JSystem/JUtility/JUTCacheFont.h
+1 -1
View File
@@ -64,7 +64,7 @@ public:
void setPagingType(EPagingType type) { mPagingType = type; }
static u32 calcCacheSize(u32 param_0, int param_1) { return (ALIGN_NEXT(param_0, 0x20) + 0x40) * param_1; }
static u32 calcCacheSize(u32 param_0, int param_1) { return (ALIGN_NEXT(param_0, 0x20) + sizeof(TCachePage)) * param_1; }
TGXTexObj* getTexObj(void* buffer) const { return &((TCachePage*)buffer)->mTexObj; }
void delete_and_initialize() { deleteMemBlocks_CacheFont(); initialize_state(); }
src/d/actor/d_a_e_pm.cpp
+55 -66
View File
@@ -116,7 +116,7 @@ enum Joint {
};
enum Mode {
#if TARGET_PC || VERSION == VERSION_GCN_JPN
#if VERSION == VERSION_GCN_JPN
/* 0x00 */ Mode0_JPN,
#endif
/* 0x00 */ Mode0,
@@ -471,31 +471,26 @@ void daE_PM_c::Ap_StartAction() {
bool bVar3 = false;
switch (mMode) {
#if TARGET_PC || VERSION == VERSION_GCN_JPN
#if VERSION == VERSION_GCN_JPN
case Mode0_JPN:
IF_DUSK_BLOCK(dusk::version::isRegionJpn())
if (mAppear) {
bVar3 = true;
mMode++;
} else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) {
bVar3 = true;
mMode++;
}
IF_DUSK_BLOCK_END
if (mAppear) {
bVar3 = true;
mMode++;
} else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) {
bVar3 = true;
mMode++;
}
break;
#endif
case Mode0:
IF_DUSK_BLOCK(dusk::version::isRegionJpn())
bVar3 = true;
IF_DUSK_BLOCK_END
IF_DUSK_BLOCK(!dusk::version::isRegionJpn())
if (mAppear) {
bVar3 = true;
} else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) {
bVar3 = true;
}
IF_DUSK_BLOCK_END
#else
case Mode0:
if (mAppear) {
bVar3 = true;
} else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) {
bVar3 = true;
}
#endif
if (bVar3 && CameraSet()) {
if (dComIfG_play_c::getLayerNo(0) == 2) {
player_pos.set(-10477.0f, mAcch.GetGroundH(), 17710.0f);
@@ -1279,14 +1274,11 @@ void daE_PM_c::DemoBossStart2() {
player = (daPy_py_c*)dComIfGp_getPlayer(0);
#if TARGET_PC
if (dusk::version::isRegionJpn() ? (mDemoMode > Mode0) : (mDemoMode != Mode0))
#elif VERSION == VERSION_GCN_JPN
if (mDemoMode > Mode0)
#if VERSION == VERSION_GCN_JPN
if (mDemoMode > Mode0) {
#else
if (mDemoMode != Mode0)
if (mDemoMode != Mode0) {
#endif
{
SetMoveCam(0.1f, 50.0f);
} else {
SetMoveCam(0.03f, 50.0f);
@@ -1295,33 +1287,31 @@ void daE_PM_c::DemoBossStart2() {
mTargetAngleY = s_TargetAngle;
switch (mDemoMode) {
#if TARGET_PC || VERSION == VERSION_GCN_JPN
#if VERSION == VERSION_GCN_JPN
case Mode0_JPN:
IF_DUSK_BLOCK(dusk::version::isRegionJpn())
if (!CameraSet()) {
break;
}
if (!CameraSet()) {
break;
}
mPuppetNum = 4;
gravity = -9.0f;
mTimer[0] = 130;
if (mSecondEncounter) {
mTimer[0] = 180;
vec1.set(current.pos.x, 1900.0f, current.pos.z);
SetStopCam(vec1, 500.0f, 0.0f, s_TargetAngle);
mCamEye.set(mCamEyeTarget);
actor_status &= ~fopAcStts_CULL_e;
}
if (mSecondEncounter) {
player->mDemo.setDemoType(daPy_demo_c::DEMO_TYPE_ORIGINAL_e);
player->mDemo.setParam0(0);
player->mDemo.setDemoMode(4);
player->mDemo.setParam0(0);
player->mDemo.setParam1(0);
player->mDemo.setParam2(0);
}
mDemoMode++;
IF_DUSK_BLOCK_END
mPuppetNum = 4;
gravity = -9.0f;
mTimer[0] = 130;
if (mSecondEncounter) {
mTimer[0] = 180;
vec1.set(current.pos.x, 1900.0f, current.pos.z);
SetStopCam(vec1, 500.0f, 0.0f, s_TargetAngle);
mCamEye.set(mCamEyeTarget);
actor_status &= ~fopAcStts_CULL_e;
}
if (mSecondEncounter) {
player->mDemo.setDemoType(daPy_demo_c::DEMO_TYPE_ORIGINAL_e);
player->mDemo.setParam0(0);
player->mDemo.setDemoMode(4);
player->mDemo.setParam0(0);
player->mDemo.setParam1(0);
player->mDemo.setParam2(0);
}
mDemoMode++;
break;
#endif
case Mode0:
@@ -1456,21 +1446,20 @@ void daE_PM_c::DemoBossStart() {
}
switch (mDemoMode) {
#if TARGET_PC || VERSION == VERSION_GCN_JPN
#if VERSION == VERSION_GCN_JPN
case Mode0_JPN:
IF_DUSK_BLOCK(dusk::version::isRegionJpn())
if (!CameraSet()) {
break;
}
if (!CameraSet()) {
break;
}
mPuppetNum = 4;
gravity = -9.0f;
mTimer[0] = 130;
vec1.set(current.pos.x, current.pos.y + 80.0f, current.pos.z);
mTargetAngleY = shape_angle.y;
SetStopCam(vec1, 500.0f, -150.0f, shape_angle.y);
mDemoMode++;
mPuppetNum = 4;
gravity = -9.0f;
mTimer[0] = 130;
vec1.set(current.pos.x, current.pos.y + 80.0f, current.pos.z);
mTargetAngleY = shape_angle.y;
SetStopCam(vec1, 500.0f, -150.0f, shape_angle.y);
mDemoMode++;
IF_DUSK_BLOCK_END
break;
#endif
case Mode0:
src/d/d_meter2_draw.cpp
+13
View File
@@ -62,10 +62,23 @@ void dAnchorHudScale(CPaneMgr* i_pane, HudCorner i_corner, f32* io_x, f32* io_y,
dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
#if TARGET_PC
// correct hio data here because we can't do runtime disc checks in sinit data constructors
if (dusk::version::isRegionJpn()) {
g_drawHIO.mButtonATextSpacing = -2.0f;
for (int i = 0; i < 6; i++) {
static f32 const finfoPosX_jpn[6] = {-27.0f, 0.0f, -12.0f, 0.0f, -12.0f, -32.8f};
static f32 const fishnPosX_jpn[6] = {-27.0f, 0.0f, -12.0f, 0.0f, -12.0f, -32.8f};
g_drawHIO.mFishListScreen.mFishCountSizePosX[i] = finfoPosX_jpn[i];
g_drawHIO.mFishListScreen.mFishInfoPosX[i] = fishnPosX_jpn[i];
}
} else {
g_drawHIO.mButtonATextSpacing = 1.0f;
for (int i = 0; i < 6; i++) {
static f32 const finfoPosX[6] = {-17.0f, 0.0f, -14.0f, 0.0f, -12.0f, -32.8f};
static f32 const fishnPosX[6] = {-17.0f, 0.0f, -14.0f, 0.0f, -12.0f, -32.8f};
g_drawHIO.mFishListScreen.mFishCountSizePosX[i] = finfoPosX[i];
g_drawHIO.mFishListScreen.mFishInfoPosX[i] = fishnPosX[i];
}
}
#endif