diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index ecd3454cc..d2334ea57 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -2375,13 +2375,10 @@ glabel func0f098b80 /* f098bf8: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f098bfc -/* f098bfc: 8c82068c */ lw $v0,0x68c($a0) -/* f098c00: 0002702b */ sltu $t6,$zero,$v0 -/* f098c04: 03e00008 */ jr $ra -/* f098c08: 01c01025 */ or $v0,$t6,$zero -); +bool handIsAnimBusy(struct hand *hand) +{ + return hand->animmode != HANDANIMMODE_IDLE; +} void handResetAnim(struct hand *hand) { @@ -7853,7 +7850,7 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) } if (hand->stateminor == HANDSTATEMINOR_ANIM) { - if (!func0f098bfc(hand)) { + if (!handIsAnimBusy(hand)) { return true; } diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index 404c2b866..271fd6be2 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -16,7 +16,7 @@ u32 func0f0981e8(void); bool func0f098884(struct guncmd *cmd, struct shorthand *hand); void func0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand); bool func0f098a44(struct hand *hand, s32 time); -bool func0f098bfc(struct hand *hand); +bool handIsAnimBusy(struct hand *hand); void handResetAnim(struct hand *hand); void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum); s32 func0f098ca0(s32 arg0, struct handweaponinfo *info, struct hand *hand);