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

Populate particle IDs enum with placeholders and use them everywhere

Browse Source
This commit is contained in:
LagoLunatic
2025-03-06 17:37:20 -05:00
parent d882c16b55
commit 4a4624decf
80 changed files with 1429 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_hha.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
}
}
void create_s(unsigned short, cXyz*, float, float, csXyz*);
void create_s(u16, cXyz*, float, float, csXyz*);
public:
/* 0x00 */ dPa_followEcallBack mEcallBack;
include/d/actor/d_a_pedestal.h
+2 -3
View File
@@ -2,11 +2,10 @@
#define D_A_PEDESTAL_H
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor.h"
#include "d/d_particle.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_ext.h"
#include "SSystem/SComponent/c_phase.h"
namespace daPedestal {
include/d/d_cc_d.h
+3 -3
View File
@@ -86,14 +86,14 @@ enum dCcG_hitSe {
};
enum CcG_At_HitMark {
/* 0x0 */ dCcG_AtHitMark_None_e = 0,
/* 0x1 */ dCcG_AtHitMark_Unk1_e = 1,
/* 0x0 */ dCcG_AtHitMark_None_e = dPa_name::ID_NONE,
/* 0x1 */ dCcG_AtHitMark_Unk1_e = dPa_name::ID_COMMON_0001,
/* 0xD */ dCcG_AtHitMark_Nrm_e = dPa_name::ID_COMMON_NORMAL_HIT,
/* 0xF */ dCcG_AtHitMark_Big_e = dPa_name::ID_COMMON_BIG_HIT,
};
enum CcG_Tg_HitMark {
/* 0x1 */ dCcG_TgHitMark_Unk1_e = 1,
/* 0x1 */ dCcG_TgHitMark_Unk1_e = dPa_name::ID_COMMON_0001,
/* 0xC */ dCcg_TgHitMark_Purple_e = dPa_name::ID_COMMON_PURPLE_HIT,
};
include/d/d_particle.h
+2 -2
View File
@@ -1,6 +1,7 @@
#ifndef D_PARTICLE
#define D_PARTICLE
#include "d/d_particle_name.h" // IWYU pragma: export
#include "JSystem/J3DGraphBase/J3DVertex.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/JGeometry.h"
@@ -8,8 +9,7 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAEmitterManager.h"
#include "d/d_particle_name.h"
#include "f_pc/f_pc_node.h"
#include "SSystem/SComponent/c_list.h"
#include "m_Do/m_Do_ext.h"
class mDoDvdThd_toMainRam_c;
include/d/d_particle_name.h
+1042 -11
View File
File diff suppressed because it is too large Load Diff
src/c/c_damagereaction.cpp
+6 -6
View File
@@ -216,7 +216,7 @@ BOOL enemy_ice(enemyice* ei) {
particleScale.setall(ei->mParticleScale);
pos = ac->current.pos;
pos.y += ei->mYOffset;
dComIfGp_particle_set(0x274, &pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0274, &pos, NULL, &particleScale);
} else {
return FALSE;
}
@@ -322,12 +322,12 @@ BOOL enemy_ice(enemyice* ei) {
particleScale.setall(ei->mParticleScale);
pos = ac->current.pos;
pos.y += ei->mYOffset;
dComIfGp_particle_set(0x273, &pos, NULL, &particleScale);
dComIfGp_particle_set(0x274, &pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0273, &pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0274, &pos, NULL, &particleScale);
if (ei->mFreezeTimer == -2) {
// Shattered by Skull Hammer.
dComIfGp_particle_set(0x10, &pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &pos);
csXyz angle(0, fopAcM_searchPlayerAngleY(ac), 0);
particleScale.setall(2.0f);
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &pos, &angle, &particleScale);
@@ -375,7 +375,7 @@ BOOL enemy_ice(enemyice* ei) {
particleScale.setall(ei->mParticleScale);
pos = ac->current.pos;
pos.y += ei->mYOffset;
dComIfGp_particle_set(0x277, &pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0277, &pos, NULL, &particleScale);
fopAcM_seStart(ac, JA_SE_CM_ICE_RECOVER, 0);
}
}
@@ -459,7 +459,7 @@ void enemy_fire(enemyfire* ef) {
}
cXyz scale;
scale.setall(ef->mParticleScale[i]);
ef->mpFlameEmitters[i] = dComIfGp_particle_set(0x3F1, &ac->current.pos, NULL, &scale);
ef->mpFlameEmitters[i] = dComIfGp_particle_set(dPa_name::ID_COMMON_03F1, &ac->current.pos, NULL, &scale);
ef->mFlameTimers[i] = ef->mFireTimer - (s16)cM_rndF(60.0f);
if (ef->mFlameTimers[i] < 10) {
ef->mFlameTimers[i] = 10;
src/d/actor/d_a_agb.cpp
+1 -1
View File
@@ -510,7 +510,7 @@ int daAgb_c::uploadMessageSend() {
field_0x664 = 60;
dComIfGs_onEventBit(0x1A20);
dComIfGp_particle_set(0x2E7, &current.pos, NULL, NULL, 255, &field_0x684);
dComIfGp_particle_set(dPa_name::ID_COMMON_02E7, &current.pos, NULL, NULL, 255, &field_0x684);
JKRHeap::free(l_gbaCommand->getMemAddress(), NULL);
delete l_gbaCommand;
src/d/actor/d_a_am.cpp
+13 -13
View File
@@ -273,7 +273,7 @@ static BOOL medama_atari_check(am_class* i_this) {
i_this->mAction = ACTION_DOUSA;
i_this->mState = 2;
} else {
dComIfGp_particle_set(0x10, &i_this->mEyeballPos, &player->shape_angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->mEyeballPos, &player->shape_angle);
// fopAcM_seStart(i_this, JA_SE_CM_AM_EYE_DAMAGE, 0);
mDoAud_seStart(JA_SE_CM_AM_EYE_DAMAGE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
fopAcM_monsSeStart(i_this, JA_SE_CV_AM_EYE_DAMAGE, 0x42);
@@ -574,7 +574,7 @@ static void action_dousa(am_class* i_this) {
fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0);
i_this->mSmokeCbs[0].end();
dComIfGp_particle_setToon(
0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this)
);
dComIfGp_getVibration().StartShock(3, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -604,7 +604,7 @@ static void action_dousa(am_class* i_this) {
i_this->mNeedleCyl.OffAtSetBit();
if (i_this->mSmokeCbs[2].getEmitter() == NULL) {
dComIfGp_particle_setToon(
0xA154, &i_this->mWaistPos, &i_this->shape_angle, NULL,
dPa_name::ID_SCENE_A154, &i_this->mWaistPos, &i_this->shape_angle, NULL,
0xB9, &i_this->mSmokeCbs[2], fopAcM_GetRoomNo(i_this)
);
}
@@ -673,7 +673,7 @@ static void action_modoru_move(am_class* i_this) {
if (i_this->mAcch.ChkGroundHit()) {
i_this->mSmokeCbs[0].end();
dComIfGp_particle_setToon(
0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this)
);
@@ -796,7 +796,7 @@ static void action_itai_move(am_class* i_this) {
i_this->mSmokeCbs[3].end();
i_this->mStts.SetWeight(0xFF);
dComIfGp_particle_setToon(
0xA155, &i_this->mJawPos, &i_this->shape_angle, NULL,
dPa_name::ID_SCENE_A155, &i_this->mJawPos, &i_this->shape_angle, NULL,
0xB9, &i_this->mSmokeCbs[3], fopAcM_GetRoomNo(i_this)
);
fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0);
@@ -821,11 +821,11 @@ static void action_itai_move(am_class* i_this) {
i_this->mNeedleCyl.OnAtSetBit();
i_this->mNeedleCyl.OnAtHitBit();
dComIfGp_particle_setToon(
0xA126, &i_this->mJawPos, &i_this->shape_angle, NULL,
dPa_name::ID_SCENE_A126, &i_this->mJawPos, &i_this->shape_angle, NULL,
0xB9, &i_this->mSmokeCbs[1], fopAcM_GetRoomNo(i_this)
);
i_this->m033C = dComIfGp_particle_set(0x8157, &i_this->mJawPos);
i_this->m0340 = dComIfGp_particle_set(0x8156, &i_this->mJawPos);
i_this->m033C = dComIfGp_particle_set(dPa_name::ID_SCENE_8157, &i_this->mJawPos);
i_this->m0340 = dComIfGp_particle_set(dPa_name::ID_SCENE_8156, &i_this->mJawPos);
}
if (!i_this->mpMorf->isStop()) {
@@ -844,7 +844,7 @@ static void action_itai_move(am_class* i_this) {
// fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0);
mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
dComIfGp_particle_setToon(
0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this)
);
dComIfGp_getVibration().StartShock(1, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -861,8 +861,8 @@ static void action_itai_move(am_class* i_this) {
break;
}
anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
dComIfGp_particle_set(0x8127, &i_this->mWaistPos);
dComIfGp_particle_set(0x8128, &i_this->mWaistPos);
dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos);
dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos);
fopAcM_seStart(i_this, JA_SE_CM_AM_BEF_EXPLODE, 0);
i_this->mTargetAngleY = i_this->current.angle.y;
@@ -956,8 +956,8 @@ static BOOL daAM_Execute(am_class* i_this) {
if (i_this->mAction != ACTION_ITAI_MOVE && i_this->mSpawnPosY - 1500.0f > i_this->current.pos.y) {
anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
dComIfGp_particle_set(0x8127, &i_this->mWaistPos);
dComIfGp_particle_set(0x8128, &i_this->mWaistPos);
dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos);
dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos);
fopAcM_seStart(i_this, JA_SE_CM_AM_BEF_EXPLODE, 0);
src/d/actor/d_a_am2.cpp
+9 -9
View File
@@ -179,7 +179,7 @@ static BOOL medama_atari_check(am2_class* i_this) {
i_this->mAction = ACTION_DOUSA;
i_this->mState = 2;
} else {
dComIfGp_particle_set(0x10, &hitPos, &player->shape_angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos, &player->shape_angle);
// Using the fopAcM_seStart inline breaks the codegen.
// fopAcM_seStart(i_this, JA_SE_CM_AM2_PARALYZED, 0);
mDoAud_seStart(JA_SE_CM_AM2_PARALYZED, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
@@ -286,7 +286,7 @@ static BOOL week_atari_check(am2_class* i_this) {
cc_at_check(actor, &atInfo);
if (hitType == 1) {
dComIfGp_particle_set(0x10, &hitPos);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos);
cXyz particleScale(2.0f, 2.0f, 2.0f);
dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &hitPos, &player->shape_angle, &particleScale);
} else {
@@ -422,7 +422,7 @@ static BOOL naraku_check(am2_class* i_this) {
cXyz particleScale(1.0f, 1.0f, 1.0f);
i_this->mRippleCb.end();
dComIfGp_particle_setShipTail(0x33, &i_this->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb);
i_this->mRippleCb.setRate(0.0f);
}
}
@@ -543,7 +543,7 @@ static void action_dousa(am2_class* i_this) {
// fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP_S, 0);
mDoAud_seStart(JA_SE_CM_AM_JUMP_S, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
dComIfGp_particle_setToon(0xA125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this));
dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this));
if (i_this->mSmokeCb.getEmitter()) {
i_this->mSmokeCb.getEmitter()->setRate(12.0f);
JGeometry::TVec3<f32> scale;
@@ -725,7 +725,7 @@ static void action_mahi(am2_class* i_this) {
i_this->mSmokeCb.end();
fopAcM_seStart(actor, JA_SE_CM_AM2_LANDING, 0);
dComIfGp_particle_setToon(0xA125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor));
dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor));
if (i_this->mSmokeCb.getEmitter()) {
i_this->mSmokeCb.getEmitter()->setRate(12.0f);
JGeometry::TVec3<f32> scale;
@@ -838,7 +838,7 @@ static void action_itai(am2_class* i_this) {
i_this->speedF = 20.0f;
fopAcM_monsSeStart(i_this, JA_SE_CV_AM2_DAMAGE, 0x42);
dComIfGp_particle_set(0x81AE, &i_this->mWeakPos, &i_this->shape_angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_81AE, &i_this->mWeakPos, &i_this->shape_angle);
if (i_this->health > 0) {
anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
@@ -897,7 +897,7 @@ static void action_itai(am2_class* i_this) {
if (i_this->mAcch.ChkGroundHit()) {
i_this->mSmokeCb.end();
dComIfGp_particle_setToon(0xA125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this));
dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this));
if (i_this->mSmokeCb.getEmitter()) {
i_this->mSmokeCb.getEmitter()->setRate(12.0f);
JGeometry::TVec3<f32> scale;
@@ -931,8 +931,8 @@ static void action_itai(am2_class* i_this) {
cXyz centerPos = i_this->current.pos;
centerPos.y += 50.0f;
dComIfGp_particle_set(0x81AF, &i_this->current.pos, &i_this->shape_angle);
dComIfGp_particle_set(0x81B0, &i_this->current.pos, &i_this->shape_angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_81AF, &i_this->current.pos, &i_this->shape_angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_81B0, &i_this->current.pos, &i_this->shape_angle);
fopAcM_seStart(i_this, JA_SE_CM_AM2_EXPLODE, 0);
fopAcM_createDisappear(i_this, &centerPos, 5);
fopAcM_onActor(i_this);
src/d/actor/d_a_arrow.cpp
+9 -9
View File
@@ -192,7 +192,7 @@ void daArrow_c::setBlur() {
/* 800D4994-800D4A04 .text createBlur__9daArrow_cFv */
void daArrow_c::createBlur() {
if (!mBlurFollowCb.getEmitter()) {
dComIfGp_particle_setP1(0x48, &current.pos, NULL, NULL, 0xFF, &mBlurFollowCb);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_0048, &current.pos, NULL, NULL, 0xFF, &mBlurFollowCb);
}
}
@@ -348,7 +348,7 @@ void daArrow_c::ShieldReflect() {
targetAngleX = -cLib_targetAngleX(&link->current.pos, &ganondorfChestPos);
fpcM_SetParam(ganondorf, 0x23);
mSparkleTimer = 15 + REG0_S(3);
mpSparkleEmitter = dComIfGp_particle_set(0x3EE, &link->current.pos);
mpSparkleEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &link->current.pos);
}
// // Regswaps without creating a fake inline.
@@ -396,7 +396,7 @@ bool daArrow_c::check_water_in() {
if (mArrowType == TYPE_FIRE) {
mInWaterTimer = 1;
dComIfGp_particle_setP1(0x35A, &waterHitPos);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_035A, &waterHitPos);
if (!field_0x6e4) {
dKy_arrowcol_chg_on(&current.pos, 0);
}
@@ -410,7 +410,7 @@ bool daArrow_c::check_water_in() {
dKy_arrowcol_chg_on(&current.pos, 1);
}
} else if (mArrowType == TYPE_LIGHT) {
dComIfGp_particle_setP1(0x2A1, &waterHitPos);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &waterHitPos);
fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
if (!field_0x6e4) {
dKy_arrowcol_chg_on(&current.pos, 2);
@@ -692,7 +692,7 @@ BOOL daArrow_c::procMove() {
mDoMtx_stack_c::ZXYrotM(temp10.x, temp10.y, 0);
cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &field_0x6a8, &temp10);
fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
fopAcM_delete(this);
} else {
@@ -793,15 +793,15 @@ BOOL daArrow_c::procMove() {
cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
if (mArrowType == TYPE_FIRE) {
dComIfGp_particle_setP1(0x29A, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(0x29B, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_029A, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_029B, &field_0x6a8, &temp10);
fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARW_EFF, 0);
field_0x698 = false;
} else if (mArrowType == TYPE_ICE) {
if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) {
fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo);
} else {
dComIfGp_particle_setP1(0x29E, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_029E, &field_0x6a8, &temp10);
fopAcM_createChild(
PROC_ARROW_ICEEFF, fopAcM_GetID(this),
@@ -812,7 +812,7 @@ BOOL daArrow_c::procMove() {
fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0);
}
} else if (mArrowType == TYPE_LIGHT) {
dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &field_0x6a8, &temp10);
fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
field_0x698 = false;
}
src/d/actor/d_a_arrow_iceeff.cpp
+6 -6
View File
@@ -196,7 +196,7 @@ bool daArrow_Iceeff_c::_execute() {
daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
if(field_0xA38 == 0) {
if(arrow == 0) {
dComIfGp_particle_setP1(0x55, &current.pos, &current.angle);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, &current.pos, &current.angle);
fopAcM_delete(this);
return true;
@@ -219,7 +219,7 @@ bool daArrow_Iceeff_c::_execute() {
field_0xA30++;
}
else {
dComIfGp_particle_setP1(0x55, &current.pos, &current.angle);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, &current.pos, &current.angle);
fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0);
fopAcM_delete(arrow);
fopAcM_delete(this);
@@ -234,7 +234,7 @@ bool daArrow_Iceeff_c::_execute() {
csXyz angle;
angle.set(-0x4000, 0, 0);
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x29E, &current.pos, &angle);
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_COMMON_029E, &current.pos, &angle);
if(ptcl) {
JGeometry::TVec3<f32> scale(0.5f, 0.5f, 0.5f);
ptcl->setGlobalScale(scale);
@@ -258,14 +258,14 @@ bool daArrow_Iceeff_c::_execute() {
}
if(field_0xA30 == 0x23) {
JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(0x3D, &current.pos, NULL, &ripple_scale);
JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &current.pos, NULL, &ripple_scale);
if(ptcl) {
JGeometry::TVec3<f32> scale(0.67f, 0.67f, 1.0f);
ptcl->setGlobalParticleScale(scale);
}
}
else if(field_0xA30 == 0x28) {
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x55, &current.pos);
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, &current.pos);
if(ptcl) {
ptcl->setAwayFromCenterSpeed(25.0f);
ptcl->setAwayFromAxisSpeed(5.0f);
@@ -276,7 +276,7 @@ bool daArrow_Iceeff_c::_execute() {
ptcl->setGlobalParticleScale(scale2);
}
dComIfGp_particle_setSingleRipple(0x3F, &current.pos, NULL, &ripple_scale);
dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &current.pos, NULL, &ripple_scale);
fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0);
field_0xA3C = 0;
src/d/actor/d_a_arrow_lighteff.cpp
+6 -6
View File
@@ -145,23 +145,23 @@ void daArrow_Lighteff_c::CreateInit() {
if(field_0x2E8 == 1) {
if(field_0x2F4.getEmitter() == 0) {
dComIfGp_particle_setP1(0x299, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_0299, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
}
}
else if(field_0x2E8 == 2) {
if(field_0x2F4.getEmitter() == 0) {
dComIfGp_particle_setP1(0x29C, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_029C, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
}
if(field_0x308.getEmitter() == 0) {
dComIfGp_particle_setP1(0x29D, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_029D, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
}
}
else if(field_0x2E8 == 3) {
if(field_0x2F4.getEmitter() == 0) {
dComIfGp_particle_setP1(0x29F, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_029F, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
}
if(field_0x308.getEmitter() == 0) {
dComIfGp_particle_setP1(0x2A0, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A0, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
}
}
@@ -363,7 +363,7 @@ bool daArrow_Lighteff_c::_execute() {
if(field_0x2E8 == 1) {
fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARROW_AMB, 0);
if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
dComIfGp_particle_setSimple(0x4004, &field_0x29C, 0xFF, g_whiteColor, g_whiteColor, 0);
dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &field_0x29C, 0xFF, g_whiteColor, g_whiteColor, 0);
}
}
else if(field_0x2E8 == 2) {
src/d/actor/d_a_auction.cpp
+1 -1
View File
@@ -1144,7 +1144,7 @@ void daAuction_c::eventMainMsgBikonC() {
m7A8 = getNpcActorP(m827)->current.pos;
m7A8.y += getPiconDispOfs(m827);
dComIfGp_particle_set(0x8153, &m7A8, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this));
dComIfGp_particle_set(dPa_name::ID_SCENE_8153, &m7A8, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this));
mTimer = 30;
if (m827 == 0) {
src/d/actor/d_a_bita.cpp
+2 -2
View File
@@ -84,9 +84,9 @@ static void mode_dead(bita_class* i_this) {
type = 1;
if (type == 0) {
dComIfGp_particle_set(0x80e3, &i_this->current.pos, &i_this->shape_angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_80E3, &i_this->current.pos, &i_this->shape_angle);
} else {
dComIfGp_particle_set(0x80e4, &i_this->current.pos, &i_this->shape_angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_80E4, &i_this->current.pos, &i_this->shape_angle);
}
}
src/d/actor/d_a_bk.cpp
+3 -3
View File
@@ -165,7 +165,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) {
case dBgS_Attr_SAND_e: {
i_this->m0350.end();
JPABaseEmitter* emitter1 = dComIfGp_particle_setToon(
0x2022, &i_this->m0338, &i_this->m0344, NULL, 0xB9,
dPa_name::ID_COMMON_2022, &i_this->m0338, &i_this->m0344, NULL, 0xB9,
&i_this->m0350, fopAcM_GetRoomNo(i_this)
);
if (emitter1) {
@@ -180,7 +180,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) {
break;
}
case dBgS_Attr_GRASS_e:
JPABaseEmitter* emitter2 = dComIfGp_particle_set(0x24, &i_this->m0338, &i_this->m0344);
JPABaseEmitter* emitter2 = dComIfGp_particle_set(dPa_name::ID_COMMON_0024, &i_this->m0338, &i_this->m0344);
if (emitter2) {
emitter2->setRate(rate * 0.5f);
emitter2->setMaxFrame(3);
@@ -3212,7 +3212,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
i_this->m0336--;
if (i_this->m0336 == 0) {
i_this->m0344.y = i_this->current.angle.y;
dComIfGp_particle_set(0xE, &i_this->m116C, &i_this->m0344);
dComIfGp_particle_set(dPa_name::ID_COMMON_000E, &i_this->m116C, &i_this->m0344);
}
}
src/d/actor/d_a_bomb2.cpp
+1 -1
View File
@@ -733,7 +733,7 @@ namespace daBomb2 {
field_0x6D8 = field_0x6C0;
dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &field_0x6C0, NULL, &scale, 0xFF, &mSparks);
dComIfGp_particle_setToonP1(0x2012, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke);
dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_2012, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke);
mSmoke.setOldPosP(&field_0x6CC, &field_0x6D8);
}
}
src/d/actor/d_a_bomb3.inc
+2 -2
View File
@@ -695,7 +695,7 @@ void daBomb_c::setFuseEffect() {
mFusePos3 = mFusePos;
dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &mFusePos, NULL, &scale, 0xFF, &mSparks);
dComIfGp_particle_setToonP1(0x2012, &mFusePos, NULL, &scale, 0xDC, &mSmoke);
dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_2012, &mFusePos, NULL, &scale, 0xDC, &mSmoke);
mSmoke.field_0x0C = &mFusePos2;
mSmoke.field_0x10 = &mFusePos3;
mSmoke.field_0x04 = 0x14;
@@ -719,7 +719,7 @@ void daBomb_c::eff_explode_cheap(const csXyz* rotation) {
emitter->setGlobalParticleScale(vec);
}
dComIfGp_particle_setBombSmoke(0x232A, &current.pos, NULL, &scale);
dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_232A, &current.pos, NULL, &scale);
emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
if(emitter) {
emitter->mLifeTime = 0x46;
src/d/actor/d_a_dai_item.cpp
+3 -3
View File
@@ -549,7 +549,7 @@ bool daStandItem_c::actionFobj09() {
m698 = NULL;
}
if (m690 == NULL) {
m690 = dComIfGp_particle_set(0x82B3, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
m690 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B3, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
} else {
m690->setGlobalRTMatrix(m660);
}
@@ -574,10 +574,10 @@ bool daStandItem_c::actionFobj09() {
m690 = NULL;
}
if (m694 == NULL) {
m694 = dComIfGp_particle_set(0x82B4, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
m694 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B4, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
}
if (m698 == NULL) {
m698 = dComIfGp_particle_set(0x82B5, &current.pos, &current.angle);
m698 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B5, &current.pos, &current.angle);
}
if (m698) {
m698->becomeImmortalEmitter();
src/d/actor/d_a_deku_item.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ void daDekuItem_c::mode_wait() {
}
if (mpEmitter == NULL) {
mpEmitter = dComIfGp_particle_set(0x820F, &current.pos);
mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_820F, &current.pos);
} else if (mpEmitter != NULL) {
mpEmitter->setGlobalTranslation(current.pos);
}
src/d/actor/d_a_demo_item.cpp
+4 -4
View File
@@ -296,13 +296,13 @@ void daDitem_c::setParticle() {
switch (m_effect_type[m_itemNo]) {
case 0:
mpEmitters[0] = dComIfGp_particle_set(0x1F7, &current.pos, &angle);
mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F7, &current.pos, &angle);
case 1:
mpEmitters[1] = dComIfGp_particle_set(0x1F8, &current.pos, &angle);
mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F8, &current.pos, &angle);
case 2:
mpEmitters[2] = dComIfGp_particle_set(0x1F9, &current.pos, &angle);
mpEmitters[2] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F9, &current.pos, &angle);
case 3:
mpEmitters[3] = dComIfGp_particle_set(0x1FA, &current.pos, &angle);
mpEmitters[3] = dComIfGp_particle_set(dPa_name::ID_COMMON_01FA, &current.pos, &angle);
case 4:
break;
}
src/d/actor/d_a_disappear.cpp
+9 -9
View File
@@ -76,20 +76,20 @@ void set_disappear(disappear_class* i_this, float scale) {
case 0xB:
case 0xC:
case 0xD:
dComIfGp_particle_set(0x14, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0014, &i_this->current.pos, NULL, &particleScale);
case 0x3:
dComIfGp_particle_set(0x13, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_setStripes(0x15, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96);
dComIfGp_particle_set(0x16, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_setStripes(dPa_name::ID_COMMON_0015, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96);
dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &i_this->current.pos, NULL, &particleScale);
break;
case 0x1:
dComIfGp_particle_set(0x13, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_set(0x16, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &i_this->current.pos, NULL, &particleScale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &i_this->current.pos, NULL, &particleScale);
break;
case 0x4:
dComIfGp_particle_set(0x043C, &i_this->current.pos);
dComIfGp_particle_set(0x043D, &i_this->current.pos);
dComIfGp_particle_set(0x043E, &i_this->current.pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_043C, &i_this->current.pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_043D, &i_this->current.pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_043E, &i_this->current.pos);
break;
}
}
src/d/actor/d_a_dr.cpp
+4 -4
View File
@@ -82,7 +82,7 @@ static void move(dr_class* i_this) {
anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_BIKU1);
i_this->mState++;
i_this->mCountDownTimers[0] = l_HIO.m0E;
i_this->mpBreathEmitter = dComIfGp_particle_set(0x81C4, &i_this->current.pos);
i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C4, &i_this->current.pos);
i_this->m2C9 = 0;
// Fall-through
case 11:
@@ -100,7 +100,7 @@ static void move(dr_class* i_this) {
if (i_this->mCountDownTimers[0] != 0) {
if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, DR_BCK_DR_ABARE1, l_HIO.mAbare1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_ABARE1);
i_this->mpBreathEmitter = dComIfGp_particle_set(0x81C5, &i_this->current.pos);
i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C5, &i_this->current.pos);
i_this->mCountDownTimers[1] = 500;
} else {
anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_ABARE2);
@@ -110,14 +110,14 @@ static void move(dr_class* i_this) {
MtxP rootJntMtx = i_this->mpMorf->getModel()->getAnmMtx(0x00); // dr_all_root joint
cMtx_copy(rootJntMtx, *calc_mtx);
MtxPosition(&offset, &rootPos);
dComIfGp_particle_set(0x81C7, &rootPos);
dComIfGp_particle_set(dPa_name::ID_SCENE_81C7, &rootPos);
fopAcM_seStart(i_this, JA_SE_CM_DRG_MTOP_MAGMA, 0);
i_this->mCountDownTimers[1] = 0;
}
} else {
anm_init(i_this, DR_BCK_DR_HO1, l_HIO.mHo1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
i_this->mpBreathEmitter = dComIfGp_particle_set(0x81C6, &i_this->current.pos);
i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C6, &i_this->current.pos);
i_this->mState++;
}
}
src/d/actor/d_a_esa.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ void esa_1_move(esa_class* i_this) {
i_this->mActionState = 3;
if(i_this->field_0x2A4.getEmitter() == NULL) {
static cXyz ripple_scale(0.2f, 0.2f, 0.2f);
dComIfGp_particle_setShipTail(0x33, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
if(i_this->field_0x2A4.getEmitter()) {
i_this->field_0x2A4.setRate(0.4f);
}
@@ -174,7 +174,7 @@ void esa_1_move(esa_class* i_this) {
if(i_this->field_0x2A4.getEmitter() == NULL) {
static cXyz ripple_scale(0.2f, 0.2f, 0.2f);
dComIfGp_particle_setShipTail(0x33, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
if(i_this->field_0x2A4.getEmitter()) {
i_this->field_0x2A4.setRate(0.4f);
}
src/d/actor/d_a_floor.cpp
+2 -2
View File
@@ -96,8 +96,8 @@ int daFloor_c::Execute(Mtx**) {
/* 00000548-00000640 .text set_effect__9daFloor_cFv */
void daFloor_c::set_effect() {
dComIfGp_particle_set(0x81A6, &current.pos, &current.angle);
JPABaseEmitter* emtr = dComIfGp_particle_set(0x2027, &current.pos, &current.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this));
dComIfGp_particle_set(dPa_name::ID_SCENE_81A6, &current.pos, &current.angle);
JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2027, &current.pos, &current.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this));
if (emtr != NULL) {
emtr->setRate(30);
emtr->setMaxFrame(1);
src/d/actor/d_a_ghostship.cpp
+1 -1
View File
@@ -345,7 +345,7 @@ bool daGhostship_c::_execute() {
dLib_setCirclePath(&mPaths[i]);
if(mAlpha != 0.0f) {
dComIfGp_particle_setSimple(0x8306, &mPaths[i].mPos, 0xFF, g_whiteColor, g_whiteColor, 0);
dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8306, &mPaths[i].mPos, 0xFF, g_whiteColor, g_whiteColor, 0);
}
}
src/d/actor/d_a_hot_floor.cpp
+2 -2
View File
@@ -66,9 +66,9 @@ bool daHot_Floor_c::_delete() {
bool daHot_Floor_c::_execute() {
if (mbSpawnParticle) {
if (mEmitter2 == NULL && !(fopAcM_GetParam(this) & 1))
mEmitter2 = dComIfGp_particle_set(0x814c, &current.pos);
mEmitter2 = dComIfGp_particle_set(dPa_name::ID_SCENE_814C, &current.pos);
if (mEmitter1 == NULL && !(fopAcM_GetParam(this) & 2))
mEmitter1 = dComIfGp_particle_set(0x8120, &current.pos);
mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_8120, &current.pos);
cLib_chaseF(&mSpawnTimer, 60.0f, 5.0f);
mbSpawnParticle = false;
} else {
src/d/actor/d_a_ib.cpp
+8 -8
View File
@@ -88,17 +88,17 @@ void daIball_c::createDisappearEffect(int param_1, int color_idx) {
pos.y += m_data.mYOffset;
switch (param_1) {
case 0:
dComIfGp_particle_set(0x1C, &pos, NULL, &scale, 0xFF, dPa_control_c::getLifeBallSetColorEcallBack(color_idx));
dComIfGp_particle_set(0x1D, &pos, NULL, &scale);
dComIfGp_particle_set(dPa_name::ID_COMMON_001C, &pos, NULL, &scale, 0xFF, dPa_control_c::getLifeBallSetColorEcallBack(color_idx));
dComIfGp_particle_set(dPa_name::ID_COMMON_001D, &pos, NULL, &scale);
if (color_idx == 2) {
dComIfGp_particle_set(0x47, &pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_0047, &pos);
}
fopAcM_seStartCurrent(this, JA_SE_OBJ_CUT_INOCHIDAMA, 0);
break;
case 1:
dComIfGp_particle_set(0x19, &pos, NULL, &scale);
dComIfGp_particle_set(0x1A, &pos, NULL, &scale);
dComIfGp_particle_set(0x1B, &pos, NULL, &scale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0019, &pos, NULL, &scale);
dComIfGp_particle_set(dPa_name::ID_COMMON_001A, &pos, NULL, &scale);
dComIfGp_particle_set(dPa_name::ID_COMMON_001B, &pos, NULL, &scale);
fopAcM_seStartCurrent(this, JA_SE_CM_INOCHIDAMA_BREAK, 0);
break;
}
@@ -214,7 +214,7 @@ void daIball_c::checkGeo() {
particle_scale.setall(0.25f);
cXyz particle_pos(current.pos);
particle_pos.y = groundY;
dComIfGp_particle_set(0x80D5, &particle_pos, NULL, &particle_scale);
dComIfGp_particle_set(dPa_name::ID_SCENE_80D5, &particle_pos, NULL, &particle_scale);
fopAcM_delete(this);
}
}
@@ -246,7 +246,7 @@ void daIball_c::mode_wait() {
/* 800F3F6C-800F3FE8 .text mode_water_init__9daIball_cFv */
void daIball_c::mode_water_init() {
dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &scale, 0xFF, &mRippleCb);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, &scale, 0xFF, &mRippleCb);
mRippleCb.setRate(0.0f);
mMode = MODE_WATER;
}
src/d/actor/d_a_item.cpp
+3 -3
View File
@@ -208,7 +208,7 @@ void daItem_c::CreateInit() {
animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
if (fopAcM_SearchByName(PROC_BST)) { // Gohdan
mpParticleEmitter = dComIfGp_particle_set(0x81E1, &current.pos);
mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81E1, &current.pos);
}
}
@@ -1055,7 +1055,7 @@ BOOL daItem_c::itemActionForArrow() {
mOnGroundTimer++;
if (mOnGroundTimer == 1 && fopAcM_SearchByName(PROC_BST)) { // Gohdan
JPABaseEmitter* emitter = dComIfGp_particle_set(0xA1E2, &current.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this));
JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_A1E2, &current.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this));
if (emitter) {
emitter->setMaxFrame(1);
}
@@ -1236,7 +1236,7 @@ void daItem_c::mode_water_init() {
temp3 *= scale.x;
particleScale.setall(temp3);
dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb);
mPtclRippleCb.mRate = 0.0f;
}
src/d/actor/d_a_lamp.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) {
if (!i_this->mParticleInit) {
static cXyz fire_scale(0.5f, 0.5f, 0.5f);
dComIfGp_particle_set(0x1ea, &i_this->mPos, NULL, &fire_scale, 0xFF, &i_this->mPa);
dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->mPos, NULL, &fire_scale, 0xFF, &i_this->mPa);
i_this->mParticleInit = 1;
i_this->mParticlePower = 1.0f;
}
@@ -96,7 +96,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) {
if (i_this->mPa.getEmitter()) {
cXyz whitePartPos = i_this->mPos;
whitePartPos.y += partHeightOffset;
dComIfGp_particle_setSimple(0x4004, &whitePartPos, 0xFF, g_whiteColor, g_whiteColor, 0);
dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &whitePartPos, 0xFF, g_whiteColor, g_whiteColor, 0);
cLib_addCalc2(&i_this->mParticlePower, cM_rndF(0.2f) + 1.0f, 0.5f, partMaxFlickerPerTick);
} else {
i_this->mParticlePower = 0.0f;
src/d/actor/d_a_lbridge.cpp
+3 -3
View File
@@ -72,7 +72,7 @@ void daLbridge_c::CreateInit() {
fopAcM_setCullSizeBox(this, -600.0f, -100.0f, -150.0f, 600.0f, 100.0f, 150.0f);
fopAcM_setCullSizeFar(this, 1.5f);
mpEmitter = dComIfGp_particle_set(0x810FU, &current.pos, &current.angle);
mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_810F, &current.pos, &current.angle);
if (mpEmitter != NULL) {
mpEmitter->stopDrawParticle();
@@ -231,8 +231,8 @@ void daLbridge_c::appear_bridge() {
pos1.z += 100.0f;
pos2.z -= 100.0f;
dComIfGp_particle_setProjection(0x8119U, &pos1, &current.angle);
dComIfGp_particle_setProjection(0x8119U, &pos2, &current.angle);
dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos1, &current.angle);
dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos2, &current.angle);
set_on_se();
src/d/actor/d_a_leaflift.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ void daLlift_c::CreateInit() {
if (mWaterY != -1e9f) {
cXyz particlePos = current.pos;
particlePos.y = mWaterY + 1.0f;
mEmitter3 = dComIfGp_particle_set(0x82AA, &particlePos, &current.angle);
mEmitter3 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AA, &particlePos, &current.angle);
if (mEmitter3) {
mEmitter3->stopCreateParticle();
}
src/d/actor/d_a_mmusic.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ bool daMmusic::Act_c::_execute() {
if (mpEmitter == NULL && field_0x298 == 1) {
set_mtx();
cXyz scale(1.0f, 1.0f, 1.0f);
JPABaseEmitter* emtr = dComIfGp_particle_set(0x826c, &current.pos);
JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_SCENE_826C, &current.pos);
mpEmitter = emtr;
if (emtr != NULL) {
mpEmitter->setGlobalRTMatrix(mMtx);
src/d/actor/d_a_npc_ji1.cpp
+8 -8
View File
@@ -373,7 +373,7 @@ BOOL daNpc_Ji1_c::normalSubActionHarpoonGuard(s16 param_1) {
field_0xD74++;
field_0xD68 = 0;
setAnm(9, 0.0f, 1);
dComIfGp_particle_set(0xC, field_0x7E0.GetTgHitPosP());
dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, field_0x7E0.GetTgHitPosP());
fopAcM_seStart(this, JA_SE_CV_JI_DEFENCE, 0);
fopAcM_seStart(this, JA_SE_OBJ_COL_SWS_NMTLP, 0);
}
@@ -1864,7 +1864,7 @@ u32 daNpc_Ji1_c::privateCut() {
u32 daNpc_Ji1_c::setParticle(int max, f32 rate, f32 spread) {
dtParticle();
if(field_0x2E0.getEmitter() == 0) {
JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, &current.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this));
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &current.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this));
if(emitter) {
emitter->setRate(rate);
emitter->setSpread(spread);
@@ -1888,7 +1888,7 @@ void daNpc_Ji1_c::dtParticle() {
/* 000058F0-000059E8 .text setParticleAT__11daNpc_Ji1_cFiff */
u32 daNpc_Ji1_c::setParticleAT(int max, f32 rate, f32 spread) {
if(field_0x300.getEmitter() == 0) {
JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, &field_0x320, 0, 0, 0xB9, &field_0x300, fopAcM_GetRoomNo(this));
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &field_0x320, 0, 0, 0xB9, &field_0x300, fopAcM_GetRoomNo(this));
if(field_0x300.getEmitter()) {
JGeometry::TVec3<f32> scaleVec;
scaleVec.x = 2.0f;
@@ -2813,7 +2813,7 @@ void daNpc_Ji1_c::setAnimFromMsgNo(u32 msgNo) {
if(field_0x430 != 0) {
field_0x430->becomeInvalidEmitter();
field_0x430 = 0;
field_0x430 = dComIfGp_particle_set(0x81A5, &current.pos);
field_0x430 = dComIfGp_particle_set(dPa_name::ID_SCENE_81A5, &current.pos);
}
setAnm(0x18, 8.0f, 0);
@@ -2997,7 +2997,7 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) {
pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NAKU);
if(field_0x430 == 0) {
field_0x430 = dComIfGp_particle_set(0x81A4, &current.pos);
field_0x430 = dComIfGp_particle_set(dPa_name::ID_SCENE_81A4, &current.pos);
harpoonRelease(0);
}
@@ -3684,8 +3684,8 @@ void daNpc_Ji1_c::setHitParticle(cXyz* param_1, u32 param_2) {
scale = *param_1;
}
dComIfGp_particle_set(0xD, field_0x7E0.GetTgHitPosP(), &angle, &scale);
dComIfGp_particle_set(0x10, field_0x7E0.GetTgHitPosP(), 0, &scale);
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, field_0x7E0.GetTgHitPosP(), &angle, &scale);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, field_0x7E0.GetTgHitPosP(), 0, &scale);
fopAcM_seStart(this, JA_SE_CM_JI_DAMAGE, 0);
fopAcM_seStart(this, param_2, 0);
dKy_SordFlush_set(*field_0x7E0.GetTgHitPosP(), 0);
@@ -3693,7 +3693,7 @@ void daNpc_Ji1_c::setHitParticle(cXyz* param_1, u32 param_2) {
/* 000114EC-0001161C .text setGuardParticle__11daNpc_Ji1_cFv */
void daNpc_Ji1_c::setGuardParticle() {
dComIfGp_particle_set(0xC, field_0x7E0.GetTgHitPosP());
dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, field_0x7E0.GetTgHitPosP());
fopAcM_seStart(this, JA_SE_OBJ_COL_SWS_NMTLP, 0);
fopAcM_seStart(this, JA_SE_CV_JI_DEFENCE, 0);
dKy_SordFlush_set(*field_0x7E0.GetTgHitPosP(), 0);
src/d/actor/d_a_npc_kamome.cpp
+2 -2
View File
@@ -1298,13 +1298,13 @@ BOOL daNpc_kam_c::execute() {
if (!isWaterHit()) {
onWaterHit();
JPABaseEmitter* splashEmitter = dComIfGp_particle_set(0x40, &current.pos);
JPABaseEmitter* splashEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0040, &current.pos);
if (splashEmitter) {
splashEmitter->setRate(15.0f);
splashEmitter->setGlobalScale(splash_scale);
}
JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(0x3D, &current.pos);
JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &current.pos);
if (rippleEmitter) {
rippleEmitter->setGlobalScale(ripple_scale);
}
src/d/actor/d_a_npc_md.cpp
+9 -9
View File
@@ -1043,13 +1043,13 @@ BOOL daNpc_Md_c::mirrorCancelCheck() {
/* 00003648-00003674 .text setWingEmitter__10daNpc_Md_cFv */
void daNpc_Md_c::setWingEmitter() {
particle_set(&m0508[0], 0x819B);
particle_set(&m0508[0], dPa_name::ID_SCENE_819B);
}
/* 00003674-000036C0 .text setHane02Emitter__10daNpc_Md_cFv */
void daNpc_Md_c::setHane02Emitter() {
particle_set(&m0508[2], 0x8217);
particle_set(&m0508[3], 0x8217);
particle_set(&m0508[2], dPa_name::ID_SCENE_8217);
particle_set(&m0508[3], dPa_name::ID_SCENE_8217);
}
/* 000036C0-000036FC .text deleteHane02Emitter__10daNpc_Md_cFv */
@@ -1060,8 +1060,8 @@ void daNpc_Md_c::deleteHane02Emitter() {
/* 000036FC-00003748 .text setHane03Emitter__10daNpc_Md_cFv */
void daNpc_Md_c::setHane03Emitter() {
particle_set(&m0508[4], 0x827D);
particle_set(&m0508[5], 0x827D);
particle_set(&m0508[4], dPa_name::ID_SCENE_827D);
particle_set(&m0508[5], dPa_name::ID_SCENE_827D);
}
/* 00003748-00003784 .text deleteHane03Emitter__10daNpc_Md_cFv */
@@ -1132,10 +1132,10 @@ BOOL daNpc_Md_c::lightHitCheck() {
fopAc_ac_c* hitActor = mCps.GetAtHitAc();
if (fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) {
if (hitActor != dComIfGp_getLinkPlayer() && m3058.getEmitter() == NULL) {
dComIfGp_particle_set(0x8232, &current.pos, NULL, NULL, 0xFF, &m3058);
dComIfGp_particle_set(dPa_name::ID_SCENE_8232, &current.pos, NULL, NULL, 0xFF, &m3058);
}
} else if (m3058.getEmitter() == NULL) {
dComIfGp_particle_set(0x8232, &current.pos, NULL, NULL, 0xFF, &m3058);
dComIfGp_particle_set(dPa_name::ID_SCENE_8232, &current.pos, NULL, NULL, 0xFF, &m3058);
}
cM3d_lineVsPosSuisenCross(mCps.GetStart(), mCps.GetEnd(), *mCps.GetAtHitPosP(), &m3058.getPos());
@@ -1153,7 +1153,7 @@ BOOL daNpc_Md_c::lightHitCheck() {
}
if (m304C.getEmitter() == NULL) {
m304C.makeEmitter(0x8226, mpHarpLightModel->getBaseTRMtx(), &current.pos, NULL);
m304C.makeEmitter(dPa_name::ID_SCENE_8226, mpHarpLightModel->getBaseTRMtx(), &current.pos, NULL);
JPABaseEmitter* emitter = m304C.getEmitter();
JGeometry::TVec3<f32> temp;
temp.set(1.0f, 1.0f, 1.0f);
@@ -2662,7 +2662,7 @@ BOOL daNpc_Md_c::setAnm(int anmIdx) {
if (m312D == 0x10) {
if (m0508[1] == NULL) {
m0508[1] = dComIfGp_particle_set(0x819D, &current.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0);
m0508[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_819D, &current.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0);
if (m0508[1]) {
m0508[1]->becomeImmortalEmitter();
}
src/d/actor/d_a_npc_nz.cpp
+1 -1
View File
@@ -885,7 +885,7 @@ void daNpc_Nz_c::setSmokeParticle() {
}
if(field_0x914.getEmitter() == NULL) {
JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, &current.pos, &current.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this));
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &current.pos, &current.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this));
if(emitter) {
emitter->setRate(3.0f);
emitter->setSpread(0.2f);
src/d/actor/d_a_npc_nz_cut.inc
+1 -1
View File
@@ -334,7 +334,7 @@ void daNpc_Nz_c::cutSetAnmProc() {
mDoMtx_stack_c::copy(pModel->getAnmMtx(m_jnt.getHeadJntNum()));
mDoMtx_stack_c::multVec(&temp4, &pos);
dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, 0, -1, &color);
dComIfGp_particle_set(dPa_name::ID_COMMON_0057, &pos, &shape_angle, &scale, 0xFF, 0, -1, &color);
}
}
}
src/d/actor/d_a_npc_os.cpp
+8 -8
View File
@@ -500,7 +500,7 @@ void daNpc_Os_c::eventOrderCheck() {
/* 00001300-000013D4 .text makeBeam__10daNpc_Os_cFi */
void daNpc_Os_c::makeBeam(int param_1) {
if(field_0x738.getEmitter() == NULL) {
field_0x738.makeEmitter(0x826E, &current.pos, &shape_angle, 0);
field_0x738.makeEmitter(dPa_name::ID_SCENE_826E, &current.pos, &shape_angle, 0);
if(param_1) {
fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_LIGHT_ST, 0);
@@ -508,7 +508,7 @@ void daNpc_Os_c::makeBeam(int param_1) {
}
if(field_0x740.getEmitter() == NULL) {
field_0x740.makeEmitter(0x826F, &current.pos, &shape_angle, 0);
field_0x740.makeEmitter(dPa_name::ID_SCENE_826F, &current.pos, &shape_angle, 0);
}
}
@@ -872,7 +872,7 @@ BOOL daNpc_Os_c::carryNpcAction(void* param_1) {
}
else {
fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0);
smokeSet(0xA328);
smokeSet(dPa_name::ID_SCENE_A328);
setNpcAction(&daNpc_Os_c::waitNpcAction, 0);
return true;
@@ -907,7 +907,7 @@ BOOL daNpc_Os_c::throwNpcAction(void* param_1) {
else if(field_0x7A9 != -1) {
if(mAcch.ChkGroundHit()) {
fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0);
smokeSet(0xA33B);
smokeSet(dPa_name::ID_SCENE_A33B);
setNpcAction(&daNpc_Os_c::waitNpcAction, 0);
}
@@ -933,7 +933,7 @@ BOOL daNpc_Os_c::jumpNpcAction(void* param_1) {
}
else if(field_0x7A9 != -1) {
if(mAcch.ChkGroundHit()) {
smokeSet(0xA33B);
smokeSet(dPa_name::ID_SCENE_A33B);
setNpcAction(&daNpc_Os_c::waitNpcAction, 0);
}
@@ -2054,7 +2054,7 @@ void daNpc_Os_c::animationPlay() {
mPrevMorfFrame = frame;
if(field_0x78C == 1 && mpMorf->checkFrame(17.0f)) {
smokeSet(0xA328);
smokeSet(dPa_name::ID_SCENE_A328);
}
playBrkAnm();
@@ -2250,13 +2250,13 @@ BOOL daNpc_Os_c::execute() {
if(!isWaterHit()) {
onWaterHit();
JPABaseEmitter* splash = dComIfGp_particle_set(0x40, &current.pos);
JPABaseEmitter* splash = dComIfGp_particle_set(dPa_name::ID_COMMON_0040, &current.pos);
if(splash) {
splash->setRate(15.0f);
splash->setGlobalScale(splash_scale);
}
JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(0x3D, &current.pos);
JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &current.pos);
if(ripple) {
ripple->setGlobalScale(ripple_scale);
}
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -394,7 +394,7 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente
mDoMtx_stack_c::ZXYrotM(0, angle.y, 0);
mpModel[effect_idx]->setBaseTRMtx(mDoMtx_stack_c::get());
dComIfGp_particle_set(0x81A9, &pos, &angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_81A9, &pos, &angle);
}
}
src/d/actor/d_a_obj_ebomzo.cpp
+2 -2
View File
@@ -145,7 +145,7 @@ void daObjEbomzo::Act_c::check() {
r = tevStr.mColorK0.r;
g = tevStr.mColorK0.g;
b = tevStr.mColorK0.b;
mpParticleEmitter = dComIfGp_particle_set(0x828e, &current.pos, &current.angle);
mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_828E, &current.pos, &current.angle);
if (mpParticleEmitter) mpParticleEmitter->setGlobalPrmColor(r, g, b);
}
}
@@ -170,7 +170,7 @@ void daObjEbomzo::Act_c::demo() {
mpParticleEmitter = NULL;
}
dComIfGp_particle_set(0x828f, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_828F, &current.pos, &current.angle);
}
}
src/d/actor/d_a_obj_eskban.cpp
+3 -3
View File
@@ -243,8 +243,8 @@ void daObjEskban::Act_c::eff_b_break(u16 particleID) {
/* 00000D44-00000EF0 .text daObjEskban_effect_set__Q211daObjEskban5Act_cFv */
void daObjEskban::Act_c::daObjEskban_effect_set() {
eff_m_break(0x82b1, 2);
eff_b_break(0x82b2);
eff_m_break(dPa_name::ID_SCENE_82B1, 2);
eff_b_break(dPa_name::ID_SCENE_82B2);
static cXyz offset_vec(0, 250, 0);
mDoMtx_stack_c::copy(mpModel->getBaseTRMtx());
@@ -252,7 +252,7 @@ void daObjEskban::Act_c::daObjEskban_effect_set() {
if (!M_smoke) {
return;
}
JPABaseEmitter* pBEmtr = dComIfGp_particle_setToon(0x2027, &mSmokePos, NULL, NULL, 0xc8,
JPABaseEmitter* pBEmtr = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mSmokePos, NULL, NULL, 0xc8,
M_smoke, -1, NULL, NULL, NULL);
if (!pBEmtr) {
return;
src/d/actor/d_a_obj_gryw00.cpp
+4 -4
View File
@@ -42,11 +42,11 @@ BOOL daObjGryw00_c::setup_high_water_level_btk_anm() {
/* 00000168-000002D0 .text particle_set__13daObjGryw00_cFv */
void daObjGryw00_c::particle_set() {
cXyz homePos = this->home.pos;
dComIfGp_particle_set(0x8295U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
dComIfGp_particle_set(0x8297U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
mpEmitters[0] = dComIfGp_particle_set(0x8296U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
dComIfGp_particle_set(dPa_name::ID_SCENE_8295, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
dComIfGp_particle_set(dPa_name::ID_SCENE_8297, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8296, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
&tevStr.mColorK0, NULL);
mpEmitters[1] = dComIfGp_particle_set(0x8298U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_8298, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
&tevStr.mColorK0, NULL);
}
src/d/actor/d_a_obj_hha.cpp
+6 -3
View File
@@ -74,7 +74,10 @@ const HHA_RES_FILE_ID l_daObjHha_bdl_idx_table[2] = {HHA_BDL_HHA1, HHA_BDL_HHA2}
const HHA_RES_FILE_ID l_daObjHha_dzb_idx_table[2] = {HHA_DZB_HHA1, HHA_DZB_HHA2};
const HHA_RES_FILE_ID l_daObjHha_btk_idx_table[2] = {HHA_BTK_YSWTR00_01, HHA_BTK_YSWTR00_02};
const J3DFrameCtrl::Attribute_e l_daObjHha_btk_mode_table[2] = {J3DFrameCtrl::LOOP_REPEAT_e, J3DFrameCtrl::LOOP_ONCE_e};
const u16 l_daObjHha_splash_id_table[2] = {0x810D, 0x810E};
const u16 l_daObjHha_splash_id_table[] = {
dPa_name::ID_SCENE_810D,
dPa_name::ID_SCENE_810E,
};
/* 00000078-00000170 .text init_data__14daObjHhaPart_cFffUsUcUc */
void daObjHhaPart_c::init_data(float yPos, float yTar, u16 speed, u8 i, u8 isMiddle) {
@@ -169,7 +172,7 @@ void daObjHhaPart_c::draw_normal(daObjHha_c* parent) {
}
/* 0000056C-00000698 .text create_s__16daObjHhaSplash_cFUsP4cXyzffP5csXyz */
void daObjHhaSplash_c::create_s(unsigned short id, cXyz* pPos, float offsetY, float offsetZ, csXyz* pAngle) {
void daObjHhaSplash_c::create_s(u16 particleID, cXyz* pPos, float offsetY, float offsetZ, csXyz* pAngle) {
cXyz calcVec;
mPos.set(pPos->x, pPos->y + offsetY, pPos->z);
@@ -179,7 +182,7 @@ void daObjHhaSplash_c::create_s(unsigned short id, cXyz* pPos, float offsetY, fl
mPos += calcVec;
mBasePos = mPos;
mAngle = *pAngle;
dComIfGp_particle_set(id, &mPos, &mAngle, NULL, 255, &mEcallBack);
dComIfGp_particle_set(particleID, &mPos, &mAngle, NULL, 255, &mEcallBack);
bIsActive = true;
}
src/d/actor/d_a_obj_homensmoke.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ namespace daObjHomensmoke {
cMtx_multVec(mMtx, &norse_offsetS, &mSmokePos);
}
JPABaseEmitter* smokeEmitter = dComIfGp_particle_setToon(0x2027, &mSmokePos, NULL, NULL, 0xFF, &mSmokeCb, fopAcM_GetRoomNo(this));
JPABaseEmitter* smokeEmitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mSmokePos, NULL, NULL, 0xFF, &mSmokeCb, fopAcM_GetRoomNo(this));
if (smokeEmitter) {
static f32 rate_table[2] = {1.0f, 0.5f};
f32 rate = rate_table[mType & 1];
@@ -100,7 +100,7 @@ namespace daObjHomensmoke {
smokeEmitter->setGlobalParticleScale(scale);
}
JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(0x81B1, &current.pos);
JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(dPa_name::ID_SCENE_81B1, &current.pos);
if (rubbleEmitter) {
rubbleEmitter->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b);
if (mType == 1) {
src/d/actor/d_a_obj_kanat.cpp
+2 -2
View File
@@ -88,11 +88,11 @@ BOOL daObjKanat::Act_c::Execute(Mtx** pMtx) {
color.b = tevStr.mColorC0.b;
color.a = tevStr.mColorC0.a;
dComIfGp_particle_set(
0x82A2, &current.pos, &current.angle, NULL, 0xFF,
dPa_name::ID_SCENE_82A2, &current.pos, &current.angle, NULL, 0xFF,
NULL, current.roomNo, &tevStr.mColorK0, &color
);
dComIfGp_particle_setToon(
0xA2A3, &current.pos, &current.angle, NULL, 0xB4,
dPa_name::ID_SCENE_A2A3, &current.pos, &current.angle, NULL, 0xB4,
&mSmokeCb, current.roomNo, &tevStr.mColorK0, &color
);
}
src/d/actor/d_a_obj_mknjd.cpp
+4 -4
View File
@@ -591,7 +591,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
/* Particles and sound effects */
// After 1 frame, the particles for the statue splitting in half spawn.
if (mBreakTimer == 1) {
mEmitters[0] = dComIfGp_particle_set(0x8185, &current.pos, &current.angle);
mEmitters[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8185, &current.pos, &current.angle);
GXColor emitter2Color;
emitter2Color.r = tevStr.mColorC0.r;
@@ -599,9 +599,9 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
emitter2Color.b = tevStr.mColorC0.b;
emitter2Color.a = tevStr.mColorC0.a;
mEmitters[1] = dComIfGp_particle_setProjection(0x8186, &current.pos, &current.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color);
mEmitters[1] = dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8186, &current.pos, &current.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color);
mEmitters[2] = dComIfGp_particle_setToon(0xA187, &current.pos, &current.angle, NULL, 0xFF, &mSmokeCBs[2]);
mEmitters[2] = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A187, &current.pos, &current.angle, NULL, 0xFF, &mSmokeCBs[2]);
mSmokeCBs[2].setRateOff(0);
fopAcM_seStartCurrent(this, JA_SE_OBJ_SAGE_GATE_CREAK, 0);
@@ -634,7 +634,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
mBrokenPos = current.pos;
mBrokenPos.y += 350.0f;
mEmitters[3] = dComIfGp_particle_setToon(0x2027, &mBrokenPos, &current.angle, NULL, 0xFF, &mSmokeCBs[3]);
mEmitters[3] = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mBrokenPos, &current.angle, NULL, 0xFF, &mSmokeCBs[3]);
if (mEmitters[3] != NULL) {
mEmitters[3]->setVolumeSweep(0.5f);
mEmitters[3]->setLifeTime(0x2D);
src/d/actor/d_a_obj_movebox.cpp
+2 -2
View File
@@ -1523,7 +1523,7 @@ namespace daObjMovebox {
for (int i = 0; i < (int)ARRAY_SIZE(mSmokeCbs); i++) {
JPABaseEmitter* emitter = dComIfGp_particle_setToon(
0x2022, &mSmokeCbs[i].field_0x20, &mSmokeCbs[i].field_0x2C,
dPa_name::ID_COMMON_2022, &mSmokeCbs[i].field_0x20, &mSmokeCbs[i].field_0x2C,
&scl, 0xB9, &mSmokeCbs[i], fopAcM_GetRoomNo(this)
);
if (emitter) {
@@ -1720,7 +1720,7 @@ namespace daObjMovebox {
cXyz particlePos;
particlePos.set(current.pos.x, current.pos.y + 75.0f, current.pos.z);
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x3E6, &particlePos, NULL, NULL, 0xFF, NULL, -1,
dPa_name::ID_COMMON_03E6, &particlePos, NULL, NULL, 0xFF, NULL, -1,
&tevStr.mColorK0, &tevStr.mColorK0, &particle_scale
);
if (emitter) {
src/d/actor/d_a_obj_toripost.cpp
+2 -2
View File
@@ -337,7 +337,7 @@ int daObjTpost_c::getMsgXY() {
col.b = REG12_S(2) + 0x80;
mDoMtx_stack_c::copy(mMorf->getModel()->mpNodeMtx[2]);
mDoMtx_stack_c::multVec(&pos, &pos);
dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col);
dComIfGp_particle_set(dPa_name::ID_COMMON_0057, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col);
break;
case dItem_FATHER_LETTER_e:
@@ -631,7 +631,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) {
cXyz scale;
scale.setall(1.0f);
if(mMorf->getFrame() == 1.0f) {
dComIfGp_particle_set(0x8190, &current.pos, &current.angle, &scale);
dComIfGp_particle_set(dPa_name::ID_SCENE_8190, &current.pos, &current.angle, &scale);
mDoAud_seStart(JA_SE_OBJ_POST_LUGGAGE_OUT);
}
}
src/d/actor/d_a_obj_vfan.cpp
+11 -11
View File
@@ -136,17 +136,17 @@ void daObjVfan::Act_c::init_mtx() {
/* 000006BC-000009B4 .text ParticleSet__Q29daObjVfan5Act_cFv */
void daObjVfan::Act_c::ParticleSet() {
dComIfGp_particle_set(0x83cd, &current.pos, &current.angle);
dComIfGp_particle_set(0x83ce, &current.pos, &current.angle);
dComIfGp_particle_set(0x83cf, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d0, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d1, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d2, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d3, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d4, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d5, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d6, &current.pos, &current.angle);
dComIfGp_particle_set(0x83d7, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83CD, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83CE, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83CF, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D0, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D1, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D2, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D3, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D4, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D5, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D6, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_83D7, &current.pos, &current.angle);
}
/* 000009B4-00000C74 .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */
src/d/actor/d_a_obj_vgnfd.cpp
+7 -7
View File
@@ -59,12 +59,12 @@ static char* l_daObjVgnfd_break_act_name[] = {
};
static u16 l_daObjVgnfd_pt_table[] = {
0x833E,
0x833F,
0x8340,
0x8341,
0x8342,
0x8343,
dPa_name::ID_SCENE_833E,
dPa_name::ID_SCENE_833F,
dPa_name::ID_SCENE_8340,
dPa_name::ID_SCENE_8341,
dPa_name::ID_SCENE_8342,
dPa_name::ID_SCENE_8343,
};
enum {
@@ -384,7 +384,7 @@ bool daObjVgnfd_c::_execute() {
emtr->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b);
}
}
dComIfGp_particle_setToon(0xA344, &current.pos, &current.angle, &scale, 0xA0, &mSmoke);
dComIfGp_particle_setToon(dPa_name::ID_SCENE_A344, &current.pos, &current.angle, &scale, 0xA0, &mSmoke);
dComIfGp_getVibration().StartQuake(4, 11, cXyz(0.0f, 1.0f, 0.0f));
fopAcM_seStartCurrent(this, JA_SE_OBJ_B_BOSS_DR_BRK_2, 0);
break;
src/d/actor/d_a_obj_vmc.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ void daObjVmc::Act_c::init_mtx() {
/* 00000B1C-00000BD0 .text daObjVmc_base_main__Q28daObjVmc5Act_cFv */
void daObjVmc::Act_c::daObjVmc_base_main() {
if (mHasTree == 1) {
dComIfGp_particle_setToon(0xa1bc, &current.pos, &current.angle, NULL, 0xFF, &mSmoke, fopAcM_GetRoomNo(this));
dComIfGp_particle_setToon(dPa_name::ID_SCENE_A1BC, &current.pos, &current.angle, NULL, 0xFF, &mSmoke, fopAcM_GetRoomNo(this));
cLib_offBit<u32>(attention_info.flags, fopAc_Attn_UNK10000000_e);
mState = STATE_TREE_DEMO_WAIT;
shape_angle.y = fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0)) + 0x1800;
src/d/actor/d_a_pedestal.cpp
+2 -1
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_pedestal.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/res/res_hdai1.h"
@@ -309,7 +310,7 @@ BOOL daPds_c::actionMoveEvent(int) {
/* 00000AEC-00000B40 .text initialEffectSet__Q210daPedestal7daPds_cFi */
void daPds_c::initialEffectSet(int) {
mOctagonGlowCb.makeEmitter(dPa_name::ID_PEDESTAL_OCTAGON_GLOW, &current.pos, &shape_angle, NULL);
mOctagonGlowCb.makeEmitter(dPa_name::ID_SCENE_PEDESTAL_OCTAGON_GLOW, &current.pos, &shape_angle, NULL);
initBrkAnm(0, true);
}
src/d/actor/d_a_player_particle.inc
+57 -54
View File
@@ -627,7 +627,7 @@ void daPy_lk_c::setWaterRipple() {
) {
if (m3280.getEmitter() == NULL) {
dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, NULL, 0xFF, &m3280);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, NULL, 0xFF, &m3280);
}
f32 var_f1 = (0.1f * std::fabsf(getSpeedF()));
@@ -642,7 +642,7 @@ void daPy_lk_c::setWaterRipple() {
if (emitter != NULL && ((emitter->mGlobalParticleScale.x < 0.8f && checkNoResetFlg0(daPyFlg0_UNK80)) || (emitter->mGlobalParticleScale.x > 0.8f && !checkNoResetFlg0(daPyFlg0_UNK80)))) {
m3280.end();
emitter = dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, NULL, 0xFF, &m3280);
emitter = dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, NULL, 0xFF, &m3280);
}
if (emitter != NULL) {
@@ -749,7 +749,7 @@ void daPy_lk_c::setWaterRipple() {
if (((mAcch.ChkGroundHit() || checkModeFlg(ModeFlg_SWIM)) && mCurrAttributeCode == dBgS_Attr_WATERFALL_e) || (checkModeFlg(ModeFlg_HANG) && m3588 == 0x17)) {
if (m3400.getEmitter() == NULL) {
m3400.makeEmitter(0x23, mpCLModel->getAnmMtx(15), &current.pos, NULL);
m3400.makeEmitter(dPa_name::ID_COMMON_0023, mpCLModel->getAnmMtx(15), &current.pos, NULL);
JPABaseEmitter* emitter = m3400.getEmitter();
if (emitter != NULL) {
@@ -763,7 +763,7 @@ void daPy_lk_c::setWaterRipple() {
cXyz local_ac;
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &local_ac);
dComIfGp_particle_setSingleRipple(0x3F, &local_ac, NULL, (cXyz*)&waterfall_ripple_scale);
dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &local_ac, NULL, (cXyz*)&waterfall_ripple_scale);
m34CD = 15;
dComIfGp_getVibration().StartQuake(4, 1, cXyz(0.0f, 1.0f, 0.0f));
} else {
@@ -788,7 +788,7 @@ void daPy_lk_c::setWaterRipple() {
}
/* 8012B340-8012B8EC .text setFootEffectType__9daPy_lk_cFiP4cXyzii */
void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int param_3) {
void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int param_3) {
static JGeometry::TVec3<f32> run_splash_scale(0.6f, 0.6f, 0.6f);
static Vec grass_scale = {1.5f, 1.5f, 1.5f};
static JGeometry::TVec3<f32> run_grass_scale(0.65f, 0.65f, 0.65f);
@@ -812,48 +812,48 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par
footEffect->setPos(i_pos);
footEffect->setAngle(&angle);
if (param_0 == 0x23) {
if (effectID == dPa_name::ID_COMMON_0023) {
if (checkNoResetFlg0(daPyFlg0_UNK80) && m35D0 > 10.0f + i_pos->y) {
footEffect->mPos.y = m35D0 - 10.0f;
}
} else if (mCurProc == daPyProc_CUT_ROLL_e && param_0 == 0x2022) {
param_0 = -2;
} else if (mCurProc == daPyProc_CUT_ROLL_e && effectID == dPa_name::ID_COMMON_2022) {
effectID = -2;
} else if (param_3 == 5) {
param_0 = 0x2027;
effectID = dPa_name::ID_COMMON_2027;
}
s32 effectId = footEffect->getID();
if (param_0 != effectId) {
if (effectId != fpcM_ERROR_PROCESS_ID_e) {
s32 oldEffectID = footEffect->getID();
if (effectID != oldEffectID) {
if (oldEffectID != -1) {
footEffect->getSmokeCallBack()->end();
footEffect->getOtherCallBack()->end();
}
if (param_0 == -2) {
emitter = dComIfGp_particle_setP1(0x2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this));
} else if (param_0 == 0x2022 || param_0 == 0x2027) {
emitter = dComIfGp_particle_setToonP1((u16)param_0, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this));
} else if (param_0 == 0x24) {
if (effectID == -2) {
emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this));
} else if (effectID == dPa_name::ID_COMMON_2022 || effectID == dPa_name::ID_COMMON_2027) {
emitter = dComIfGp_particle_setToonP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this));
} else if (effectID == dPa_name::ID_COMMON_0024) {
GXColor color = {tevStr.mColorC0.r, tevStr.mColorC0.g, tevStr.mColorC0.b, tevStr.mColorC0.a};
emitter = dComIfGp_particle_setP1((u16)param_0, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&grass_scale, 0xFF, footEffect->getOtherCallBack(), -1, &color, &tevStr.mColorK0);
emitter = dComIfGp_particle_setP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&grass_scale, 0xFF, footEffect->getOtherCallBack(), -1, &color, &tevStr.mColorK0);
} else {
GXColor amb, dif;
dKy_get_seacolor(&amb, &dif);
emitter = dComIfGp_particle_setP1((u16)param_0, &footEffect->getPos(), &footEffect->getAngle(), NULL, 0xFF, footEffect->getOtherCallBack(), -1, &amb);
emitter = dComIfGp_particle_setP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), NULL, 0xFF, footEffect->getOtherCallBack(), -1, &amb);
}
if (emitter != NULL) {
footEffect->setID(param_0);
footEffect->setID(effectID);
}
if (param_0 == -2) {
param_0 = 0x2022;
if (effectID == -2) {
effectID = dPa_name::ID_COMMON_2022;
}
}
if (emitter != NULL) {
if (param_3 == 5) {
if (param_0 == 0x2027) {
if (effectID == dPa_name::ID_COMMON_2027) {
emitter->setLifeTime(40);
emitter->setRate(10.0f);
emitter->setEmitterScale(heavy_emit_smoke_scale);
@@ -862,7 +862,7 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par
} else {
emitter->setRate(15.0f);
emitter->setSpread(1.0f);
if (param_0 == 0x24) {
if (effectID == dPa_name::ID_COMMON_0024) {
emitter->setDirectionalSpeed(12.0f);
}
}
@@ -873,7 +873,7 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par
emitter->setRate(8.0f);
emitter->setSpread(0.3f);
} else if (param_3 == 2) {
if (param_0 == 0x24) {
if (effectID == dPa_name::ID_COMMON_0024) {
emitter->setGlobalScale(run_grass_scale);
emitter->setRate(10.0f);
emitter->setSpread(1.0f);
@@ -883,7 +883,7 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par
emitter->setSpread(1.0f);
emitter->setGlobalScale(run_splash_scale);
}
} else if (param_3 == 4 && param_0 == 0x23) {
} else if (param_3 == 4 && effectID == dPa_name::ID_COMMON_0023) {
emitter->setRate(3.0f);
emitter->setSpread(0.2f);
} else {
@@ -941,7 +941,7 @@ void daPy_lk_c::setFootEffect() {
GXColor amb, dif;
dKy_get_seacolor(&amb, &dif);
JPABaseEmitter* emitter = dComIfGp_particle_setP1(0x23, &p, NULL, NULL, 0xFF, &m3410, -1, &amb);
JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &p, NULL, NULL, 0xFF, &m3410, -1, &amb);
if (emitter != NULL) {
emitter->setLifeTime(15);
emitter->setRate(4.0f);
@@ -956,18 +956,21 @@ void daPy_lk_c::setFootEffect() {
if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0) {
if (checkResetFlg0(daPyRFlg0_UNK10)) {
if (getFootOnGround() && m35D0 <= current.pos.y) {
dComIfGp_particle_setP1(0x8237, &pos, &current.angle);
dComIfGp_particle_setP1(dPa_name::ID_SCENE_8237, &pos, &current.angle);
}
}
}
s32 temp_r3_4 = dComIfGp_particle_checkAtrCodeEffect(mCurrAttributeCode);
if (temp_r3_4 == -1) {
s32 effectID = dComIfGp_particle_checkAtrCodeEffect(mCurrAttributeCode);
if (effectID == -1) {
return;
}
s32 var_r29;
if (checkResetFlg0(daPyRFlg0_UNK10) && getFootOnGround() && (checkHeavyStateOn() || temp_r3_4 == 0x23 || temp_r3_4 == 0x24)) {
if (
checkResetFlg0(daPyRFlg0_UNK10) && getFootOnGround() &&
(checkHeavyStateOn() || effectID == dPa_name::ID_COMMON_0023 || effectID == dPa_name::ID_COMMON_0024)
) {
if (getRightFootOnGround()) {
m34BE = 2;
} else {
@@ -1011,34 +1014,34 @@ void daPy_lk_c::setFootEffect() {
pos.x = m370C.x + rnd * cM_scos(current.angle.y);
pos.y = current.pos.y;
pos.z = m370C.z - rnd * cM_scos(current.angle.y);
setFootEffectType(temp_r3_4, &pos, 0, var_r29);
setFootEffectType(effectID, &pos, 0, var_r29);
} else {
if (m34BE == 4) {
f32 rnd = cM_rndFX(17.5f);
pos.x = current.pos.x + rnd * cM_scos(current.angle.y);
pos.y = current.pos.y;
pos.z = current.pos.z - rnd * cM_scos(current.angle.y);
setFootEffectType(temp_r3_4, &pos, 0, var_r29);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (m34BE == 3) {
if (mCurrAttributeCode == dBgS_Attr_GRASS_e || mCurrAttributeCode == dBgS_Attr_WATER_e) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos);
setFootEffectType(temp_r3_4, &pos, 0, var_r29);
setFootEffectType(effectID, &pos, 0, var_r29);
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos);
setFootEffectType(temp_r3_4, &pos, 1, var_r29);
setFootEffectType(effectID, &pos, 1, var_r29);
} else {
setFootEffectType(temp_r3_4, &current.pos, 0, var_r29);
setFootEffectType(effectID, &current.pos, 0, var_r29);
}
} else if (m34BE == 1) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos);
setFootEffectType(temp_r3_4, &pos, 0, var_r29);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (m34BE == 2) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos);
setFootEffectType(temp_r3_4, &pos, 0, var_r29);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (m34BE == 5) {
setFootEffectType(temp_r3_4, &current.pos, 0, 1);
setFootEffectType(effectID, &current.pos, 0, 1);
} else if (m34BE == 6) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &pos);
@@ -1050,7 +1053,7 @@ void daPy_lk_c::setFootEffect() {
pos.y = groundY;
}
setFootEffectType(temp_r3_4, &pos, 0, 1);
setFootEffectType(effectID, &pos, 0, 1);
}
}
}
@@ -1076,12 +1079,12 @@ void daPy_lk_c::setSwimTail() {
static JGeometry::TVec3<f32> tail_scale(1.0f, 1.0f, -1.0f);
if (mSwimTailEcallBack[0].getEmitter() == NULL) {
dComIfGp_particle_setShipTail(0x3A, &mSwimTailEcallBack[0].getPos(), &current.angle, &scale, 0xFF, &mSwimTailEcallBack[0]);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[0].getPos(), &current.angle, &scale, 0xFF, &mSwimTailEcallBack[0]);
mSwimTailEcallBack[0].field_0x05 = true;
}
if (mSwimTailEcallBack[1].getEmitter() == NULL) {
dComIfGp_particle_setShipTail(0x3A, &mSwimTailEcallBack[1].getPos(), &current.angle, &scale, 0xFF, &mSwimTailEcallBack[1]);
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[1].getPos(), &current.angle, &scale, 0xFF, &mSwimTailEcallBack[1]);
}
}
@@ -1091,7 +1094,7 @@ void daPy_lk_c::setCutWaterSplash() {
cXyz pos;
mDoMtx_multVecZero(mpCLModel->getAnmMtx(4), &pos);
dComIfGp_particle_setP1(0x39, &pos);
dComIfGp_particle_setP1(dPa_name::ID_COMMON_0039, &pos);
}
}
@@ -1100,7 +1103,7 @@ void daPy_lk_c::setSwimWaterDrop(daPy_waterDropEcallBack_c* callBack) {
f32 tmp = m35D0 + 10.0f;
if (checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP) || !checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) || (callBack->getPos().y > tmp && !checkModeFlg(ModeFlg_SWIM))) {
if (callBack->getEmitter() == NULL && (callBack->field_0x1C || checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP))) {
JPABaseEmitter* emitter = dComIfGp_particle_setP1(0x38, &callBack->getPos(), NULL, NULL, 0xFF, callBack);
JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0038, &callBack->getPos(), NULL, NULL, 0xFF, callBack);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(&daPy_waterDropEcallBack_c::m_pcallback);
@@ -1143,11 +1146,11 @@ void daPy_lk_c::setWaterDrop() {
if (dKyr_player_overhead_bg_chk() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_MISC_e && mCurProc != PROC_KI && mAcch.m_roof_y == 1e9f) {
if (m3460[0].mpEmitter == NULL) {
m3460[0].makeEmitter(0x432, mpCLModel->getAnmMtx(0x0E), &current.pos, NULL);
m3460[0].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x0E), &current.pos, NULL);
}
if (m3460[1].mpEmitter == NULL) {
m3460[1].makeEmitter(0x432, mpCLModel->getAnmMtx(0x02), &current.pos, NULL);
m3460[1].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x02), &current.pos, NULL);
}
m334C.end();
@@ -1179,7 +1182,7 @@ void daPy_lk_c::setDamageFlameEmitter() {
for (int i = 0; i < (s32)ARRAY_SIZE(mDmEcallBack); i++, jointNoP++, dmECB++) {
cXyz jointPos;
mDoMtx_multVecZero(mpCLModel->getAnmMtx(*jointNoP), &jointPos);
dmECB->makeEmitter(0x3F1, mpCLModel->getAnmMtx(*jointNoP), &jointPos, NULL);
dmECB->makeEmitter(dPa_name::ID_COMMON_03F1, mpCLModel->getAnmMtx(*jointNoP), &jointPos, NULL);
if (dmECB->getEmitter() == NULL) {
continue;
}
@@ -1197,7 +1200,7 @@ void daPy_lk_c::setDamageCurseEmitter() {
if (!daPy_dmEcallBack_c::checkCurse()) {
endDamageEmitter();
mDmEcallBack[0].makeEmitter(0x815B, mpCLModel->getAnmMtx(0x1E), &current.pos, NULL);
mDmEcallBack[0].makeEmitter(dPa_name::ID_SCENE_815B, mpCLModel->getAnmMtx(0x1E), &current.pos, NULL);
if (checkUpperReadyThrowAnime()) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
@@ -1214,8 +1217,8 @@ void daPy_lk_c::setDamageElecEmitter() {
if (!daPy_dmEcallBack_c::checkElec()) {
endDamageEmitter();
mDmEcallBack[0].makeEmitter(0x3ED, mpCLModel->getAnmMtx(4), &current.pos, NULL);
mDmEcallBack[1].makeEmitter(0x3EE, mpCLModel->getAnmMtx(4), &current.pos, NULL);
mDmEcallBack[0].makeEmitter(dPa_name::ID_COMMON_03ED, mpCLModel->getAnmMtx(4), &current.pos, NULL);
mDmEcallBack[1].makeEmitter(dPa_name::ID_COMMON_03EE, mpCLModel->getAnmMtx(4), &current.pos, NULL);
}
daPy_dmEcallBack_c::setElec(daPy_HIO_elecDamage_c0::m.field_0x2);
@@ -1245,7 +1248,7 @@ void daPy_lk_c::endFlameDamageEmitter() {
mDoMtx_multVecZero(mDmEcallBack[i].mpMtx, &pos);
pos.y = m35D0;
dComIfGp_particle_set(0x35A, &pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_035A, &pos);
}
}
@@ -1290,12 +1293,12 @@ u32 daPy_lk_c::setItemWaterEffect(fopAc_ac_c* i_actor, int param_1, int param_2)
pos = i_actor->old.pos * var_f31 + i_actor->current.pos * (1.0f - var_f31);
}
dComIfGp_particle_setSingleRipple(0x3D, &pos, NULL, &eff_scale0);
dComIfGp_particle_setSingleRipple(0x3F, &pos, NULL, &eff_scale0);
dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &pos, NULL, &eff_scale0);
dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &pos, NULL, &eff_scale0);
GXColor amb, dif;
dKy_get_seacolor(&amb, &dif);
JPABaseEmitter* emitter = dComIfGp_particle_setP1(0x23, &pos, NULL, &eff_scale2, 0xFF, NULL, -1, &amb);
JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &pos, NULL, &eff_scale2, 0xFF, NULL, -1, &amb);
if (emitter != NULL) {
emitter->setMaxFrame(1);
src/d/actor/d_a_player_tact.inc
+3 -3
View File
@@ -277,7 +277,7 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
initShipRideUseItem(r31, 2);
m34D2 = -1;
m32E4.makeEmitter(0x50, mpEquipItemModel->getBaseTRMtx(), &current.pos, NULL);
m32E4.makeEmitter(dPa_name::ID_COMMON_0050, mpEquipItemModel->getBaseTRMtx(), &current.pos, NULL);
m3570 = r30;
m34D8 = 0;
m3574 = -1;
@@ -549,7 +549,7 @@ BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) {
}
}
m32E4.makeEmitter(0x51, mpEquipItemModel->getBaseTRMtx(), &current.pos, NULL);
m32E4.makeEmitter(dPa_name::ID_COMMON_0051, mpEquipItemModel->getBaseTRMtx(), &current.pos, NULL);
m34D0 = 0;
m3574 = r30;
m3624 = 0;
@@ -793,7 +793,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() {
mDoAud_tact_setStickPos(m3570, m3574);
mDoAud_tact_playArmSwing(m3570, m3574);
setTactModel();
m32E4.makeEmitter(0x51, mpEquipItemModel->getBaseTRMtx(), &current.pos, NULL);
m32E4.makeEmitter(dPa_name::ID_COMMON_0051, mpEquipItemModel->getBaseTRMtx(), &current.pos, NULL);
m34D6 = 0xF;
m34DA = 0;
mDoAud_taktModeMute();
src/d/actor/d_a_pw.cpp
+1 -1
View File
@@ -202,7 +202,7 @@ void action_dousa(pw_class* i_this) {
i_this->m3A4 = 0.0f;
first_mode_change(i_this);
i_this->m38C = fopAcM_searchPlayerAngleY(i_this);
JPABaseEmitter* particle = dComIfGp_particle_set(0x82EE, &i_this->m2CC, &i_this->shape_angle);
JPABaseEmitter* particle = dComIfGp_particle_set(dPa_name::ID_SCENE_82EE, &i_this->m2CC, &i_this->shape_angle);
if (particle != NULL) {
particle->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(0x17)); // j_pw_item_r1 joint
}
src/d/actor/d_a_rd.cpp
+1 -1
View File
@@ -623,7 +623,7 @@ bool daRd_c::checkTgHit() {
cXyz* hitPos = mCyl.GetTgHitPosP();
cc_at_check(this, &atInfo);
if (mHitType == 1 || mHitType == 7 || mHitType == 8 || health <= 0) {
dComIfGp_particle_set(0x10, mCyl.GetTgHitPosP());
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, mCyl.GetTgHitPosP());
cXyz scale(2.0f, 2.0f, 2.0f);
dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, hitPos, &player->shape_angle, &scale);
if (health <= 0) {
src/d/actor/d_a_steam_tag.cpp
+2 -2
View File
@@ -93,9 +93,9 @@ BOOL daSteamTag_c::createEmitter() {
if (mEmitterNum < 8) {
u16 particleID;
if (((s16)cM_rndF(100.0f) % 2) != 0) {
particleID = 0x808B;
particleID = dPa_name::ID_SCENE_808B;
} else {
particleID = 0x808C;
particleID = dPa_name::ID_SCENE_808C;
}
mpEmitter = dComIfGp_particle_setToon(particleID, &current.pos, &current.angle, &scale, getData()->steam_alpha);
if (mpEmitter) {
src/d/actor/d_a_syan.cpp
+2 -2
View File
@@ -139,7 +139,7 @@ static BOOL daSyan_Execute(syan_class* i_this) {
if (!i_this->emtrEnabled[i]) {
i_this->emtrEnabled[i] = true;
static cXyz fire_scale(0.7f, 0.7f, 0.7f);
dComIfGp_particle_set(0x1ea, &i_this->partPos[i], NULL, &fire_scale, 0xFF, &i_this->emtrCallBack[i]);
dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->partPos[i], NULL, &fire_scale, 0xFF, &i_this->emtrCallBack[i]);
} else {
JPABaseEmitter* emtr = i_this->emtrCallBack[i].getEmitter();
if (emtr != NULL) {
@@ -162,7 +162,7 @@ static BOOL daSyan_Execute(syan_class* i_this) {
i_this->emtrCallBack[i].getEmitter()->setGlobalParticleScale(scale);
cXyz pos(i_this->partPos[i].x, i_this->partPos[i].y + REG0_F(7) + 20.0f, i_this->partPos[i].z);
dComIfGp_particle_setSimple(0x4004, &pos, 0xFF, g_whiteColor, g_whiteColor, 0);
dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &pos, 0xFF, g_whiteColor, g_whiteColor, 0);
}
}
}
src/d/actor/d_a_tbox.cpp
+13 -13
View File
@@ -672,14 +672,14 @@ void daTbox_c::demoInitAppear_Tact() {
angle.y = current.angle.y;
angle.z = current.angle.z;
dComIfGp_particle_set(0x82F1, &current.pos, &angle);
dComIfGp_particle_set(0x82F0, &current.pos, &angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_82F1, &current.pos, &angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, &current.pos, &angle);
angle.y += 0x5555;
dComIfGp_particle_set(0x82F0, &current.pos, &angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, &current.pos, &angle);
angle.y += 0x5555;
dComIfGp_particle_set(0x82F0, &current.pos, &angle);
dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, &current.pos, &angle);
fopAcM_seStart(this, JA_SE_OBJ_TRIFORCE_BOX_IN, 0);
}
@@ -688,8 +688,8 @@ void daTbox_c::demoInitAppear_Tact() {
void daTbox_c::demoInitAppear() {
fopAcM_seStart(this, JA_SE_OBJ_KOUBAKU_TBOX, 0);
dComIfGp_particle_set(0x3EB, &current.pos);
dComIfGp_particle_set(0x3EC, &current.pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_03EB, &current.pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_03EC, &current.pos);
}
/* 00001B38-00001CF4 .text demoProcAppear_Tact__8daTbox_cFv */
@@ -735,7 +735,7 @@ void daTbox_c::demoProcAppear() {
}
if (mAppearTimer == 0x05) {
JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, &current.pos, NULL, NULL, 0xB9, &mSmokeCB);
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &current.pos, NULL, NULL, 0xB9, &mSmokeCB);
if (emitter != NULL) {
emitter->setRate(100.0f);
@@ -896,13 +896,13 @@ void daTbox_c::OpenInit() {
flagOn(daTboxFlg_OPENING_e);
dComIfGp_particle_set(0x01F1, &current.pos, &current.angle);
dComIfGp_particle_set(0x01F2, &current.pos, &current.angle);
dComIfGp_particle_set(0x01F3, &current.pos, &current.angle);
dComIfGp_particle_set(0x01F4, &current.pos, &current.angle);
dComIfGp_particle_set(0x01F6, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_01F1, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_01F2, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_01F3, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_01F4, &current.pos, &current.angle);
dComIfGp_particle_set(dPa_name::ID_COMMON_01F6, &current.pos, &current.angle);
mSmokeEmitter = dComIfGp_particle_set(0x01F5, &current.pos, &current.angle);
mSmokeEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_01F5, &current.pos, &current.angle);
if (mSmokeEmitter != NULL) {
mSmokeEmitter->mGlobalPrmColor.a = 0;
}
src/d/actor/d_a_title.cpp
+4 -4
View File
@@ -243,7 +243,7 @@ void daTitle_proc_c::calc_2d_alpha() {
0.0f
);
mpEmitter = dComIfGp_particle_set2Dback(0x83F9, &pos);
mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83F9, &pos);
} else {
pos.set(
((this->pane[4].mPosTopLeftOrig.x - 320.0f) - this->m094) + attr().field_0x30,
@@ -284,7 +284,7 @@ void daTitle_proc_c::calc_2d_alpha() {
m00C.set(pane[4].mPosTopLeftOrig.x - 320.0f, pane[4].mPosTopLeftOrig.y - 240.0f, 0.0f);
mpEmitter2 = dComIfGp_particle_set2Dfore(0x83FB, &m00C);
mpEmitter2 = dComIfGp_particle_set2Dfore(dPa_name::ID_SCENE_83FB, &m00C);
} else if (m018 > 80 && m018 <= 115 && mpEmitter2 != NULL) {
m00C.x += (pane[5].mPosTopLeftOrig.x - pane[4].mPosTopLeftOrig.x) / 35.0f;
@@ -314,7 +314,7 @@ void daTitle_proc_c::calc_2d_alpha() {
} else {
if (mpEmitter == NULL) {
pos.set(pane[4].mPosTopLeftOrig.x - 320.0f, pane[4].mPosTopLeftOrig.y - 240.0f, 0.0f);
mpEmitter = dComIfGp_particle_set2Dback(0x83F9, &pos);
mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83F9, &pos);
} else {
pos.set(
((pane[4].mPosTopLeftOrig.x - 320.0f) - m094) + attr().field_0x30,
@@ -357,7 +357,7 @@ void daTitle_proc_c::calc_2d_alpha() {
angle.y = 0;
angle.z = (s16)cM_rndFX(4000.0f);
dComIfGp_particle_set2Dback(0x83FA, &pos, &angle);
dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83FA, &pos, &angle);
} else {
m020 -= 1;
}
src/d/actor/d_a_tornado.cpp
+2 -2
View File
@@ -176,7 +176,7 @@ BOOL daTornado_c::execute() {
mPtclTimer -= 1;
} else {
mPtclTimer = 10;
dComIfGp_particle_set(0x8213, &current.pos, NULL, (cXyz*)&wind_scale);
dComIfGp_particle_set(dPa_name::ID_SCENE_8213, &current.pos, NULL, (cXyz*)&wind_scale);
}
fopAcM_seStartCurrent(this, JA_SE_OBJ_TORNADE_SUS, 100);
@@ -322,7 +322,7 @@ s32 daTornado_c::create() {
dKyw_tornado_Notice(&current.pos);
mpModelUnder->setBaseScale(under_scale);
mCenter = current.pos;
dComIfGp_particle_set(0x81bb, &mCenter, NULL, NULL, 0xFF, &mPtclCb);
dComIfGp_particle_set(dPa_name::ID_SCENE_81BB, &mCenter, NULL, NULL, 0xFF, &mPtclCb);
fopAcM_OnStatus(this, fopAcStts_SHOWMAP_e);
}
mDoMtx_stack_c::transS(current.pos);
src/d/actor/d_a_wall.cpp
+10 -2
View File
@@ -263,8 +263,16 @@ void daWall_c::set_tri() {
/* 00000D84-00000F74 .text set_effect__8daWall_cFv */
void daWall_c::set_effect() {
u16 projection_id[3] = {0xa16e, 0xa170, 0xa172};
u16 particle_id[3] = {0xa16f, 0xa171, 0xa173};
u16 projection_id[] = {
dPa_name::ID_SCENE_A16E,
dPa_name::ID_SCENE_A170,
dPa_name::ID_SCENE_A172,
};
u16 particle_id[] = {
dPa_name::ID_SCENE_A16F,
dPa_name::ID_SCENE_A171,
dPa_name::ID_SCENE_A173,
};
csXyz local_28 = current.angle;
local_28.y += 0x8000;
src/d/actor/d_a_warpfout.cpp
+2 -2
View File
@@ -141,7 +141,7 @@ void daWarpfout_c::initWarp4(int) {
fopAc_ac_c* link = dComIfGp_getLinkPlayer();
for (int i = 0; i < 6; i++) {
dComIfGp_particle_set(dPa_name::ID_WARPFOUT_WARP4, &link->current.pos);
dComIfGp_particle_set(dPa_name::ID_SCENE_WARPFOUT_WARP4, &link->current.pos);
}
}
@@ -164,7 +164,7 @@ void daWarpfout_c::set_effect_wind01(cXyz effectPos, s16 effectAngleZOffset) {
csXyz effectAngle = get_effect_angle();
effectAngle.z += effectAngleZOffset;
dComIfGp_particle_set(0x830f, &effectPos, &effectAngle);
dComIfGp_particle_set(dPa_name::ID_SCENE_830F, &effectPos, &effectAngle);
}
/* 000005F4-00000670 .text get_effect_angle__12daWarpfout_cFv */
src/d/actor/d_a_wind_tag.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ void daWindTag::daWindTag_c::CreateInit() {
mEfColor.g = mEfTevStr.mColorC0.g;
mEfColor.b = mEfTevStr.mColorC0.b;
mEfColor.a = mEfTevStr.mColorC0.a;
mpEmitter = dComIfGp_particle_set(0x8290, &current.pos, NULL, &scale, 0xFF, NULL, fopAcM_GetRoomNo(this), &mEfColor);
mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8290, &current.pos, NULL, &scale, 0xFF, NULL, fopAcM_GetRoomNo(this), &mEfColor);
if (mpEmitter != NULL)
mpEmitter->setGlobalScale(efScale);
}
src/d/actor/d_a_ygcwp.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void daYgcwp_c::init_mtx() {
/* 00000588-000005F0 .text make_shine__9daYgcwp_cFv */
void daYgcwp_c::make_shine() {
dComIfGp_particle_set(0x8316, &current.pos, NULL, &scale);
dComIfGp_particle_set(dPa_name::ID_SCENE_8316, &current.pos, NULL, &scale);
}
/* 000005F0-00000654 .text set_timer__9daYgcwp_cFv */
src/d/d_a_leaflift_static.cpp
+2 -2
View File
@@ -32,11 +32,11 @@ BOOL daLlift_c::MoveUpLift() {
else if ((upVel != 0.0f) && (mbIsAscending == FALSE)) {
fopAcM_seStart(this, JA_SE_OBJ_LOTUS_LIFT_UP, 0);
mbIsAscending = TRUE;
mEmitter1 = dComIfGp_particle_set(0x82AC, &current.pos, &current.angle);
mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AC, &current.pos, &current.angle);
mEmitter2 = NULL;
upLiftPos = current.pos;
upLiftPos.y = mWaterY;
mEmitter4 = dComIfGp_particle_set(0x82AB, &upLiftPos, &current.angle);
mEmitter4 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AB, &upLiftPos, &current.angle);
mEmitterTimer = 0;
if (mEmitter3) {
mEmitter3->stopCreateParticle();
src/d/d_a_obj.cpp
+2 -2
View File
@@ -19,7 +19,7 @@ namespace daObj {
case dBgS_Attr_WATER_e:
{
scaleV.setall(scale * 0.85f);
JPABaseEmitter* pEmtr = dComIfGp_particle_set(0x23, &ac->current.pos, NULL, &scaleV);
JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_COMMON_0023, &ac->current.pos, NULL, &scaleV);
if (pEmtr != NULL) {
pEmtr->setRate(20.0f);
pEmtr->setMaxFrame(1);
@@ -31,7 +31,7 @@ namespace daObj {
case dBgS_Attr_GRASS_e:
{
scaleV.setall(scale);
JPABaseEmitter* pEmtr = dComIfGp_particle_set(0x24, &ac->current.pos, NULL, &scaleV);
JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_COMMON_0024, &ac->current.pos, NULL, &scaleV);
if (pEmtr != NULL) {
pEmtr->setLifeTime(20);
pEmtr->setRate(50.0f);
src/d/d_cc_s.cpp
+1 -1
View File
@@ -315,7 +315,7 @@ void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* atObj, cCcD_Obj* tgObj, dCcD_GO
csXyz angle;
CalcParticleAngle(atInf, atStts, tgStts, &angle);
if (atInf->GetAtHitMark() == dCcG_AtHitMark_Big_e) {
dComIfGp_particle_set(0x10, pos);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, pos);
cXyz scale;
scale.x = scale.y = scale.z = 2.0f;
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle, &scale);
src/d/d_cc_uty.cpp
+1 -1
View File
@@ -226,7 +226,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
pauseTime = 6 + g_regHIO.mChild->mShortRegs[7];
if (atInfo->pParticlePos) {
dComIfGp_particle_set(0x10, atInfo->pParticlePos);
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, atInfo->pParticlePos);
cXyz scale;
scale.x = scale.y = scale.z = 2.0f;
csXyz angle;
src/d/d_door.cpp
+1 -1
View File
@@ -384,7 +384,7 @@ void dDoor_info_c::setPosAndAngle(cXyz* pPos, s16 angle) {
void dDoor_smoke_c::smokeInit(dDoor_info_c* door) {
mPos = door->current.pos;
mRot.y = door->shape_angle.y;
JPABaseEmitter* emtr = dComIfGp_particle_set(0x2022, &mPos, &mRot, NULL, 0xAA, &mSmokeCb, fopAcM_GetRoomNo(door));
JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2022, &mPos, &mRot, NULL, 0xAA, &mSmokeCb, fopAcM_GetRoomNo(door));
m34 = 0;
m35 = 0;
if (emtr != NULL) {
src/d/d_gameover.cpp
+3 -3
View File
@@ -264,7 +264,7 @@ BOOL dDlst_GameOverScrnDraw_c::animeOpen() {
anime1(i);
if (letter[i].mUserArea == 5) {
cXyz temp(x[i], 50.0f, 0.0f);
dComIfGp_particle_set2Dfore(0x2E, &temp);
dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002E, &temp);
}
}
@@ -326,12 +326,12 @@ BOOL dDlst_GameOverScrnDraw_c::animeClose() {
/* 8018F05C-8018F0CC .text setEmitter0__24dDlst_GameOverScrnDraw_cF4cXyz */
void dDlst_GameOverScrnDraw_c::setEmitter0(cXyz pos) {
mpEmitter0 = dComIfGp_particle_set2Dfore(0x2f, &pos);
mpEmitter0 = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002F, &pos);
}
/* 8018F0CC-8018F13C .text setEmitter1__24dDlst_GameOverScrnDraw_cF4cXyz */
void dDlst_GameOverScrnDraw_c::setEmitter1(cXyz pos) {
mpEmitter1 = dComIfGp_particle_set2DmenuFore(0x30, &pos);
mpEmitter1 = dComIfGp_particle_set2DmenuFore(dPa_name::ID_COMMON_0030, &pos);
}
/* 8018F13C-8018F334 .text anime1__24dDlst_GameOverScrnDraw_cFi */
src/d/d_grass.cpp
+5 -5
View File
@@ -47,7 +47,7 @@ static bool l_CutSoundFlag;
/* 80077048-8007712C .text setBatta__FP4cXyzP8_GXColor */
void setBatta(cXyz* pos, GXColor* color) {
if (!dKy_rain_check() && !dComIfGp_event_runCheck() && strncmp(dComIfGp_getStartStageName(), "kin", 3) != 0 && strcmp(dComIfGp_getStartStageName(), "Xboss1") != 0 && cM_rnd() > 0.99f)
dComIfGp_particle_set(0x453, pos, NULL, NULL, 0xFF, NULL, -1, color, color);
dComIfGp_particle_set(dPa_name::ID_COMMON_0453, pos, NULL, NULL, 0xFF, NULL, -1, color, color);
}
/* 8007712C-8007734C .text WorkCo__13dGrass_data_cFP10fopAc_ac_cUli */
@@ -230,8 +230,8 @@ dGrass_packet_c::dGrass_packet_c() {
mDLSize = 0xa0;
mpDLCut = l_Vmori_01DL;
mDLCutSize = 0x80;
mCoParticle = 0x8222;
mAtParticle = 0x8221;
mCoParticle = dPa_name::ID_SCENE_8222;
mAtParticle = dPa_name::ID_SCENE_8221;
} else {
mpPosArr = (f32*)l_pos;
mpColorArr = l_color;
@@ -242,8 +242,8 @@ dGrass_packet_c::dGrass_packet_c() {
mDLSize = 0xa0;
mpDLCut = l_Oba_kusa_a_cutDL;
mDLCutSize = 0x80;
mCoParticle = 0x03db;
mAtParticle = 0x03da;
mCoParticle = dPa_name::ID_COMMON_03DB;
mAtParticle = dPa_name::ID_COMMON_03DA;
}
}
src/d/d_item_data.cpp
+17 -17
View File
@@ -9818,48 +9818,48 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
dItem_data_effect_info dItem_data::effect_info[] = {
{
// 0x00: dItem_HEART_e
0x0002,
dPa_name::ID_COMMON_0002,
dPa_name::ID_SCENE_END,
},
{
// 0x01: dItem_GREEN_RUPEE_e
0x0003,
dPa_name::ID_COMMON_0003,
dPa_name::ID_SCENE_END,
},
{
// 0x02: dItem_BLUE_RUPEE_e
0x0003,
dPa_name::ID_COMMON_0003,
dPa_name::ID_SCENE_END,
},
{
// 0x03: dItem_YELLOW_RUPEE_e
0x0003,
dPa_name::ID_COMMON_0003,
dPa_name::ID_SCENE_END,
},
{
// 0x04: dItem_RED_RUPEE_e
0x0003,
dPa_name::ID_COMMON_0003,
dPa_name::ID_SCENE_END,
},
{
// 0x05: dItem_PURPLE_RUPEE_e
0x0003,
dPa_name::ID_COMMON_0003,
dPa_name::ID_SCENE_END,
},
{
// 0x06: dItem_ORANGE_RUPEE_e
0x0002,
dPa_name::ID_COMMON_0002,
dPa_name::ID_SCENE_END,
},
{
// 0x07: dItem_HEART_PIECE_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x08: dItem_HEART_CONTAINER_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x09: dItem_SMALL_MAGIC_e
@@ -9923,7 +9923,7 @@ dItem_data_effect_info dItem_data::effect_info[] = {
},
{
// 0x15: dItem_SMALL_KEY_e
0x0003,
dPa_name::ID_COMMON_0003,
dPa_name::ID_SCENE_END,
},
{
@@ -10164,37 +10164,37 @@ dItem_data_effect_info dItem_data::effect_info[] = {
{
// 0x45: dItem_SKULL_NECKLACE_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x46: dItem_BOKOBABA_SEED_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x47: dItem_GOLDEN_FEATHER_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x48: BOKO_BELT
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x49: dItem_RED_JELLY_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x4A: dItem_GREEN_JELLY_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x4B: dItem_BLUE_JELLY_e
dPa_name::ID_SCENE_END,
0x0293,
dPa_name::ID_COMMON_0293,
},
{
// 0x4C: dItem_MAP_e
src/d/d_kankyo_rain.cpp
+2 -2
View File
@@ -142,7 +142,7 @@ void dKyr_kamome_move() {
pWind->mKamomeEff[i].mAngleYSpeed = cM_rndFX(1.0f);
pWind->mKamomeEff[i].mScale = 0.0f;
pWind->mKamomeEff[i].mTimer = 300.0f + cM_rndF(180.0f);
pWind->mKamomeEff[i].mpEmitter = dComIfGp_particle_set(0x429, &pWind->mKamomeEff[i].mPos);
pWind->mKamomeEff[i].mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0429, &pWind->mKamomeEff[i].mPos);
pWind->mKamomeEff[i].mStatus++;
} else {
pWind->mKamomeEff[i].mTimer--;
@@ -366,7 +366,7 @@ void dKyr_wind_move() {
pos.y = windEff.mBasePos.y + windEff.mPos.y;
pos.z = windEff.mBasePos.z + windEff.mPos.z;
windEff.mpEmitter = dComIfGp_particle_set(0x31, &pos);
windEff.mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0031, &pos);
if (windEff.mpEmitter != NULL) {
windEff.mpEmitter->setGlobalAlpha(0);
windEff.mpEmitter->setGlobalScale(JGeometry::TVec3<f32>(fVar23, fVar23, fVar23));
src/d/d_metronome.cpp
+2 -2
View File
@@ -339,14 +339,14 @@ void dMetronome_c::melodyShow() {
pos.y = pane_wn[mBeat - 1].mPosCenter.y - 240.0f;
}
dComIfGp_particle_set2Dfore(0x23e, &pos);
dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_023E, &pos);
if (daPy_getPlayerLinkActorClass()->getTactTopPos(&tactTop)) {
mDoLib_project(&tactTop, &sparklePos);
sparklePos.x -= 320.0f;
sparklePos.y -= 240.0f;
mpEmitter = dComIfGp_particle_set2Dfore(0x23f, &sparklePos);
mpEmitter = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_023F, &sparklePos);
mpEmitter->becomeImmortalEmitter();
}
src/d/d_particle.cpp
+14 -14
View File
@@ -486,12 +486,12 @@ void dPa_simpleEcallBack::draw(JPABaseEmitter* emtr) {
}
/* 8007C6EC-8007C774 .text create__19dPa_simpleEcallBackFP17JPAEmitterManagerUsUc */
JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* manager, u16 param_2, u8 param_3) {
JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* manager, u16 effectID, u8 param_3) {
mpBaseEmitter = NULL;
mGrpID = param_3;
mResID = param_2;
mResID = effectID;
if (createEmitter(manager)) {
if (param_2 == 0xa06a || param_2 == 0xa410) {
if (effectID == dPa_name::ID_SCENE_A06A || effectID == dPa_name::ID_SCENE_A410) {
mbIsSmoke = true;
mpBaseEmitter->mpParticleCallBack = &dPa_control_c::mSmokePcallback;
} else {
@@ -787,7 +787,7 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs
}
JPABaseEmitter* emtr = NULL;
if (*i_return_id == 0x23) {
if (*i_return_id == dPa_name::ID_COMMON_0023) {
if (flag & 0x04) {
cXyz ptclScale(scale3, scale3, scale3);
dKy_get_seacolor(&amb, &dif);
@@ -797,7 +797,7 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs
emtr = setNormal(*i_return_id, pos, angle, &ptclScale, 0xFF, NULL, -1, &amb, NULL, NULL);
}
}
} else if (*i_return_id == 0x24) {
} else if (*i_return_id == dPa_name::ID_COMMON_0024) {
if (flag & 0x02) {
cXyz ptclScale(scale2, scale2, scale2);
@@ -812,9 +812,9 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs
emtr = setNormal(*i_return_id, pos, angle, &ptclScale, 0xFF, NULL, -1, &amb, &i_tevStr->mColorK0, NULL);
}
}
} else if (*i_return_id == 0x2022) {
} else if (*i_return_id == dPa_name::ID_COMMON_2022) {
if (flag & 0x08)
*i_return_id = 0x2027;
*i_return_id = dPa_name::ID_COMMON_2027;
if (flag & 0x09) {
cXyz ptclScale(scale1, scale1, scale1);
@@ -836,9 +836,9 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs
}
/* 8007D998-8007DA58 .text setSimpleLand__13dPa_control_cFR13cBgS_PolyInfoPC4cXyzPC5csXyzfffP12dKy_tevstr_cPii */
JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz* pos, const csXyz* angle, f32 scale1, f32 scale2, f32 scale3, dKy_tevstr_c* i_tevStr, int* i_return_code, int flag) {
JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz* pos, const csXyz* angle, f32 scale1, f32 scale2, f32 scale3, dKy_tevstr_c* i_tevStr, int* i_return_id, int flag) {
if (dComIfG_Bgsp()->ChkPolySafe(polyInfo)) {
return setSimpleLand(dComIfG_Bgsp()->GetAttributeCode(polyInfo), pos, angle, scale1, scale2, scale3, i_tevStr, i_return_code, flag);
return setSimpleLand(dComIfG_Bgsp()->GetAttributeCode(polyInfo), pos, angle, scale1, scale2, scale3, i_tevStr, i_return_id, flag);
}
return NULL;
}
@@ -846,11 +846,11 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz
/* 8007DA58-8007DAA8 .text checkAtrCodeEffect__13dPa_control_cFi */
s32 dPa_control_c::checkAtrCodeEffect(int code) {
if (code == dBgS_Attr_WATER_e) {
return 0x23;
return dPa_name::ID_COMMON_0023;
} else if (code == dBgS_Attr_GRASS_e) {
return 0x24;
return dPa_name::ID_COMMON_0024;
} else if (code != dBgS_Attr_UNK1B_e && code != dBgS_Attr_ICE_e && code != dBgS_Attr_GIANT_FLOWER_e && code != dBgS_Attr_CARPET_e) {
return 0x2022;
return dPa_name::ID_COMMON_2022;
} else {
return -1;
}
@@ -865,13 +865,13 @@ JPABaseEmitter* dPa_control_c::setNormalStripes(u16 ptclID, const cXyz* pos, con
}
/* 8007DB34-8007DBC4 .text newSimple__13dPa_control_cFUsUc */
bool dPa_control_c::newSimple(u16 param_1, u8 param_2) {
bool dPa_control_c::newSimple(u16 effectID, u8 param_2) {
/* Nonmatching */
if (mNumSimple >= 25) {
OSReport("\x1b[43;30m１エミッター登録数オーバー！！\n");
return false;
}
JPABaseEmitter* emitter = mSimpleCallbacks[mNumSimple].create(mEmitterMng, param_1, param_2);
JPABaseEmitter* emitter = mSimpleCallbacks[mNumSimple].create(mEmitterMng, effectID, param_2);
if (!emitter) {
return false;
}
src/d/d_particle_name.cpp
+42 -11
View File
@@ -7,19 +7,50 @@
namespace dPa_name {
u16 j_o_id[] = {
0x0000, 0x0001, 0x0002, 0x0003,
0x03DA, 0x03DB, 0x03DC, 0x4004,
dPa_name::ID_NONE,
dPa_name::ID_COMMON_0001,
dPa_name::ID_COMMON_0002,
dPa_name::ID_COMMON_0003,
dPa_name::ID_COMMON_03DA,
dPa_name::ID_COMMON_03DB,
dPa_name::ID_COMMON_03DC,
dPa_name::ID_COMMON_4004,
};
u16 s_o_id[] = {
0x8058, 0x8059, 0x805A, 0x805B,
0x805C, 0x8221, 0x8222, 0x8060,
0x8061, 0x8062, 0x8063, 0x8064,
0x8065, 0x8066, 0x8067, 0x8068,
0x8069, 0x81D5, 0x8240, 0x8241,
0x8306, 0x8407, 0x8408, 0x8409,
0x8443, 0x840A, 0x840B, 0x840C,
0x840D, 0x840E, 0x840F, 0xA410,
0xA06A, 0xC06B,
dPa_name::ID_SCENE_8058,
dPa_name::ID_SCENE_8059,
dPa_name::ID_SCENE_805A,
dPa_name::ID_SCENE_805B,
dPa_name::ID_SCENE_805C,
dPa_name::ID_SCENE_8221,
dPa_name::ID_SCENE_8222,
dPa_name::ID_SCENE_8060,
dPa_name::ID_SCENE_8061,
dPa_name::ID_SCENE_8062,
dPa_name::ID_SCENE_8063,
dPa_name::ID_SCENE_8064,
dPa_name::ID_SCENE_8065,
dPa_name::ID_SCENE_8066,
dPa_name::ID_SCENE_8067,
dPa_name::ID_SCENE_8068,
dPa_name::ID_SCENE_8069,
dPa_name::ID_SCENE_81D5,
dPa_name::ID_SCENE_8240,
dPa_name::ID_SCENE_8241,
dPa_name::ID_SCENE_8306,
dPa_name::ID_SCENE_8407,
dPa_name::ID_SCENE_8408,
dPa_name::ID_SCENE_8409,
dPa_name::ID_SCENE_8443,
dPa_name::ID_SCENE_840A,
dPa_name::ID_SCENE_840B,
dPa_name::ID_SCENE_840C,
dPa_name::ID_SCENE_840D,
dPa_name::ID_SCENE_840E,
dPa_name::ID_SCENE_840F,
dPa_name::ID_SCENE_A410,
dPa_name::ID_SCENE_A06A,
dPa_name::ID_SCENE_C06B,
};
}
src/d/d_wood.cpp
+1 -1
View File
@@ -777,7 +777,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) {
g_env_light.settingTevStruct(TEV_TYPE_BG0, &mPos, &mTevStr);
// Spawn cut down particles (a bunch of leaves)
dComIfGp_particle_set(dPa_name::ID_CUT_L_TREE_DOWN, &mPos, NULL,
dComIfGp_particle_set(dPa_name::ID_COMMON_CUT_L_TREE_DOWN, &mPos, NULL,
NULL, 0xff, NULL, -1, &mTevStr.mColorK0,
NULL, NULL);
src/d/d_wpot_water.cpp
+3 -3
View File
@@ -61,9 +61,9 @@ static BOOL dWpotWater_Delete(dWpotWater_c* i_this) {
s32 dWpotWater_c::create() {
new(this) dWpotWater_c();
dComIfGp_particle_set(0x8083, &mPos);
dComIfGp_particle_set(0x8084, &mPos);
emtr = dComIfGp_particle_set(0x8086, &mPos, NULL, NULL, 0xAA, &dWpotWater_c::mEcallback);
dComIfGp_particle_set(dPa_name::ID_SCENE_8083, &mPos);
dComIfGp_particle_set(dPa_name::ID_SCENE_8084, &mPos);
emtr = dComIfGp_particle_set(dPa_name::ID_SCENE_8086, &mPos, NULL, NULL, 0xAA, &dWpotWater_c::mEcallback);
if (emtr == NULL) {
return cPhs_ERROR_e;
} else {
src/f_op/f_op_kankyo_mng.cpp
+1 -1
View File
@@ -98,6 +98,6 @@ int fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) {
scale.x = i_size;
scale.y = i_size;
scale.z = i_size;
dComIfGp_particle_set(0x80d5, i_pos, NULL, &scale);
dComIfGp_particle_set(dPa_name::ID_SCENE_80D5, i_pos, NULL, &scale);
return -1;
}