From 021e20340216ff093fa749b0aa914609f35c4aa9 Mon Sep 17 00:00:00 2001 From: 137329506980462592 <102286152+137329506980462592@users.noreply.github.com> Date: Sat, 28 May 2022 03:56:48 -0400 Subject: [PATCH] Add tired / second punch sound back (#120) --- src/game/mario_actions_object.c | 2 +- src/game/mario_actions_stationary.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/mario_actions_object.c b/src/game/mario_actions_object.c index c45bf7ab7..21bf0061a 100644 --- a/src/game/mario_actions_object.c +++ b/src/game/mario_actions_object.c @@ -82,7 +82,7 @@ s32 mario_update_punch_sequence(struct MarioState *m) { break; case 3: - play_character_sound(m, CHAR_SOUND_PUNCH_YAH); + play_character_sound(m, CHAR_SOUND_PUNCH_WAH); // Fall-through: case 4: set_mario_animation(m, MARIO_ANIM_SECOND_PUNCH); diff --git a/src/game/mario_actions_stationary.c b/src/game/mario_actions_stationary.c index 701f1bc9c..2dc20e29c 100644 --- a/src/game/mario_actions_stationary.c +++ b/src/game/mario_actions_stationary.c @@ -240,12 +240,12 @@ s32 act_start_sleeping(struct MarioState *m) { } #ifndef VERSION_JP - if (m->actionState == 2 && animFrame == -1) { - play_character_sound(m, CHAR_SOUND_YAWNING); + if (m->actionState == 1 && animFrame == -1) { + play_character_sound(m, CHAR_SOUND_IMA_TIRED); } if (m->actionState == 2 && animFrame == -1) { - play_character_sound(m, CHAR_SOUND_IMA_TIRED); + play_character_sound(m, CHAR_SOUND_YAWNING); } #else if (m->actionState == 2) {