falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EnTest.lastDamageEffect -> lastDamageReaction

This commit is contained in:
Dragorn421 2025-05-28 10:23:09 +02:00
parent cdb33842e8
commit 55dcdf4d2e
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Test/z_en_test.c
View File

@ -1313,12 +1313,12 @@ void EnTest_SetupStunned(EnTest* this) {
this->skelAnime.playSpeed = 0.0f; this->skelAnime.playSpeed = 0.0f;
this->actor.speed = -4.0f; this->actor.speed = -4.0f;
if (this->lastDamageEffect == STALFOS_DMGREAC_LIGHT) { if (this->lastDamageReaction == STALFOS_DMGREAC_LIGHT) {
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 120, COLORFILTER_BUFFLAG_OPA, 80);
} else { } else {
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
if (this->lastDamageEffect == STALFOS_DMGREAC_FREEZE) { if (this->lastDamageReaction == STALFOS_DMGREAC_FREEZE) {
this->iceTimer = 36; this->iceTimer = 36;
} else { } else {
Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalfosFlinchFromHitFrontAnim, 0.0f); Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalfosFlinchFromHitFrontAnim, 0.0f);
@ -1680,7 +1680,7 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) {
if ((this->actor.colChkInfo.damageReaction != STALFOS_DMGREAC_SLING) && if ((this->actor.colChkInfo.damageReaction != STALFOS_DMGREAC_SLING) &&
(this->actor.colChkInfo.damageReaction != STALFOS_DMGREAC_FIREMAGIC)) { (this->actor.colChkInfo.damageReaction != STALFOS_DMGREAC_FIREMAGIC)) {
this->lastDamageEffect = this->actor.colChkInfo.damageReaction; this->lastDamageReaction = this->actor.colChkInfo.damageReaction;
if (this->swordState >= 1) { if (this->swordState >= 1) {
this->swordState = 0; this->swordState = 0;
} }

2
src/overlays/actors/ovl_En_Test/z_en_test.h
View File

@ -90,7 +90,7 @@ typedef struct EnTest {
/* 0x7DD */ char unk_7DD[0x1]; /* 0x7DD */ char unk_7DD[0x1];
/* 0x7DE */ u8 unk_7DE; /* 0x7DE */ u8 unk_7DE;
/* 0x7E0 */ s16 iceTimer; /* 0x7E0 */ s16 iceTimer;
/* 0x7E2 */ u8 lastDamageEffect; /* 0x7E2 */ u8 lastDamageReaction;
/* 0x7E4 */ s32 unk_7E4; /* 0x7E4 */ s32 unk_7E4;
/* 0x7E8 */ s32 timer; /* 0x7E8 */ s32 timer;
/* 0x7EC */ f32 unk_7EC; /* 0x7EC */ f32 unk_7EC;