mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-11 11:32:42 -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
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;
}