mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace particle enums with official names

Browse Source
This commit is contained in:
LagoLunatic
2026-03-20 16:02:41 -04:00
parent 70a0a15b35
commit 061fa893eb
166 changed files with 2137 additions and 2019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_cc.cpp
+18 -18
View File
@@ -215,12 +215,12 @@ static BOOL daCC_Draw(cc_class* i_this) {
/* 00000900-00000AB0 .text cc_eff_set__FP8cc_classUc */
void cc_eff_set(cc_class* i_this, unsigned char arg1) {
u16 userID = dPa_name::ID_COMMON_03F0;
u16 userID = dPa_name::ID_AK_JN_CCHEAD00;
cXyz sp1C = i_this->m470;
GXColor sp18 = {};
if (arg1 != 0) {
userID = dPa_name::ID_COMMON_03EF;
userID = dPa_name::ID_AK_JN_CCFOOT00;
sp1C = i_this->actor.current.pos;
}
@@ -263,7 +263,7 @@ void anm_init(cc_class* i_this, const int transformResIdx, const float morf, con
void damage_mode_move(cc_class* i_this) {
i_this->m2F6 = 2;
if (i_this->m2F5 != 0x2d && i_this->m2F5 != 0x2e) {
dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->actor.attention_info.position);
dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &i_this->actor.attention_info.position);
i_this->mCurrAction = 3;
i_this->m2F5 = 0x28;
}
@@ -330,11 +330,11 @@ void naraku_check(cc_class* i_this) {
cXyz sp18(0.5f, 0.5f, 0.5f);
#if VERSION == VERSION_DEMO
i_this->m368.remove();
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m368);
dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m368);
i_this->m368.setRate(0.0f);
#else
i_this->m390.remove();
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m390);
dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m390);
i_this->m390.setRate(0.0f);
#endif
}
@@ -489,9 +489,9 @@ BOOL body_atari_check(cc_class* i_this) {
if ((i_this->m304 != 0) && (pdVar7 != NULL) && (dComIfGp_getPlayer(0) != pdVar7)) {
i_this->m304 = 2;
a_this->health = 0;
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &sp30);
dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &sp30);
cXyz sp24(2.0f, 2.0f, 2.0f);
dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &sp30, &player->shape_angle, &sp24);
dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &sp30, &player->shape_angle, &sp24);
i_this->mCurrAction = 3;
i_this->m2F5 = 0x28;
return TRUE;
@@ -704,11 +704,11 @@ BOOL body_atari_check(cc_class* i_this) {
cc_at_check(a_this, &sp3C);
if ((i_this->m2F6 == 1) || (i_this->m2F6 == 6) || (a_this->health <= 0)) {
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &sp30);
dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &sp30);
cXyz sp18(2.0f, 2.0f, 2.0f);
dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &sp30, &player->shape_angle, &sp18);
dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &sp30, &player->shape_angle, &sp18);
} else {
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &sp30, &player->shape_angle);
dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &sp30, &player->shape_angle);
}
}
@@ -1208,7 +1208,7 @@ void action_damage_move(cc_class* i_this) {
case 4:
case 9:
anm_init(i_this, CC_BCK_MAHI, 0.0f, 0, 1.0f, -1);
dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &a_this->attention_info.position);
dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &a_this->attention_info.position);
i_this->m32C = 0.0f;
i_this->m330 = 0.0f;
i_this->m348 = 0;
@@ -1320,7 +1320,7 @@ void action_damage_move(cc_class* i_this) {
i_this->m301 = 1;
i_this->m2D8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_PTCL), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL);
pJVar6 = dComIfGp_particle_set(dPa_name::ID_SCENE_82A8, &a_this->attention_info.position, &a_this->current.angle);
pJVar6 = dComIfGp_particle_set(dPa_name::ID_AK_SN_CCSPLIT00, &a_this->attention_info.position, &a_this->current.angle);
if (pJVar6 != NULL) {
f32 tmp = (a_this->tevStr.mColorK0.r / 255.0f);
sp18.r = tmp * 40.0f;
@@ -1932,7 +1932,7 @@ void action_up_check(cc_class* i_this) {
}
cXyz sp24 = *i_this->mCyl.GetTgHitPosP();
dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &sp24, &player->shape_angle);
dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &sp24, &player->shape_angle);
switch (pcVar6->GetAtType()) {
case AT_TYPE_SWORD:
@@ -1968,7 +1968,7 @@ void action_up_check(cc_class* i_this) {
}
if (bVar4) {
JPABaseEmitter* pJVar7 = dComIfGp_particle_set(dPa_name::ID_SCENE_82A9, &a_this->attention_info.position, &a_this->current.angle);
JPABaseEmitter* pJVar7 = dComIfGp_particle_set(dPa_name::ID_AK_SN_CCBREAKHAHEN00, &a_this->attention_info.position, &a_this->current.angle);
if (pJVar7 != NULL) {
pJVar7->setGlobalPrmColor(a_this->tevStr.mColorK0.r, a_this->tevStr.mColorK0.g, a_this->tevStr.mColorK0.b);
pJVar7->setGlobalEnvColor(a_this->tevStr.mColorK0.r, a_this->tevStr.mColorK0.g, a_this->tevStr.mColorK0.b);
@@ -2212,18 +2212,18 @@ static BOOL daCC_Execute(cc_class* i_this) {
case 1:
#if VERSION == VERSION_DEMO
i_this->mpEmitter1 = dComIfGp_particle_set(dPa_name::ID_COMMON_03ED, &i_this->actor.current.pos);
i_this->mpEmitter2 = dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &i_this->actor.current.pos);
i_this->mpEmitter1 = dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER00, &i_this->actor.current.pos);
i_this->mpEmitter2 = dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER01, &i_this->actor.current.pos);
if (i_this->mpEmitter1 != NULL && i_this->mpEmitter2 != NULL) {
i_this->m2F7++;
}
#else
if (i_this->m368.getEmitter() == NULL) {
dComIfGp_particle_set(dPa_name::ID_COMMON_03ED, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m368);
dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER00, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m368);
}
if (i_this->m37C.getEmitter() == NULL) {
dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m37C);
dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER01, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m37C);
}
if (i_this->m368.getEmitter() != NULL && i_this->m37C.getEmitter() != NULL) {