From dc184afe9800688eb0baac5351990d3c3c752e3c Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Wed, 28 May 2025 22:50:21 -0700 Subject: [PATCH] FaceChange_UpdateBlinkingNonHuman --- include/face_change.h | 2 +- src/code/z_actor.c | 4 ++-- src/overlays/actors/ovl_En_Toto/z_en_toto.c | 2 +- src/overlays/actors/ovl_player_actor/z_player.c | 2 +- tools/disasm/functions.txt | 2 +- tools/sizes/code_functions.csv | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/face_change.h b/include/face_change.h index 1fa2804576..2e7010c3e5 100644 --- a/include/face_change.h +++ b/include/face_change.h @@ -7,7 +7,7 @@ typedef struct FaceChange { } FaceChange; // size = 0x4 s16 FaceChange_UpdateBlinking(FaceChange* faceChange, s16 blinkIntervalBase, s16 blinkIntervalRandRange, s16 blinkDuration); -s16 FaceChange_UpdateBlinkingAlt(FaceChange* faceChange, s16 blinkIntervalBase, s16 blinkIntervalRandRange, s16 blinkDuration); +s16 FaceChange_UpdateBlinkingNonHuman(FaceChange* faceChange, s16 blinkIntervalBase, s16 blinkIntervalRandRange, s16 blinkDuration); s16 FaceChange_UpdateRandomSet(FaceChange* faceChange, s16 changeTimerBase, s16 changeTimerRandRange, s16 faceSetRange); #endif diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 2c6b284993..954e786edf 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3875,8 +3875,8 @@ s16 FaceChange_UpdateBlinking(FaceChange* faceChange, s16 blinkIntervalBase, s16 * @param blinkIntervalRandRange The range for a random number of frames that can be added to `blinkIntervalBase` * @param blinkDuration The number of frames it takes for a single blink to occur */ -s16 FaceChange_UpdateBlinkingAlt(FaceChange* faceChange, s16 blinkIntervalBase, s16 blinkIntervalRandRange, - s16 blinkDuration) { +s16 FaceChange_UpdateBlinkingNonHuman(FaceChange* faceChange, s16 blinkIntervalBase, s16 blinkIntervalRandRange, + s16 blinkDuration) { if (DECR(faceChange->timer) == 0) { faceChange->timer = Rand_S16Offset(blinkIntervalBase, blinkIntervalRandRange); } diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index 30534db13d..d2fca6f1f6 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -198,7 +198,7 @@ void func_80BA383C(EnToto* this, PlayState* play) { } Animation_PlayOnce(&this->skelAnime, sAnimations[this->animIndex]); } - FaceChange_UpdateBlinkingAlt(&this->faceChange, 20, 80, 3); + FaceChange_UpdateBlinkingNonHuman(&this->faceChange, 20, 80, 3); } void func_80BA3930(EnToto* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index f391d56d09..e4ba3d02fa 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -12531,7 +12531,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } if ((this->transformation >= PLAYER_FORM_GORON) && (this->transformation <= PLAYER_FORM_DEKU)) { - FaceChange_UpdateBlinkingAlt(&this->faceChange, 20, 80, 3); + FaceChange_UpdateBlinkingNonHuman(&this->faceChange, 20, 80, 3); } else { FaceChange_UpdateBlinking(&this->faceChange, 20, 80, 6); } diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index f14476ace3..c559983375 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -845,7 +845,7 @@ 0x800BB8EC:("Attention_FindActor",), 0x800BBA88:("Enemy_StartFinishingBlow",), 0x800BBAC0:("FaceChange_UpdateBlinking",), - 0x800BBB74:("FaceChange_UpdateBlinkingAlt",), + 0x800BBB74:("FaceChange_UpdateBlinkingNonHuman",), 0x800BBC20:("FaceChange_UpdateRandomSet",), 0x800BBCEC:("Actor_SpawnBodyParts",), 0x800BBDAC:("Actor_SpawnFloorDustRing",), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index ce2af7f013..aacde5d8d8 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -359,7 +359,7 @@ asm/non_matchings/code/z_actor/Attention_FindActorInCategory.s,Attention_FindAct asm/non_matchings/code/z_actor/Attention_FindActor.s,Attention_FindActor,0x800BB8EC,0x67 asm/non_matchings/code/z_actor/Enemy_StartFinishingBlow.s,Enemy_StartFinishingBlow,0x800BBA88,0xE asm/non_matchings/code/z_actor/FaceChange_UpdateBlinking.s,FaceChange_UpdateBlinking,0x800BBAC0,0x2D -asm/non_matchings/code/z_actor/FaceChange_UpdateBlinkingAlt.s,FaceChange_UpdateBlinkingAlt,0x800BBB74,0x2B +asm/non_matchings/code/z_actor/FaceChange_UpdateBlinkingNonHuman.s,FaceChange_UpdateBlinkingNonHuman,0x800BBB74,0x2B asm/non_matchings/code/z_actor/FaceChange_UpdateRandomSet.s,FaceChange_UpdateRandomSet,0x800BBC20,0x33 asm/non_matchings/code/z_actor/Actor_SpawnBodyParts.s,Actor_SpawnBodyParts,0x800BBCEC,0x30 asm/non_matchings/code/z_actor/Actor_SpawnFloorDustRing.s,Actor_SpawnFloorDustRing,0x800BBDAC,0x81