diff --git a/include/player.h b/include/player.h index c94704c471..63c9d25b65 100644 --- a/include/player.h +++ b/include/player.h @@ -647,7 +647,7 @@ typedef enum PlayerKnockbackType { /* 0 */ PLAYER_KNOCKBACK_NONE, // No knockback /* 1 */ PLAYER_KNOCKBACK_SMALL, // A small hop, remains standing up /* 2 */ PLAYER_KNOCKBACK_LARGE, // Sent flying in the air and lands laying down on the floor - /* 3 */ PLAYER_KNOCKBACK_LARGE_SHOCK // Same as`PLAYER_KNOCKBACK_LARGE` with a shock effect + /* 3 */ PLAYER_KNOCKBACK_LARGE_ELECTRIFIED // Same as`PLAYER_KNOCKBACK_LARGE` with a shock effect } PlayerKnockbackType; typedef enum PlayerHitResponseType { @@ -655,7 +655,7 @@ typedef enum PlayerHitResponseType { /* 1 */ PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE, /* 2 */ PLAYER_HIT_RESPONSE_KNOCKBACK_SMALL, /* 3 */ PLAYER_HIT_RESPONSE_FROZEN, - /* 4 */ PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK + /* 4 */ PLAYER_HIT_RESPONSE_ELECTRIFIED } PlayerHitResponseType; typedef struct PlayerAgeProperties { diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 108dbbe352..e594e42291 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -550,7 +550,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_FANTOM_LAUGH); } Actor_SetPlayerKnockback(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, - PLAYER_KNOCKBACK_LARGE_SHOCK, 0x10); + PLAYER_KNOCKBACK_LARGE_ELECTRIFIED, 0x10); } break; case FHGFIRE_LIGHT_BLUE: diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index bfebb80295..4746717d8d 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4652,7 +4652,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 damageResponseType, f32 sp Player_PlaySfx(this, NA_SE_PL_FREEZE_S); Player_PlayVoiceSfx(this, NA_SE_VO_LI_FREEZE); - } else if (damageResponseType == PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK) { + } else if (damageResponseType == PLAYER_HIT_RESPONSE_ELECTRIFIED) { Player_SetupAction(play, this, Player_Action_8084FBF4, 0); Player_RequestRumble(this, 255, 80, 150, 0); @@ -4867,7 +4867,7 @@ s32 func_808382DC(Player* this, PlayState* play) { func_80838280(this); - if (this->knockbackType == PLAYER_KNOCKBACK_LARGE_SHOCK) { + if (this->knockbackType == PLAYER_KNOCKBACK_LARGE_ELECTRIFIED) { this->bodyShockTimer = 40; } @@ -4941,7 +4941,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_ICE) { sp4C = PLAYER_HIT_RESPONSE_FROZEN; } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_ELECTRIC) { - sp4C = PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK; + sp4C = PLAYER_HIT_RESPONSE_ELECTRIFIED; } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_KNOCKBACK) { sp4C = PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE; } else { @@ -9147,8 +9147,7 @@ s32 func_80842DF4(PlayState* play, Player* this) { if (this->actor.colChkInfo.atHitBacklash == HIT_BACKLASH_ELECTRIC) { this->actor.colChkInfo.damage = 8; - func_80837C0C(play, this, PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK, 0.0f, 0.0f, this->actor.shape.rot.y, - 20); + func_80837C0C(play, this, PLAYER_HIT_RESPONSE_ELECTRIFIED, 0.0f, 0.0f, this->actor.shape.rot.y, 20); return 1; } }