mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 15:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Match some entity actors H-N (#1827)

Browse source
This commit is contained in:
cadmic 2024-02-22 06:08:40 -08:00 • committed by GitHub
parent 33d8044e45
commit 93295a842b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 219 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Mb/z_en_mb.c
View file

@ -1052,13 +1052,13 @@ void EnMb_ClubDamaged(EnMb* this, PlayState* play) {
}
void EnMb_ClubDamagedWhileKneeling(EnMb* this, PlayState* play) {
s32 pad;
if (SkelAnime_Update(&this->skelAnime)) {
if (this->timer3 != 0) {
this->timer3--;
if (this->timer3 == 0) {
if (this->timer1 == 0) {
s32 pad;
Animation_Change(&this->skelAnime, &gEnMbClubStandUpAnim, 3.0f, 0.0f,
Animation_GetLastFrame(&gEnMbClubStandUpAnim), ANIMMODE_ONCE_INTERP, 0.0f);
this->timer1 = 1;