Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop

This commit is contained in:
MysterD 2022-05-28 01:26:52 -07:00
parent 867cc65605 021e203402
commit 71b50c721e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/mario_actions_object.c
View File

@ -82,7 +82,7 @@ s32 mario_update_punch_sequence(struct MarioState *m) {
break; break;
case 3: case 3:
play_character_sound(m, CHAR_SOUND_PUNCH_YAH); play_character_sound(m, CHAR_SOUND_PUNCH_WAH);
// Fall-through: // Fall-through:
case 4: case 4:
set_mario_animation(m, MARIO_ANIM_SECOND_PUNCH); set_mario_animation(m, MARIO_ANIM_SECOND_PUNCH);

6
src/game/mario_actions_stationary.c
View File

@ -240,12 +240,12 @@ s32 act_start_sleeping(struct MarioState *m) {
} }
#ifndef VERSION_JP #ifndef VERSION_JP
if (m->actionState == 2 && animFrame == -1) { if (m->actionState == 1 && animFrame == -1) {
play_character_sound(m, CHAR_SOUND_YAWNING); play_character_sound(m, CHAR_SOUND_IMA_TIRED);
} }
if (m->actionState == 2 && animFrame == -1) { if (m->actionState == 2 && animFrame == -1) {
play_character_sound(m, CHAR_SOUND_IMA_TIRED); play_character_sound(m, CHAR_SOUND_YAWNING);
} }
#else #else
if (m->actionState == 2) { if (m->actionState == 2) {