add handshake animation for mario

seen in cutscenes with CJ and Sweet
headshot2017 · Feb 20, 2024 · f2cd4d9 · f2cd4d9
1 parent 82b22d7
commit f2cd4d9
Show file tree

Hide file tree

Showing 5 changed files with 809 additions and 0 deletions.
diff --git a/mario_cj_anims.cpp b/mario_cj_anims.cpp
@@ -248,6 +248,13 @@ void animLaugh01(const int& marioId)
     sm64_set_mario_animation(marioId, MARIO_ANIM_CUSTOM_LAUGH01);
 }
 
+void animHandshake(const int& marioId)
+{
+    sm64_set_mario_action_arg(marioId, ACT_CUSTOM_ANIM_TO_ACTION, 1);
+    sm64_set_mario_action_arg2(marioId, ACT_IDLE);
+    sm64_set_mario_animation(marioId, MARIO_ANIM_CUSTOM_HANDSHAKE);
+}
+
 void animDanceLoop(const int& marioId)
 {
     sm64_set_mario_action_arg(marioId, ACT_CUSTOM_ANIM, 1);
@@ -341,6 +348,7 @@ std::unordered_map<std::string, ConvertedAnim> cjAnimKeys =
     {"CRIB_USE_SWITCH",     {animCribUseSwitch, false}},
     {"PLYR_SHKHEAD",        {animPlayerShakeHead, false}},
     {"LAUGH_01",            {animLaugh01, false}},
+    {"HNDSHKFA",            {animHandshake, false}},
     {"DANCE_LOOP",          {animDanceLoop, false}},
     {"DANCE_G1",            {animDanceGood, false}},
     {"DANCE_G2",            {animDanceGood, false}},

diff --git a/mario_custom_anims.cpp b/mario_custom_anims.cpp
@@ -11,6 +11,7 @@
 #include "raw/anim_crib_use_switch.raw.h"
 #include "raw/anim_facepalm.raw.h"
 #include "raw/anim_laugh01.raw.h"
+#include "raw/anim_handshake.raw.h"
 #include "raw/anim_dance_loop.raw.h"
 #include "raw/anim_dance_bad.raw.h"
 #include "raw/anim_dance_good.raw.h"
@@ -86,6 +87,7 @@ int MARIO_ANIM_CUSTOM_VOMIT;
 int MARIO_ANIM_CUSTOM_CRIB_SWITCH;
 int MARIO_ANIM_CUSTOM_FACEPALM;
 int MARIO_ANIM_CUSTOM_LAUGH01;
+int MARIO_ANIM_CUSTOM_HANDSHAKE;
 int MARIO_ANIM_CUSTOM_DANCE_LOOP;
 int MARIO_ANIM_CUSTOM_DANCE_BAD;
 int MARIO_ANIM_CUSTOM_DANCE_GOOD;
@@ -164,6 +166,7 @@ void marioInitCustomAnims()
     MARIO_ANIM_CUSTOM_CRIB_SWITCH = sm64_custom_animation_init(marioAnimCribUseSwitchRaw, marioAnimCribUseSwitchRaw_length);
     MARIO_ANIM_CUSTOM_FACEPALM = sm64_custom_animation_init(marioAnimFacepalmRaw, marioAnimFacepalmRaw_length);
     MARIO_ANIM_CUSTOM_LAUGH01 = sm64_custom_animation_init(marioAnimLaugh01Raw, marioAnimLaugh01Raw_length);
+    MARIO_ANIM_CUSTOM_HANDSHAKE = sm64_custom_animation_init(marioAnimHandshakeRaw, marioAnimHandshakeRaw_length);
     MARIO_ANIM_CUSTOM_DANCE_LOOP = sm64_custom_animation_init(marioAnimDanceLoopRaw, marioAnimDanceLoopRaw_length);
     MARIO_ANIM_CUSTOM_DANCE_BAD = sm64_custom_animation_init(marioAnimDanceBadRaw, marioAnimDanceBadRaw_length);
     MARIO_ANIM_CUSTOM_DANCE_GOOD = sm64_custom_animation_init(marioAnimDanceGoodRaw, marioAnimDanceGoodRaw_length);

diff --git a/mario_custom_anims.h b/mario_custom_anims.h
@@ -14,6 +14,7 @@ extern int MARIO_ANIM_CUSTOM_VOMIT;
 extern int MARIO_ANIM_CUSTOM_CRIB_SWITCH;
 extern int MARIO_ANIM_CUSTOM_FACEPALM;
 extern int MARIO_ANIM_CUSTOM_LAUGH01;
+extern int MARIO_ANIM_CUSTOM_HANDSHAKE;
 extern int MARIO_ANIM_CUSTOM_DANCE_LOOP;
 extern int MARIO_ANIM_CUSTOM_DANCE_BAD;
 extern int MARIO_ANIM_CUSTOM_DANCE_GOOD;