mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

follow the bugs documentation style guide

Browse source
This commit is contained in:
feacur 2024-11-18 21:09:13 +01:00
parent 5ba85a3f7e
commit 5d1bf7727f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -899,7 +899,7 @@ void EnGo_Standing(EnGo* this, PlayState* play) {
this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
} else { } else {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) { if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) {
// @bug: `gGoronEyedropsLoopAnim` is not applied; see `z_en_go2.c` for the correct behaviour //! @bug: `gGoronEyedropsLoopAnim` is not applied; see `z_en_go2.c` for the correct behaviour
EnGo_ChangeAnim(this, ENGO_ANIM_WALKING_LOOP); EnGo_ChangeAnim(this, ENGO_ANIM_WALKING_LOOP);
this->eyedropsTimer = 100; this->eyedropsTimer = 100;
this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
@ -1038,7 +1038,7 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
void EnGo_TakingEyedrops(EnGo* this, PlayState* play) { void EnGo_TakingEyedrops(EnGo* this, PlayState* play) {
if (DECR(this->eyedropsTimer) == 0) { if (DECR(this->eyedropsTimer) == 0) {
// @bug: `gGoronEyedropsTakenAnim` is not applied; see `z_en_go2.c` for the correct behaviour //! @bug: `gGoronEyedropsTakenAnim` is not applied; see `z_en_go2.c` for the correct behaviour
this->actor.textId = 0x305A; this->actor.textId = 0x305A;
Message_ContinueTextbox(play, this->actor.textId); Message_ContinueTextbox(play, this->actor.textId);
this->interactInfo.talkState = NPC_TALK_STATE_TALKING; this->interactInfo.talkState = NPC_TALK_STATE_TALKING;
@ -1167,7 +1167,8 @@ void EnGo_Draw(Actor* thisx, PlayState* play) {
return; return;
} }
// @bug? should've been `EnGo_RollingToCurledUp` instead of the second `EnGo_RollingFar` //! @bug? should've been `EnGo_RollingToCurledUp` instead of the second `EnGo_RollingFar`
//! in that state bouncing Goron will be drawn normally, rather than as a boulder
if (this->actionFunc == EnGo_RollingLink || this->actionFunc == EnGo_RollingFar || if (this->actionFunc == EnGo_RollingLink || this->actionFunc == EnGo_RollingFar ||
this->actionFunc == EnGo_RollingNear || this->actionFunc == EnGo_RollingFar) { this->actionFunc == EnGo_RollingNear || this->actionFunc == EnGo_RollingFar) {
EnGo_DrawRolling(this, play); EnGo_DrawRolling(this, play);