mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-27 01:11:20 +00:00
Code Issues Projects Releases Wiki Activity

give a function a better name

Browse source
This commit is contained in:
feacur 2024-11-18 13:19:39 +01:00
parent 423748a140
commit fe53732127
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1344,7 +1344,7 @@ void EnGo2_SpawnDust(EnGo2* this, s32 index2) {
dustEffectData->numDustEffects, dustEffectData->radius, dustEffectData->yAccel); dustEffectData->numDustEffects, dustEffectData->radius, dustEffectData->yAccel);
} }
void EnGo2_AnimateRolling(EnGo2* this, PlayState* play) { void EnGo2_SetupCurledUp(EnGo2* this, PlayState* play) {
if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) { if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) {
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_UNCURL_SIT_STAND_BIG); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_UNCURL_SIT_STAND_BIG);
@ -1459,7 +1459,7 @@ s32 EnGo2_IsGoronHotRodder(EnGo2* this, PlayState* play) {
return false; return false;
} }
this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
EnGo2_AnimateRolling(this, play); EnGo2_SetupCurledUp(this, play);
this->actionFunc = EnGo2_GoronHotRodder; this->actionFunc = EnGo2_GoronHotRodder;
return true; return true;
} }
@ -1739,7 +1739,7 @@ void EnGo2_Standing(EnGo2* this, PlayState* play) {
} }
} }
if ((!EnGo2_ShouldStay(this, play)) && (!EnGo2_IsWithinInteactionRange(this))) { if ((!EnGo2_ShouldStay(this, play)) && (!EnGo2_IsWithinInteactionRange(this))) {
EnGo2_AnimateRolling(this, play); EnGo2_SetupCurledUp(this, play);
} }
} }
@ -1869,7 +1869,7 @@ void EnGo2_HandleOfferParented(EnGo2* this, PlayState* play) {
break; break;
case GI_BOMB_BAG_30: case GI_BOMB_BAG_30:
case GI_BOMB_BAG_40: case GI_BOMB_BAG_40:
EnGo2_AnimateRolling(this, play); EnGo2_SetupCurledUp(this, play);
this->actionFunc = EnGo2_GoronHotRodder; this->actionFunc = EnGo2_GoronHotRodder;
return; return;
} }