From 59ef3bdfee813f4cf71eb3841b5409e5a1a47e89 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sat, 25 Nov 2023 02:53:16 -0800 Subject: [PATCH] Disable Waluigi animations for now --- autogen/lua_definitions/constants.lua | 6 ------ docs/lua/constants.md | 2 -- include/mario_animation_ids.h | 4 ++-- src/game/characters.c | 6 +++--- src/pc/lua/smlua_constants_autogen.c | 2 -- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index c78783d3..f5050de2 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -5369,12 +5369,6 @@ MARIO_ANIM_FORWARD_SPINNING_FLIP = 207 --- @type MarioAnimID MARIO_ANIM_TRIPLE_JUMP_FLY = 208 ---- @type MarioAnimID -WALUIGI_ANIM_WALKING = 209 - ---- @type MarioAnimID -WALUIGI_ANIM_RUNNING = 210 - --- @class MarioCapGSCId --- @type MarioCapGSCId diff --git a/docs/lua/constants.md b/docs/lua/constants.md index 75eef03d..5fe2495e 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -1870,8 +1870,6 @@ | MARIO_ANIM_RETURN_FROM_STAR_DANCE | 206 | | MARIO_ANIM_FORWARD_SPINNING_FLIP | 207 | | MARIO_ANIM_TRIPLE_JUMP_FLY | 208 | -| WALUIGI_ANIM_WALKING | 209 | -| WALUIGI_ANIM_RUNNING | 210 | [:arrow_up_small:](#) diff --git a/include/mario_animation_ids.h b/include/mario_animation_ids.h index 71d59798..efc912db 100644 --- a/include/mario_animation_ids.h +++ b/include/mario_animation_ids.h @@ -215,8 +215,8 @@ enum MarioAnimID /* 0xCE */ MARIO_ANIM_RETURN_FROM_STAR_DANCE, /* 0xCF */ MARIO_ANIM_FORWARD_SPINNING_FLIP, /* 0xD0 */ MARIO_ANIM_TRIPLE_JUMP_FLY, - /* 0xD1 */ WALUIGI_ANIM_WALKING, - /* 0xD2 */ WALUIGI_ANIM_RUNNING + /* 0xD1 */ // WALUIGI_ANIM_WALKING, // disabling for now until we find a better way to deal with OMM + /* 0xD2 */ // WALUIGI_ANIM_RUNNING // disabling for now until we find a better way to deal with OMM }; /* Character Animation IDs*/ diff --git a/src/game/characters.c b/src/game/characters.c index abeaea8b..4ee5ed0a 100644 --- a/src/game/characters.c +++ b/src/game/characters.c @@ -954,7 +954,7 @@ struct Character gCharacters[CT_MAX] = { .animSlidingOnBottomWithLightObj = MARIO_ANIM_SLIDING_ON_BOTTOM_WITH_LIGHT_OBJ, .animStandUpFromSlidingWithLightObj = MARIO_ANIM_STAND_UP_FROM_SLIDING_WITH_LIGHT_OBJ, .animRidingShell = MARIO_ANIM_RIDING_SHELL, - .animWalking = WALUIGI_ANIM_WALKING, + .animWalking = MARIO_ANIM_WALKING, .animForwardFlip = MARIO_ANIM_FORWARD_FLIP, .animJumpRidingShell = MARIO_ANIM_JUMP_RIDING_SHELL, .animLandFromDoubleJump = MARIO_ANIM_LAND_FROM_DOUBLE_JUMP, @@ -996,7 +996,7 @@ struct Character gCharacters[CT_MAX] = { .animForwardSpinning = MARIO_ANIM_FORWARD_SPINNING, .animBackwardSpinning = MARIO_ANIM_BACKWARD_SPINNING, .animBreakdance = MARIO_ANIM_BREAKDANCE, - .animRunning = WALUIGI_ANIM_RUNNING, + .animRunning = MARIO_ANIM_RUNNING, .animRunningUnused = MARIO_ANIM_RUNNING_UNUSED, .animSoftBackKb = MARIO_ANIM_SOFT_BACK_KB, .animSoftFrontKb = MARIO_ANIM_SOFT_FRONT_KB, @@ -1613,6 +1613,6 @@ s32 get_character_anim(struct MarioState* m, enum CharacterAnimID characterAnim) if (m == NULL || m->marioObj == NULL) { return 0; } struct Character* character = ((m == NULL || m->character == NULL) ? &gCharacters[CT_MARIO] : m->character); - if (!character || characterAnim < 0 || characterAnim >= CHAR_ANIM_MAX) { return 0; } + if (!character || characterAnim < 0 || characterAnim >= CHAR_ANIM_MAX) { return characterAnim; } return character->anims[characterAnim]; } \ No newline at end of file diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index ed3b469f..618ef402 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -1785,8 +1785,6 @@ char gSmluaConstants[] = "" "MARIO_ANIM_RETURN_FROM_STAR_DANCE = 206\n" "MARIO_ANIM_FORWARD_SPINNING_FLIP = 207\n" "MARIO_ANIM_TRIPLE_JUMP_FLY = 208\n" -"WALUIGI_ANIM_WALKING = 209\n" -"WALUIGI_ANIM_RUNNING = 210\n" "CHAR_ANIM_SLOW_LEDGE_GRAB = 0\n" "CHAR_ANIM_FALL_OVER_BACKWARDS = 1\n" "CHAR_ANIM_BACKWARD_AIR_KB = 2\n"