mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-01 15:26:01 +00:00
Code Issues Projects Releases Wiki Activity

Document EnGo .unk_20E as .knockbackCooldown

Browse source
This commit is contained in:
feacur 2024-11-10 20:34:23 +01:00
parent 3be6be591e
commit 87097be9ab
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -737,12 +737,12 @@ void func_80A3FEB4(EnGo* this, PlayState* play) {
void EnGo_StopRolling(EnGo* this, PlayState* play) { void EnGo_StopRolling(EnGo* this, PlayState* play) {
EnBom* bomb; EnBom* bomb;
if (DECR(this->unk_20E) == 0) { if (DECR(this->knockbackCooldown) == 0) {
if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) { if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER; this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER;
play->damagePlayer(play, -4); play->damagePlayer(play, -4);
Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f);
this->unk_20E = 0x10; this->knockbackCooldown = 0x10;
} }
} }

2
src/overlays/actors/ovl_En_Go/z_en_go.h
View file

@ -53,7 +53,7 @@ typedef struct EnGo {
/* 0x01E0 */ NpcInteractInfo interactInfo; /* 0x01E0 */ NpcInteractInfo interactInfo;
/* 0x0208 */ char unk_208[0x4]; /* 0x0208 */ char unk_208[0x4];
/* 0x020C */ s16 unk_20C; /* 0x020C */ s16 unk_20C;
/* 0x020E */ s16 unk_20E; /* 0x020E */ s16 knockbackCooldown;
/* 0x0210 */ s16 unk_210; /* 0x0210 */ s16 unk_210;
/* 0x0212 */ s16 unk_212; /* 0x0212 */ s16 unk_212;
/* 0x0214 */ s16 blinkTimer; // unused /* 0x0214 */ s16 blinkTimer; // unused