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

EnSkb.lastDamageEffect -> lastDamageReaction

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

2
src/overlays/actors/ovl_En_Skb/z_en_skb.c
View File

@ -473,7 +473,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) {
if (this->collider.base.acFlags & AC_HIT) {
this->collider.base.acFlags &= ~AC_HIT;
if (this->actor.colChkInfo.damageReaction != 6) {
this->lastDamageEffect = this->actor.colChkInfo.damageReaction;
this->lastDamageReaction = this->actor.colChkInfo.damageReaction;
Actor_SetDropFlag(&this->actor, &this->collider.elements[1].base, true);
this->setColliderAT = false;
if (this->actor.colChkInfo.damageReaction == 1) {

2
src/overlays/actors/ovl_En_Skb/z_en_skb.h
View File

@ -15,7 +15,7 @@ typedef struct EnSkb {
/* 0x0208 */ Vec3s morphTable[20];
/* 0x0280 */ u8 actionState;
/* 0x0281 */ u8 setColliderAT;
/* 0x0282 */ u8 lastDamageEffect;
/* 0x0282 */ u8 lastDamageReaction;
/* 0x0283 */ u8 breakFlags;
/* 0x0284 */ EnSkbActionFunc actionFunc;
/* 0x0288 */ s16 headlessYawOffset;