mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix particle_set inlines (#971)

Browse Source
This commit is contained in:
LagoLunatic
2026-05-04 13:50:55 -04:00
committed by GitHub
parent 6bc01f1d02
commit def3445cc6
11 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+5 -5
View File
@@ -571,7 +571,7 @@ config.libs = [
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_agb.cpp"),
Object(Matching, "d/actor/d_a_arrow.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bg.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bomb.cpp"),
Object(Matching, "d/actor/d_a_bomb.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bomb2.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_boomerang.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_dai_item.cpp"),
@@ -646,7 +646,7 @@ config.libs = [
Object(NonMatching, "d/d_water_mark.cpp"),
Object(Matching, "d/d_wind_arrow.cpp"),
Object(NonMatching, "d/d_wpillar.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_wpot_water.cpp"),
Object(Matching, "d/d_wpot_water.cpp"),
],
},
{
@@ -1397,7 +1397,7 @@ config.libs = [
ActorRel(Matching, "d_a_demo_kmm"),
ActorRel(Matching, "d_a_door10"),
ActorRel(Matching, "d_a_dr"),
ActorRel(MatchingFor("D44J01"), "d_a_dr2"),
ActorRel(Matching, "d_a_dr2"),
ActorRel(Matching, "d_a_ep"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_floor"),
ActorRel(Matching, "d_a_grass"),
@@ -1604,7 +1604,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_icelift"),
ActorRel(NonMatching, "d_a_kb"),
ActorRel(NonMatching, "d_a_kddoor"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kita"),
ActorRel(Matching, "d_a_kita"),
ActorRel(NonMatching, "d_a_klft"),
ActorRel(Matching, "d_a_kmon"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_komore"),
@@ -1667,7 +1667,7 @@ config.libs = [
ActorRel(Matching, "d_a_npc_rsh1"),
ActorRel(NonMatching, "d_a_npc_sarace"),
ActorRel(NonMatching, "d_a_npc_sv"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_tc"),
ActorRel(Matching, "d_a_npc_tc"),
ActorRel(NonMatching, "d_a_npc_tt"),
ActorRel(NonMatching, "d_a_npc_uk"),
ActorRel(NonMatching, "d_a_npc_ym1"),
include/d/actor/d_a_npc_tc.h
+1 -1
View File
@@ -261,7 +261,7 @@ public:
/* 0x7EA */ u8 field_0x7EA[0x7F1 - 0x7EA];
/* 0x7F1 */ bool mHasTalkedNearJail;
/* 0x7F2 */ bool mHasEnteredSitRadius;
/* 0x7F3 */ s8 mJumpLandingTimer;
/* 0x7F3 */ char mJumpLandingTimer;
/* 0x7F4 */ u8 field_0x7F4[0x7F6 - 0x7F4];
/* 0x7F6 */ s8 mTexPatternNum;
/* 0x7F7 */ s8 mTexPatternNumIdx;
include/d/d_com_inf_game.h
+15 -39
View File
@@ -3856,9 +3856,7 @@ inline JPABaseEmitter* dComIfGp_particle_set(u16 particleID, const cXyz* pos,
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setNormal(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->setNormal(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setP1(u16 particleID, const cXyz* pos,
@@ -3867,9 +3865,7 @@ inline JPABaseEmitter* dComIfGp_particle_setP1(u16 particleID, const cXyz* pos,
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setNormalP1(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->setNormalP1(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setToon(u16 particleID, const cXyz* pos,
@@ -3878,9 +3874,7 @@ inline JPABaseEmitter* dComIfGp_particle_setToon(u16 particleID, const cXyz* pos
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setToon(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->setToon(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setToonP1(u16 particleID, const cXyz* pos,
@@ -3889,9 +3883,7 @@ inline JPABaseEmitter* dComIfGp_particle_setToonP1(u16 particleID, const cXyz* p
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setToonP1(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->setToonP1(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setProjection(u16 particleID, const cXyz* pos,
@@ -3900,9 +3892,7 @@ inline JPABaseEmitter* dComIfGp_particle_setProjection(u16 particleID, const cXy
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setProjection(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->setProjection(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setShipTail(u16 particleID, const cXyz* pos,
@@ -3911,9 +3901,7 @@ inline JPABaseEmitter* dComIfGp_particle_setShipTail(u16 particleID, const cXyz*
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setShipTail(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->setShipTail(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_set2Dfore(u16 particleID, const cXyz* pos,
@@ -3922,9 +3910,7 @@ inline JPABaseEmitter* dComIfGp_particle_set2Dfore(u16 particleID, const cXyz* p
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->set2Dfore(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->set2Dfore(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_set2Dback(u16 particleID, const cXyz* pos,
@@ -3933,9 +3919,7 @@ inline JPABaseEmitter* dComIfGp_particle_set2Dback(u16 particleID, const cXyz* p
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->set2Dback(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->set2Dback(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_set2DmenuFore(u16 particleID, const cXyz* pos,
@@ -3944,43 +3928,36 @@ inline JPABaseEmitter* dComIfGp_particle_set2DmenuFore(u16 particleID, const cXy
s8 setupInfo = -1, const GXColor* pPrmColor = NULL,
const GXColor* pEnvColor = NULL,
const cXyz* pScale2D = NULL) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->set2DmenuFore(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
return g_dComIfG_gameInfo.play.getParticle()->set2DmenuFore(particleID, pos, angle, scale, alpha, pCallBack, setupInfo, pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setSingleRipple(u16 particleID, const cXyz* pos,
const csXyz* angle = NULL,
const cXyz* scale = NULL,
u8 alpha = 0xFF) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setSingleRipple(particleID, pos, angle, scale, alpha);
return g_dComIfG_gameInfo.play.getParticle()->setSingleRipple(particleID, pos, angle, scale, alpha);
}
inline void dComIfGp_particle_setStripes(u16 particleID, const cXyz* pos, const csXyz* angle,
const cXyz* scale, u8 param_4, u16 param_5) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
pParticle->setNormalStripes(particleID, pos, angle, scale, param_4, param_5);
g_dComIfG_gameInfo.play.getParticle()->setNormalStripes(particleID, pos, angle, scale, param_4, param_5);
}
inline void dComIfGp_particle_setSimple(u16 particleID, cXyz* pos, u8 alpha = 0xFF,
GXColor& prmColor = g_whiteColor,
GXColor& envColor = g_whiteColor,
int param_6 = 0) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
pParticle->setSimple(particleID, pos, alpha, prmColor, envColor, param_6);
g_dComIfG_gameInfo.play.getParticle()->setSimple(particleID, pos, alpha, prmColor, envColor, param_6);
}
inline JPABaseEmitter* dComIfGp_particle_setSimpleLand(int code, const cXyz* param_1, const csXyz* param_2,
f32 param_3, f32 param_4, f32 param_5,
dKy_tevstr_c* param_6, int* param_7, int param_8) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setSimpleLand(code, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8);
return g_dComIfG_gameInfo.play.getParticle()->setSimpleLand(code, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8);
}
inline JPABaseEmitter* dComIfGp_particle_setSimpleLand(cBgS_PolyInfo& param_1, const cXyz* pos, const csXyz* angle, f32 param_4, f32 param_5, f32 param_6, dKy_tevstr_c* param_7, int* param_8, int param_9) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setSimpleLand(param_1, pos, angle, param_4, param_5, param_6, param_7, param_8, param_9);
return g_dComIfG_gameInfo.play.getParticle()->setSimpleLand(param_1, pos, angle, param_4, param_5, param_6, param_7, param_8, param_9);
}
inline void dComIfGp_particle_forceDeleteEmitter(JPABaseEmitter* emitter) {
@@ -3990,8 +3967,7 @@ inline void dComIfGp_particle_forceDeleteEmitter(JPABaseEmitter* emitter) {
inline JPABaseEmitter* dComIfGp_particle_setBombSmoke(u16 particleID, const cXyz* pos,
const csXyz* angle = NULL, const cXyz* scale = NULL,
u8 alpha = 0xFF) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setBombSmoke(particleID, pos, angle, scale, alpha);
return g_dComIfG_gameInfo.play.getParticle()->setBombSmoke(particleID, pos, angle, scale, alpha);
}
inline void dComIfGp_particle_calc3D() {
src/d/actor/d_a_bdk.cpp
+3 -3
View File
@@ -1360,7 +1360,7 @@ void fly_attack(bdk_class* i_this) {
actor->speed.y = 0.0f;
i_this->m2EC[0] = REG0_S(5) + 0x28;
i_this->m2EC[1] = REG0_S(6) + 0x50;
dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
dComIfGp_getVibration().StartShock(DEMO_SELECT(REG6_S(2), REG0_S(2)) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
fopAcM_seStart(actor, JA_SE_CM_DK_CRASH_WALL, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_DK_KABE_DAMAGE, 0);
@@ -1417,8 +1417,8 @@ void fly_attack(bdk_class* i_this) {
if (i_this->mAction == ACTION_FLY_ATTACK && (i_this->mState < 10)) {
i_this->m2584 = 2;
pos_move(i_this);
i_this->mAcchCir.SetWall(REG0_F(17) + 500.0f, 500.0f);
i_this->mAcch.SetGroundUpY(REG0_F(18));
i_this->mAcchCir.SetWall(DEMO_SELECT(REG6_F(17), REG0_F(17)) + 500.0f, 500.0f);
i_this->mAcch.SetGroundUpY(DEMO_SELECT(REG6_F(18), REG0_F(18)));
if (i_this->mAcch.ChkGroundHit() && (i_this->m2619 == 0)) {
for (s32 i = 0; i <= 1; i++) {
foot_eff_pos[i] = i_this->m1174[i];
src/d/actor/d_a_dr2.cpp
-1
View File
@@ -224,7 +224,6 @@ void hahen_move(dr2_class* i_this) {
/* 00000884-0000130C .text iwa_move__FP9dr2_class */
void iwa_move(dr2_class* i_this) {
/* Nonmatching - retail-only regalloc */
fopAc_ac_c* a_this = &i_this->actor;
cXyz sp58;
cXyz sp4C;
src/d/actor/d_a_ghostship.cpp
+4 -8
View File
@@ -286,16 +286,12 @@ static BOOL daGhostshipExecute(void* i_this) {
/* 00001048-0000182C .text _execute__13daGhostship_cFv */
bool daGhostship_c::_execute() {
f32 time = dComIfGs_getTime();
f32 dist = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
fopAc_ac_c* player = dComIfGp_getPlayer(0);
// Fakematch, debug map says fopAcM_searchPlayerDistanceXZ was used
f32 dist = fopAcM_searchActorDistanceXZ(this, player);
mbCanEnterShip = false;
if(moonPhase != dKy_moon_type_chk() ||
#if VERSION == VERSION_DEMO
(time > 90.0f && time < 330.0f)
#else
(time > 90.0f && time < 285.0f)
#endif
) {
if(moonPhase != dKy_moon_type_chk() || (time > 90.0f && time < DEMO_SELECT(330.0f, 285.0f))) {
dKy_pship_existense_cut();
mAlpha = 0.0f;
}
src/d/actor/d_a_himo2.cpp
+1 -1
View File
@@ -699,7 +699,7 @@ int himo2_bg_check(himo2_class* i_this) {
i_this->m0308 = 30;
cBgS_PolyInfo local_24;
flag = i_this->m2574.GetOnePolyInfo(&local_24);
JUT_ASSERT(1569, flag == NULL);
JUT_ASSERT(DEMO_SELECT(1534, 1569), flag == NULL);
uVar3 = dComIfG_Bgsp()->GetMtrlSndId(local_24);
mDoAud_seStart(JA_SE_LK_SW_HIT_S, &actor->current.pos, uVar3, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
iVar4 = dComIfG_Bgsp()->GetAttributeCode(local_24);
src/d/actor/d_a_npc_os.cpp
+15
View File
@@ -2132,7 +2132,9 @@ BOOL daNpc_Os_c::execute() {
static JGeometry::TVec3<f32> splash_scale(0.6f, 0.6f, 0.6f);
static JGeometry::TVec3<f32> ripple_scale(1.0f, 1.0f, 1.0f);
#if VERSION > VERSION_DEMO
field_0x784 &= ~0x10;
#endif
fopAcM_OffStatus(this, fopAcStts_SHOWMAP_e);
checkPlayerRoom();
if(!finishCheck()) {
@@ -2166,7 +2168,14 @@ BOOL daNpc_Os_c::execute() {
mAcchCir[1].SetWallR(40.0f);
}
#if VERSION == VERSION_DEMO
if (mpPedestal == NULL) {
mpPedestal = (daPedestal::daPds_c*)searchFromName(l_daiza_name[argument], 0xFF, 1);
}
#else
mpPedestal = (daPedestal::daPds_c*)searchFromName(l_daiza_name[argument], 0xFF, 1);
#endif
if(mpPedestal) {
if(!isFinish()) {
if(finishCheck()) {
@@ -2190,7 +2199,9 @@ BOOL daNpc_Os_c::execute() {
mAcch.CrrPos(*dComIfG_Bgsp());
#if VERSION > VERSION_DEMO
field_0x784 |= 0x10;
#endif
if(mAcch.GetGroundH() != -G_CM3D_F_INF) {
tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
@@ -2254,7 +2265,9 @@ BOOL daNpc_Os_c::execute() {
mAcch.CrrPos(*dComIfG_Bgsp());
#if VERSION > VERSION_DEMO
field_0x784 |= 0x10;
#endif
if(chkPlayerAction(&daNpc_Os_c::walkPlayerAction) || chkNpcAction(&daNpc_Os_c::searchNpcAction)) {
if(!mAcch.ChkGroundHit()) {
@@ -2326,6 +2339,7 @@ BOOL daNpc_Os_c::execute() {
}
}
}
#if VERSION > VERSION_DEMO
else {
mAcch.CrrPos(*dComIfG_Bgsp());
@@ -2335,6 +2349,7 @@ BOOL daNpc_Os_c::execute() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
}
}
#endif
if(!fopAcM_checkCarryNow(this)) {
setCollision();
src/d/actor/d_a_npc_tc.cpp
+2 -14
View File
@@ -14,17 +14,6 @@
#include "d/actor/d_a_obj_smplbg.h"
#include "d/d_lib.h"
#if VERSION == VERSION_DEMO
static f32 lbl_285_data_1C[] = {
0.0f,
2.125f,
0.0f,
1.75f,
0.0f
};
#endif
class daNpc_Tc_HIO_c : public mDoHIO_entry_c{
public:
daNpc_Tc_HIO_c();
@@ -590,12 +579,11 @@ void daNpc_Tc_c::setAnm() {
JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_PF_BIKON00, &particlePos, NULL, &particleScale);
pEmitter->setGlobalParticleScale(0.62f, 0.6f);
fopAcM_seStart(this, JA_SE_CM_CMN_NOTICE, 0); // regswap for demo likely happens here, daNpc_Tc_c::cutEffectStart also has a regswap with identical code
fopAcM_seStart(this, JA_SE_CM_CMN_NOTICE, 0);
}
mSmokeCallBack.end();
}
dLib_bcks_setAnm("Tc", mpMorf, &mBckIdx, &mAnmPrmIdx, &mOldAnmPrmIdx, a_anm_bck_tbl, a_anm_prm_tbl, false);
/* Nonmatching */
}
/* 00001168-000011C0 .text setTexAnm__10daNpc_Tc_cFv */
@@ -1976,7 +1964,7 @@ actor_process_profile_definition g_profile_NPC_TC = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_NPC_TC,
/* Actor SubMtd */ &l_daNpc_Tc_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Status */ DEMO_SELECT(fopAcStts_UNK4000_e, 0) | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_12_e,
};
src/d/actor/d_a_npc_tc_cut.inc
-2
View File
@@ -252,7 +252,6 @@ void daNpc_Tc_c::cutBackJumpProc(int i_staffIdx) {
/* 000063BC-000064C8 .text cutEffectStart__10daNpc_Tc_cFi */
void daNpc_Tc_c::cutEffectStart(int) {
// regswap for demo daNpc_Tc_c::setAnm also has a regswap with identical code
cXyz pos;
pos.x = current.pos.x;
pos.y = current.pos.y;
@@ -266,7 +265,6 @@ void daNpc_Tc_c::cutEffectStart(int) {
JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_PF_BIKON00, &pos, NULL, &particleScale);
pEmitter->setGlobalParticleScale(0.62f, 0.6f);
fopAcM_seStart(this, JA_SE_CM_CMN_NOTICE, 0);
/* Nonmatching */
}
/* 000064C8-000064F4 .text cutEffectProc__10daNpc_Tc_cFi */
src/d/d_meter.cpp
+6 -1
View File
@@ -2535,7 +2535,12 @@ void dMeter_xyMove(sub_meter_class* i_Meter) {
if (i_Meter->field_0x3021[i] != dComIfGp_getSelectItem(i)) {
dMeter_xyItemChange(i_Meter, i);
bVar2 = false;
if ((dComIfGp_getSelectItem(i) != dItem_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(i) != dItem_LIGHT_ARROW_e)) {
#if VERSION == VERSION_DEMO
if ((i_Meter->field_0x3021[i] == dItem_MAGIC_ARROW_e) || (i_Meter->field_0x3021[i] == dItem_LIGHT_ARROW_e))
#else
if ((dComIfGp_getSelectItem(i) != dItem_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(i) != dItem_LIGHT_ARROW_e))
#endif
{
i_Meter->field_0x2320[i].pane->hide();
i_Meter->field_0x23c8[i].pane->hide();
i_Meter->field_0x2470[i].pane->hide();