mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 13:24:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
LagoLunatic
2026-05-08 21:51:18 -04:00
parent f7cb58cbed
commit a3dd6ac9e1
13 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_tbox.cpp
+10 -10
View File
@@ -495,15 +495,15 @@ void daTbox_c::CreateInit() {
switch (funcType) {
case FUNC_TYPE_ENEMIES:
setAction(&daTbox_c::actionGenocide);
mGenocideDelayTimer = 0x41;
mGenocideDelayTimer = 65;
flagOn(daTboxFlg_UNK_01 | daTboxFlg_UNK_02);
mAppearTimer = 0x78;
mAppearTimer = 120;
break;
case FUNC_TYPE_SWITCH:
case FUNC_TYPE_EXTRA_SAVE_INFO_SPAWN:
setAction(&daTbox_c::actionSwOnWait);
flagOn(daTboxFlg_UNK_01 | daTboxFlg_UNK_02);
mAppearTimer = 0x78;
mAppearTimer = 120;
break;
case FUNC_TYPE_TACT:
setAction(&daTbox_c::actionSwOnWait);
@@ -513,7 +513,7 @@ void daTbox_c::CreateInit() {
case FUNC_TYPE_SWITCH_TRANSPARENT:
setAction(&daTbox_c::actionSwOnWait);
flagOn(daTboxFlg_UNK_02);
mAppearTimer = 0x5A;
mAppearTimer = 90;
mpAppearRegAnm->setFrame(30.0f);
break;
@@ -612,7 +612,7 @@ void daTbox_c::darkProc() {
/* 0000172C-000017CC .text volmProc__8daTbox_cFv */
void daTbox_c::volmProc() {
if (mOpenTimer == 0x24) {
if (mOpenTimer == 36) {
mSmokeEmitter->mGlobalPrmColor.a = 0xFF;
}
else if (mOpenTimer >= 0xB5) {
@@ -642,7 +642,7 @@ void daTbox_c::demoProcOpen() {
lightDownProc();
}
if (mOpenTimer == 0x24) {
if (mOpenTimer == 36) {
mOpenAnm.setPlaySpeed(1.0f);
mFlashAnm.setPlaySpeed(1.0f);
@@ -725,11 +725,11 @@ void daTbox_c::demoProcAppear() {
cLib_chaseF(&mInvisibleScrollVal, 2.0f, 1.0f / 30.0f);
}
if (mAppearTimer == 0x3C) {
if (mAppearTimer == 60) {
mpAppearRegAnm->setFrame(150.0f);
}
if (mAppearTimer == 0x05) {
if (mAppearTimer == 5) {
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &current.pos, NULL, NULL, 0xB9, &mSmokeCB);
if (emitter != NULL) {
@@ -739,11 +739,11 @@ void daTbox_c::demoProcAppear() {
}
}
if (mAppearTimer == 0x04 && mSmokeCB.getEmitter() != NULL) {
if (mAppearTimer == 4 && mSmokeCB.getEmitter() != NULL) {
mSmokeCB.remove();
}
if (mAppearTimer != 0x00) {
if (mAppearTimer != 0) {
mAppearTimer--;
}