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

FaceChange_UpdateBlinkingNonHuman

This commit is contained in:
Derek Hensley 2025-05-28 22:50:21 -07:00
parent 37b1565667
commit dc184afe98
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/face_change.h
View File

@ -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

4
src/code/z_actor.c
View File

@ -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);
}

2
src/overlays/actors/ovl_En_Toto/z_en_toto.c
View File

@ -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) {

2
src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -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);
}

2
tools/disasm/functions.txt
View File

@ -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",),

2
tools/sizes/code_functions.csv
View File

@ -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

1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
359 asm/non_matchings/code/z_actor/Attention_FindActor.s Attention_FindActor 0x800BB8EC 0x67
360 asm/non_matchings/code/z_actor/Enemy_StartFinishingBlow.s Enemy_StartFinishingBlow 0x800BBA88 0xE
361 asm/non_matchings/code/z_actor/FaceChange_UpdateBlinking.s FaceChange_UpdateBlinking 0x800BBAC0 0x2D
362 asm/non_matchings/code/z_actor/FaceChange_UpdateBlinkingAlt.s asm/non_matchings/code/z_actor/FaceChange_UpdateBlinkingNonHuman.s FaceChange_UpdateBlinkingAlt FaceChange_UpdateBlinkingNonHuman 0x800BBB74 0x2B
363 asm/non_matchings/code/z_actor/FaceChange_UpdateRandomSet.s FaceChange_UpdateRandomSet 0x800BBC20 0x33
364 asm/non_matchings/code/z_actor/Actor_SpawnBodyParts.s Actor_SpawnBodyParts 0x800BBCEC 0x30
365 asm/non_matchings/code/z_actor/Actor_SpawnFloorDustRing.s Actor_SpawnFloorDustRing 0x800BBDAC 0x81