From 9b5c5884da912144c325ee08437e199fd9a2f901 Mon Sep 17 00:00:00 2001 From: headshot2017 Date: Fri, 23 Feb 2024 03:16:40 -0400 Subject: [PATCH] add 'partial handshake' anim seen at the end of the mission "Catalyst" --- mario_cj_anims.cpp | 20 ++++ mario_custom_anims.cpp | 3 + mario_custom_anims.h | 1 + mario_ped_tasks.cpp | 73 +++++------- raw/anim_partial_handshake.raw.h | 197 +++++++++++++++++++++++++++++++ sm64-san-andreas.cbp | 1 + 6 files changed, 254 insertions(+), 41 deletions(-) create mode 100644 raw/anim_partial_handshake.raw.h diff --git a/mario_cj_anims.cpp b/mario_cj_anims.cpp index 96a2475..381a7c5 100644 --- a/mario_cj_anims.cpp +++ b/mario_cj_anims.cpp @@ -3,6 +3,8 @@ #include #include +#include "plugin.h" +#include "CHud.h" extern "C" { #include } @@ -49,6 +51,15 @@ void runAnimKey(CTaskSimpleRunNamedAnim* task, const int& marioId) (cjAnimKeys.count(task->m_animGroupName)) ? task->m_animGroupName : ""; +#ifdef _DEBUG + if (plugin::KeyPressed(VK_MULTIPLY)) + { + char buf[256]; + sprintf(buf, "%d '%s' '%s'", task->m_nAnimId, task->m_animName, task->m_animGroupName); + CHud::SetMessage(buf); + } +#endif + runAnimKey(key, marioId); } @@ -265,6 +276,14 @@ void animHandshake(const int& marioId) sm64_set_mario_animation(marioId, MARIO_ANIM_CUSTOM_HANDSHAKE); } +void animPartialHandshake1(const int& marioId) +{ + // seen at the end of the mission "Catalyst", when Ryder says "For life, CJ" + 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_PARTIAL_HANDSHAKE); +} + void animDanceLoop(const int& marioId) { sm64_set_mario_action_arg(marioId, ACT_CUSTOM_ANIM, 1); @@ -361,6 +380,7 @@ std::unordered_map cjAnimKeys = {"PLYR_SHKHEAD", {animPlayerShakeHead, false}}, {"LAUGH_01", {animLaugh01, false}}, {"HNDSHKFA", {animHandshake, false}}, + {"PRTIAL_HNDSHK_01", {animPartialHandshake1, 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 index 995d47f..e5a5050 100644 --- a/mario_custom_anims.cpp +++ b/mario_custom_anims.cpp @@ -12,6 +12,7 @@ #include "raw/anim_facepalm.raw.h" #include "raw/anim_laugh01.raw.h" #include "raw/anim_handshake.raw.h" +#include "raw/anim_partial_handshake.raw.h" #include "raw/anim_dance_loop.raw.h" #include "raw/anim_dance_bad.raw.h" #include "raw/anim_dance_good.raw.h" @@ -88,6 +89,7 @@ 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_PARTIAL_HANDSHAKE; int MARIO_ANIM_CUSTOM_DANCE_LOOP; int MARIO_ANIM_CUSTOM_DANCE_BAD; int MARIO_ANIM_CUSTOM_DANCE_GOOD; @@ -167,6 +169,7 @@ void marioInitCustomAnims() 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_PARTIAL_HANDSHAKE = sm64_custom_animation_init(marioAnimPartialHandshakeRaw, marioAnimPartialHandshakeRaw_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 index d9b8ea2..656c5db 100644 --- a/mario_custom_anims.h +++ b/mario_custom_anims.h @@ -15,6 +15,7 @@ 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_PARTIAL_HANDSHAKE; extern int MARIO_ANIM_CUSTOM_DANCE_LOOP; extern int MARIO_ANIM_CUSTOM_DANCE_BAD; extern int MARIO_ANIM_CUSTOM_DANCE_GOOD; diff --git a/mario_ped_tasks.cpp b/mario_ped_tasks.cpp index c3346a0..dcda864 100644 --- a/mario_ped_tasks.cpp +++ b/mario_ped_tasks.cpp @@ -434,16 +434,6 @@ void marioPedTasks(CPlayerPed* ped, const int& marioId) else if ((baseTask = ped->m_pIntelligence->m_TaskMgr.FindActiveTaskByType(TASK_SIMPLE_NAMED_ANIM))) { CTaskSimpleRunNamedAnim* task = static_cast(baseTask); - -#ifdef _DEBUG - if (plugin::KeyPressed(VK_MULTIPLY)) - { - char buf[256]; - sprintf(buf, "%d '%s' '%s'", task->m_nAnimId, task->m_animName, task->m_animGroupName); - CHud::SetMessage(buf); - } -#endif - runAnimKey(task, marioId); } else if ((baseTask = ped->m_pIntelligence->m_TaskMgr.FindActiveTaskByType(TASK_COMPLEX_USE_SEQUENCE))) @@ -459,6 +449,7 @@ void marioPedTasks(CPlayerPed* ped, const int& marioId) CTaskComplexSequence2* sub2 = static_cast(sub); CTask* sub2_aTask = sub2->m_aTasks[sub2->m_nCurrentTaskIndex]; eTaskType aTaskID = ((eTaskType (__thiscall *)(CTask *))plugin::GetVMT(sub2_aTask, 4))(sub2_aTask); + if (aTaskID == TASK_SIMPLE_SLIDE_TO_COORD) { // class CTaskSimpleSlideToCoord : public CTaskSimpleRunNamedAnim @@ -508,37 +499,6 @@ void marioPedTasks(CPlayerPed* ped, const int& marioId) _fallen = false; resetLastAnim(); } - - /* - char buf[256] = {0}; - char a[32]; - for (int i=0; im_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]) ? "%x" : "%x ", ped->m_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]); - strcat(buf, a); - if (ped->m_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]) - { - CTask* task = ped->m_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]; - eTaskType taskID = ((eTaskType (__thiscall *)(CTask *))plugin::GetVMT(task, 4))(task); - sprintf(a, "(%d) ", taskID); - strcat(buf, a); - } - } - strcat(buf, "- "); - for (int i=0; im_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]) ? "%x" : "%x ", ped->m_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]); - strcat(buf, a); - if (ped->m_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]) - { - CTask* task = ped->m_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]; - eTaskType taskID = ((eTaskType (__thiscall *)(CTask *))plugin::GetVMT(task, 4))(task); - sprintf(a, (i == TASK_SECONDARY_MAX-1) ? "(%d)" : "(%d) ", taskID); - strcat(buf, a); - } - } - CHud::SetMessage(buf); - */ } void marioPedTasksMaxFPS(CPlayerPed* ped, const int& marioId) @@ -738,4 +698,35 @@ void marioPedTasksMaxFPS(CPlayerPed* ped, const int& marioId) //char buf[32]; //sprintf(buf, "%d %d %d", marioState.animInfo.animOverride.current, marioState.actionState, marioState.animInfo.animFrame); //CHud::SetMessage(buf); + + /* + char buf[256] = {0}; + char a[32]; + for (int i=0; im_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]) ? "%x" : "%x ", ped->m_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]); + strcat(buf, a); + if (ped->m_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]) + { + CTask* task = ped->m_pIntelligence->m_TaskMgr.m_aPrimaryTasks[i]; + eTaskType taskID = ((eTaskType (__thiscall *)(CTask *))plugin::GetVMT(task, 4))(task); + sprintf(a, "(%d) ", taskID); + strcat(buf, a); + } + } + strcat(buf, "- "); + for (int i=0; im_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]) ? "%x" : "%x ", ped->m_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]); + strcat(buf, a); + if (ped->m_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]) + { + CTask* task = ped->m_pIntelligence->m_TaskMgr.m_aSecondaryTasks[i]; + eTaskType taskID = ((eTaskType (__thiscall *)(CTask *))plugin::GetVMT(task, 4))(task); + sprintf(a, (i == TASK_SECONDARY_MAX-1) ? "(%d)" : "(%d) ", taskID); + strcat(buf, a); + } + } + CHud::SetMessage(buf); + */ } diff --git a/raw/anim_partial_handshake.raw.h b/raw/anim_partial_handshake.raw.h new file mode 100644 index 0000000..c865ba7 --- /dev/null +++ b/raw/anim_partial_handshake.raw.h @@ -0,0 +1,197 @@ +const unsigned char marioAnimPartialHandshakeRaw[2120] = { + 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x33, 0x00, 0x37, 0x00, 0x00, 0x01, 0x16, 0x00, 0x00, 0x00, 0x1a, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, + 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, + 0x06, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x08, 0x00, 0x33, + 0x00, 0x09, 0x00, 0x33, 0x00, 0x3c, 0x00, 0x33, 0x00, 0x6f, 0x00, + 0x33, 0x00, 0xa2, 0x00, 0x33, 0x00, 0xd5, 0x00, 0x33, 0x01, 0x08, + 0x00, 0x01, 0x01, 0x3b, 0x00, 0x01, 0x01, 0x3c, 0x00, 0x01, 0x01, + 0x3d, 0x00, 0x33, 0x01, 0x3e, 0x00, 0x33, 0x01, 0x71, 0x00, 0x33, + 0x01, 0xa4, 0x00, 0x33, 0x01, 0xd7, 0x00, 0x30, 0x02, 0x0a, 0x00, + 0x33, 0x02, 0x3a, 0x00, 0x33, 0x02, 0x6d, 0x00, 0x01, 0x02, 0xa0, + 0x00, 0x01, 0x02, 0xa1, 0x00, 0x01, 0x02, 0xa2, 0x00, 0x01, 0x02, + 0xa3, 0x00, 0x01, 0x02, 0xa4, 0x00, 0x01, 0x02, 0xa5, 0x00, 0x01, + 0x02, 0xa6, 0x00, 0x01, 0x02, 0xa7, 0x00, 0x32, 0x02, 0xa8, 0x00, + 0x33, 0x02, 0xda, 0x00, 0x01, 0x03, 0x0d, 0x00, 0x33, 0x03, 0x0e, + 0x00, 0x33, 0x03, 0x41, 0x00, 0x01, 0x03, 0x74, 0x00, 0x01, 0x03, + 0x75, 0x00, 0x01, 0x03, 0x76, 0x00, 0x01, 0x03, 0x77, 0x00, 0x01, + 0x03, 0x78, 0x00, 0x01, 0x03, 0x79, 0x00, 0x01, 0x03, 0x7a, 0x00, + 0x01, 0x03, 0x7b, 0x00, 0x01, 0x03, 0x7c, 0x00, 0x01, 0x03, 0x7d, + 0x00, 0x01, 0x03, 0x7e, 0x00, 0x01, 0x03, 0x7f, 0x00, 0x01, 0x03, + 0x80, 0x00, 0x01, 0x03, 0x81, 0x00, 0x01, 0x03, 0x82, 0x00, 0x01, + 0x03, 0x83, 0x00, 0x01, 0x03, 0x84, 0x00, 0x01, 0x03, 0x85, 0x00, + 0x01, 0x03, 0x86, 0x00, 0x01, 0x03, 0x87, 0x00, 0x01, 0x03, 0x88, + 0x00, 0x01, 0x03, 0x89, 0x00, 0x01, 0x03, 0x8a, 0x00, 0x01, 0x03, + 0x8b, 0x00, 0x01, 0x03, 0x8c, 0x00, 0x00, 0x00, 0xac, 0xff, 0xff, + 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, + 0xa1, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x6a, 0x00, 0xe4, 0x01, 0x82, + 0x02, 0x3d, 0x03, 0x0d, 0x03, 0xec, 0x04, 0xd3, 0x05, 0xb9, 0x06, + 0x98, 0x07, 0x69, 0x08, 0x24, 0x08, 0xc1, 0x09, 0x3b, 0x09, 0x8a, + 0x09, 0xa5, 0x09, 0x45, 0x08, 0x3d, 0x06, 0xb3, 0x04, 0xcc, 0x02, + 0xad, 0x00, 0x7b, 0xfe, 0x5b, 0xfc, 0x73, 0xfa, 0xe9, 0xf9, 0xe1, + 0xf9, 0x81, 0xf9, 0x93, 0xf9, 0xc4, 0xfa, 0x0c, 0xfa, 0x64, 0xfa, + 0xc3, 0xfb, 0x23, 0xfb, 0x7b, 0xfb, 0xc3, 0xfb, 0xf4, 0xfc, 0x06, + 0xfc, 0x06, 0xfc, 0x06, 0xfc, 0x1e, 0xfc, 0x5f, 0xfc, 0xc0, 0xfd, + 0x38, 0xfd, 0xbd, 0xfe, 0x48, 0xfe, 0xcd, 0xff, 0x45, 0xff, 0xa6, + 0xff, 0xe7, 0x00, 0x00, 0xff, 0xff, 0x00, 0x05, 0x00, 0x13, 0x00, + 0x29, 0x00, 0x47, 0x00, 0x6c, 0x00, 0x98, 0x00, 0xc9, 0x00, 0xff, + 0x01, 0x39, 0x01, 0x77, 0x01, 0xb8, 0x01, 0xfc, 0x02, 0x40, 0x02, + 0x85, 0x02, 0xc8, 0x03, 0x07, 0x03, 0x42, 0x03, 0x75, 0x03, 0xa0, + 0x03, 0xc1, 0x03, 0xd6, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, + 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, + 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, + 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xdd, 0x03, 0xc6, 0x03, 0x87, + 0x03, 0x28, 0x02, 0xb4, 0x02, 0x32, 0x01, 0xab, 0x01, 0x29, 0x00, + 0xb5, 0x00, 0x56, 0x00, 0x17, 0xff, 0xff, 0x08, 0x1a, 0x07, 0xf1, + 0x07, 0x80, 0x06, 0xd6, 0x06, 0x00, 0x05, 0x0d, 0x04, 0x0c, 0x03, + 0x0b, 0x02, 0x19, 0x01, 0x43, 0x00, 0x98, 0x00, 0x27, 0xff, 0xfd, + 0x00, 0x5b, 0x01, 0x55, 0x02, 0xc5, 0x04, 0x84, 0x06, 0x6b, 0x08, + 0x52, 0x0a, 0x11, 0x0b, 0x82, 0x0c, 0x7c, 0x0c, 0xd8, 0x0c, 0xd8, + 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, + 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, + 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, 0xd8, 0x0c, + 0xbc, 0x0c, 0x6e, 0x0b, 0xfa, 0x0b, 0x6b, 0x0a, 0xcc, 0x0a, 0x26, + 0x09, 0x87, 0x08, 0xf8, 0x08, 0x84, 0x08, 0x36, 0x08, 0x1a, 0xff, + 0xff, 0xff, 0xd5, 0xff, 0x60, 0xfe, 0xaf, 0xfd, 0xd1, 0xfc, 0xd6, + 0xfb, 0xcb, 0xfa, 0xc1, 0xf9, 0xc5, 0xf8, 0xe8, 0xf8, 0x37, 0xf7, + 0xc2, 0xf7, 0x97, 0xf7, 0xc0, 0xf8, 0x32, 0xf8, 0xe3, 0xf9, 0xc6, + 0xfa, 0xd1, 0xfb, 0xf8, 0xfd, 0x30, 0xfe, 0x6e, 0xff, 0xa7, 0x00, + 0xcf, 0x01, 0xda, 0x02, 0xbd, 0x03, 0x6e, 0x03, 0xe0, 0x04, 0x08, + 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, + 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, + 0x04, 0x08, 0x03, 0xf0, 0x03, 0xae, 0x03, 0x4c, 0x02, 0xd2, 0x02, + 0x4a, 0x01, 0xbe, 0x01, 0x36, 0x00, 0xbc, 0x00, 0x5a, 0x00, 0x18, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x1d, 0x00, + 0x31, 0x00, 0x48, 0x00, 0x63, 0x00, 0x80, 0x00, 0x9e, 0x00, 0xbd, + 0x00, 0xdb, 0x00, 0xf8, 0x01, 0x13, 0x01, 0x2b, 0x01, 0x40, 0x01, + 0x53, 0x01, 0x63, 0x01, 0x71, 0x01, 0x7d, 0x01, 0x87, 0x01, 0x8f, + 0x01, 0x96, 0x01, 0x9b, 0x01, 0x9f, 0x01, 0xa2, 0x01, 0xa3, 0x01, + 0xa4, 0x01, 0xa5, 0x01, 0xa5, 0x01, 0xa5, 0x01, 0xa5, 0x01, 0xa5, + 0x01, 0xa5, 0x01, 0xa5, 0x01, 0xa5, 0x01, 0xa5, 0x01, 0xa5, 0x01, + 0xa5, 0x01, 0xa5, 0x01, 0xa5, 0x01, 0x9b, 0x01, 0x80, 0x01, 0x58, + 0x01, 0x26, 0x00, 0xef, 0x00, 0xb6, 0x00, 0x7e, 0x00, 0x4d, 0x00, + 0x25, 0x00, 0x0a, 0xff, 0xff, 0x02, 0x15, 0x02, 0x2e, 0x02, 0x72, + 0x02, 0xd8, 0x03, 0x59, 0x03, 0xeb, 0x04, 0x86, 0x05, 0x21, 0x05, + 0xb3, 0x06, 0x34, 0x06, 0x9b, 0x06, 0xdf, 0x06, 0xf7, 0x06, 0xe5, + 0x06, 0xb2, 0x06, 0x62, 0x05, 0xfc, 0x05, 0x84, 0x04, 0xff, 0x04, + 0x73, 0x03, 0xe4, 0x03, 0x57, 0x02, 0xd2, 0x02, 0x5a, 0x01, 0xf4, + 0x01, 0xa5, 0x01, 0x71, 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x5f, 0x01, + 0x5f, 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x5f, + 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x5f, 0x01, 0x63, 0x01, + 0x6f, 0x01, 0x80, 0x01, 0x96, 0x01, 0xae, 0x01, 0xc6, 0x01, 0xde, + 0x01, 0xf4, 0x02, 0x05, 0x02, 0x11, 0x02, 0x15, 0xff, 0xfe, 0x00, + 0x01, 0xc1, 0x70, 0xfb, 0x1c, 0xf9, 0xf2, 0xf6, 0xbb, 0xf1, 0xdf, + 0xeb, 0xc7, 0xe4, 0xde, 0xdd, 0x8b, 0xd6, 0x38, 0xcf, 0x4e, 0xc9, + 0x37, 0xc4, 0x5b, 0xc1, 0x23, 0xbf, 0xf9, 0xbf, 0xfa, 0xbf, 0xfb, + 0xbf, 0xfc, 0xbf, 0xfd, 0xbf, 0xff, 0xc0, 0x00, 0xc0, 0x02, 0xc0, + 0x03, 0xc0, 0x04, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, + 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, + 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, + 0xc0, 0x05, 0xc0, 0x05, 0xc0, 0x05, 0xc1, 0x66, 0xc5, 0x2c, 0xca, + 0xcf, 0xd1, 0xc7, 0xd9, 0x8c, 0xe1, 0x95, 0xe9, 0x5a, 0xf0, 0x52, + 0xf5, 0xf6, 0xf9, 0xbc, 0xfb, 0x1c, 0xd2, 0xdb, 0xd3, 0x58, 0xd4, + 0xb2, 0xd6, 0xbc, 0xd9, 0x4b, 0xdc, 0x31, 0xdf, 0x44, 0xe2, 0x57, + 0xe5, 0x3e, 0xe7, 0xcd, 0xe9, 0xd7, 0xeb, 0x31, 0xeb, 0xae, 0xe9, + 0x12, 0xe1, 0xfe, 0xd7, 0x90, 0xca, 0xe5, 0xbd, 0x1c, 0xaf, 0x54, + 0xa2, 0xa9, 0x98, 0x3b, 0x91, 0x27, 0x8e, 0x8b, 0x8e, 0xe4, 0x8f, + 0xd2, 0x91, 0x2c, 0x92, 0xc5, 0x94, 0x73, 0x96, 0x0d, 0x97, 0x66, + 0x98, 0x54, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, + 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x9a, 0x08, + 0x9d, 0xbf, 0xa3, 0x4c, 0xaa, 0x29, 0xb1, 0xcf, 0xb9, 0xb9, 0xc1, + 0x5f, 0xc8, 0x3c, 0xcd, 0xc9, 0xd1, 0x80, 0xd2, 0xdb, 0xd4, 0xb3, + 0xd5, 0x59, 0xd7, 0x22, 0xd9, 0xd5, 0xdd, 0x37, 0xe1, 0x0e, 0xe5, + 0x1f, 0xe9, 0x30, 0xed, 0x07, 0xf0, 0x69, 0xf3, 0x1c, 0xf4, 0xe6, + 0xf5, 0x8b, 0xf5, 0x8b, 0xf5, 0x8b, 0xf5, 0x8b, 0xf5, 0x8a, 0xf5, + 0x89, 0xf5, 0x89, 0xf5, 0x88, 0xf5, 0x88, 0xf5, 0x87, 0xf5, 0x87, + 0xf5, 0x86, 0xf5, 0x86, 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, + 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, + 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, 0x85, 0xf5, + 0x85, 0xf4, 0xc1, 0xf2, 0xa9, 0xef, 0x87, 0xeb, 0xa8, 0xe7, 0x57, + 0xe2, 0xe1, 0xde, 0x90, 0xda, 0xb1, 0xd7, 0x8f, 0xd5, 0x77, 0xd4, + 0xb3, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xca, 0x4e, 0xca, 0x4e, 0xca, 0x4e, 0xca, 0x4e, 0xca, 0x4e, + 0xca, 0x4e, 0xca, 0x4e, 0xca, 0x4e, 0xca, 0x4e, 0xca, 0x4e, 0xca, + 0x4e, 0xca, 0x4e, 0xca, 0x4e, 0xcb, 0x7c, 0xce, 0xae, 0xd3, 0x64, + 0xd9, 0x1d, 0xdf, 0x56, 0xe5, 0x90, 0xeb, 0x48, 0xef, 0xfe, 0xf3, + 0x31, 0xf4, 0x5e, 0xf4, 0x17, 0xf3, 0x57, 0xf2, 0x41, 0xf0, 0xf8, + 0xef, 0x9d, 0xee, 0x54, 0xed, 0x3e, 0xec, 0x7e, 0xec, 0x36, 0xec, + 0x36, 0xec, 0x36, 0xec, 0x36, 0xec, 0x36, 0xec, 0x36, 0xec, 0x36, + 0xec, 0x36, 0xec, 0x36, 0xeb, 0x6c, 0xe9, 0x42, 0xe6, 0x06, 0xe2, + 0x06, 0xdd, 0x91, 0xd8, 0xf4, 0xd4, 0x7f, 0xd0, 0x7f, 0xcd, 0x43, + 0xcb, 0x18, 0xca, 0x4e, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x7b, 0xed, 0x8b, + 0xff, 0xfe, 0x00, 0x01, 0xc1, 0x70, 0x05, 0x4b, 0x2b, 0xd6, 0xcc, + 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xdc, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0xf5, 0x48, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x5e, 0xd6, + 0x49, 0xec, 0x40, 0xb5, 0x9d, 0x00, 0x00, 0xff, 0xff, 0x25, 0x37, + 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xbf, + 0x5e, 0x1b, 0x09, 0x11, 0x44, 0xac, 0x43, 0x00, 0x00, 0x00, 0x00, + 0x1e, 0x4a, 0xff, 0xff, 0xff, 0x2f, 0xc9, 0xd7 +}; + +const int marioAnimPartialHandshakeRaw_length = 2120; diff --git a/sm64-san-andreas.cbp b/sm64-san-andreas.cbp index 5822504..f6c9813 100644 --- a/sm64-san-andreas.cbp +++ b/sm64-san-andreas.cbp @@ -197,6 +197,7 @@ +