From 2a36b14dcd403923fd32a84706e5088e52867952 Mon Sep 17 00:00:00 2001 From: PeachyPeach <72323920+PeachyPeachSM64@users.noreply.github.com> Date: Sun, 3 Dec 2023 16:22:41 +0100 Subject: [PATCH] Remove OMM Rebirth temporary fixes (#542) --- autogen/lua_definitions/constants.lua | 6 ++++++ docs/lua/constants.md | 2 ++ include/mario_animation_ids.h | 4 ++-- src/game/characters.c | 4 ++-- src/pc/lua/smlua_constants_autogen.c | 2 ++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index 3830e8fb..385ef1b7 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -5625,6 +5625,12 @@ 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 b712d94f..74b96bd4 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -1978,6 +1978,8 @@ | 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 efc912db..71d59798 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, // 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 + /* 0xD1 */ WALUIGI_ANIM_WALKING, + /* 0xD2 */ WALUIGI_ANIM_RUNNING }; /* Character Animation IDs*/ diff --git a/src/game/characters.c b/src/game/characters.c index 0369dc47..579d1797 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 = MARIO_ANIM_WALKING, + .animWalking = WALUIGI_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 = MARIO_ANIM_RUNNING, + .animRunning = WALUIGI_ANIM_RUNNING, .animRunningUnused = MARIO_ANIM_RUNNING_UNUSED, .animSoftBackKb = MARIO_ANIM_SOFT_BACK_KB, .animSoftFrontKb = MARIO_ANIM_SOFT_FRONT_KB, diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 714a2f99..7781f292 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -1876,6 +1876,8 @@ 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"