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

Remove OMM Rebirth temporary fixes (#542)

This commit is contained in:
PeachyPeach 2023-12-03 16:22:41 +01:00 committed by Agent X
parent 3819bbe0a3
commit 2a36b14dcd
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autogen/lua_definitions/constants.lua
View File

@ -5625,6 +5625,12 @@ MARIO_ANIM_FORWARD_SPINNING_FLIP = 207
--- @type MarioAnimID --- @type MarioAnimID
MARIO_ANIM_TRIPLE_JUMP_FLY = 208 MARIO_ANIM_TRIPLE_JUMP_FLY = 208
--- @type MarioAnimID
WALUIGI_ANIM_WALKING = 209
--- @type MarioAnimID
WALUIGI_ANIM_RUNNING = 210
--- @class MarioCapGSCId --- @class MarioCapGSCId
--- @type MarioCapGSCId --- @type MarioCapGSCId

2
docs/lua/constants.md
View File

@ -1978,6 +1978,8 @@
| MARIO_ANIM_RETURN_FROM_STAR_DANCE | 206 | | MARIO_ANIM_RETURN_FROM_STAR_DANCE | 206 |
| MARIO_ANIM_FORWARD_SPINNING_FLIP | 207 | | MARIO_ANIM_FORWARD_SPINNING_FLIP | 207 |
| MARIO_ANIM_TRIPLE_JUMP_FLY | 208 | | MARIO_ANIM_TRIPLE_JUMP_FLY | 208 |
| WALUIGI_ANIM_WALKING | 209 |
| WALUIGI_ANIM_RUNNING | 210 |
[:arrow_up_small:](#) [:arrow_up_small:](#)

4
include/mario_animation_ids.h
View File

@ -215,8 +215,8 @@ enum MarioAnimID
/* 0xCE */ MARIO_ANIM_RETURN_FROM_STAR_DANCE, /* 0xCE */ MARIO_ANIM_RETURN_FROM_STAR_DANCE,
/* 0xCF */ MARIO_ANIM_FORWARD_SPINNING_FLIP, /* 0xCF */ MARIO_ANIM_FORWARD_SPINNING_FLIP,
/* 0xD0 */ MARIO_ANIM_TRIPLE_JUMP_FLY, /* 0xD0 */ MARIO_ANIM_TRIPLE_JUMP_FLY,
/* 0xD1 */ // WALUIGI_ANIM_WALKING, // disabling for now until we find a better way to deal with OMM /* 0xD1 */ WALUIGI_ANIM_WALKING,
/* 0xD2 */ // WALUIGI_ANIM_RUNNING // disabling for now until we find a better way to deal with OMM /* 0xD2 */ WALUIGI_ANIM_RUNNING
}; };
/* Character Animation IDs*/ /* Character Animation IDs*/

4
src/game/characters.c
View File

@ -954,7 +954,7 @@ struct Character gCharacters[CT_MAX] = {
.animSlidingOnBottomWithLightObj = MARIO_ANIM_SLIDING_ON_BOTTOM_WITH_LIGHT_OBJ, .animSlidingOnBottomWithLightObj = MARIO_ANIM_SLIDING_ON_BOTTOM_WITH_LIGHT_OBJ,
.animStandUpFromSlidingWithLightObj = MARIO_ANIM_STAND_UP_FROM_SLIDING_WITH_LIGHT_OBJ, .animStandUpFromSlidingWithLightObj = MARIO_ANIM_STAND_UP_FROM_SLIDING_WITH_LIGHT_OBJ,
.animRidingShell = MARIO_ANIM_RIDING_SHELL, .animRidingShell = MARIO_ANIM_RIDING_SHELL,
.animWalking = MARIO_ANIM_WALKING, .animWalking = WALUIGI_ANIM_WALKING,
.animForwardFlip = MARIO_ANIM_FORWARD_FLIP, .animForwardFlip = MARIO_ANIM_FORWARD_FLIP,
.animJumpRidingShell = MARIO_ANIM_JUMP_RIDING_SHELL, .animJumpRidingShell = MARIO_ANIM_JUMP_RIDING_SHELL,
.animLandFromDoubleJump = MARIO_ANIM_LAND_FROM_DOUBLE_JUMP, .animLandFromDoubleJump = MARIO_ANIM_LAND_FROM_DOUBLE_JUMP,
@ -996,7 +996,7 @@ struct Character gCharacters[CT_MAX] = {
.animForwardSpinning = MARIO_ANIM_FORWARD_SPINNING, .animForwardSpinning = MARIO_ANIM_FORWARD_SPINNING,
.animBackwardSpinning = MARIO_ANIM_BACKWARD_SPINNING, .animBackwardSpinning = MARIO_ANIM_BACKWARD_SPINNING,
.animBreakdance = MARIO_ANIM_BREAKDANCE, .animBreakdance = MARIO_ANIM_BREAKDANCE,
.animRunning = MARIO_ANIM_RUNNING, .animRunning = WALUIGI_ANIM_RUNNING,
.animRunningUnused = MARIO_ANIM_RUNNING_UNUSED, .animRunningUnused = MARIO_ANIM_RUNNING_UNUSED,
.animSoftBackKb = MARIO_ANIM_SOFT_BACK_KB, .animSoftBackKb = MARIO_ANIM_SOFT_BACK_KB,
.animSoftFrontKb = MARIO_ANIM_SOFT_FRONT_KB, .animSoftFrontKb = MARIO_ANIM_SOFT_FRONT_KB,

2
src/pc/lua/smlua_constants_autogen.c
View File

@ -1876,6 +1876,8 @@ char gSmluaConstants[] = ""
"MARIO_ANIM_RETURN_FROM_STAR_DANCE = 206\n" "MARIO_ANIM_RETURN_FROM_STAR_DANCE = 206\n"
"MARIO_ANIM_FORWARD_SPINNING_FLIP = 207\n" "MARIO_ANIM_FORWARD_SPINNING_FLIP = 207\n"
"MARIO_ANIM_TRIPLE_JUMP_FLY = 208\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_SLOW_LEDGE_GRAB = 0\n"
"CHAR_ANIM_FALL_OVER_BACKWARDS = 1\n" "CHAR_ANIM_FALL_OVER_BACKWARDS = 1\n"
"CHAR_ANIM_BACKWARD_AIR_KB = 2\n" "CHAR_ANIM_BACKWARD_AIR_KB = 2\n"