mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-04 15:04:31 +00:00
PlayerMeleeWeaponAnimation
enum (#1154)
* Move `PlayerSwordAnimation` from `z_en_torch2.c` to `z64player.h` * `PlayerSwordAnimation` -> `PlayerMeleeWeaponAnimation` * Add `PWMA_` prefix to `PlayerMeleeWeaponAnimation` values * Use `PlayerMeleeWeaponAnimation` enum more * Add `PWMA_MAX` * Update comments in z_en_kanban.c * Some cleanup around conditionals with `meleeWeaponAnimation` * Comment `PWMA_` index value in `D_80854190` * `PMWA_` -> `PLAYER_MWA_` * Minor fixup * Missed one spot * Run formatter
This commit is contained in:
parent
5cadc5df8a
commit
c55a8530ee
15 changed files with 174 additions and 111 deletions
|
@ -4041,7 +4041,7 @@ u8 func_800355E4(GlobalContext* globalCtx, Collider* collider) {
|
|||
Player* player = GET_PLAYER(globalCtx);
|
||||
|
||||
if ((collider->acFlags & AC_TYPE_PLAYER) && (player->meleeWeaponState != 0) &&
|
||||
(player->meleeWeaponAnimation == 0x16)) {
|
||||
(player->meleeWeaponAnimation == PLAYER_MWA_HAMMER_FORWARD)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue