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

Fix snowman cap

This commit is contained in:
Agent X 2024-07-05 22:47:22 -04:00
parent b20753f0c0
commit dcd3665b7a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actors/snowman/geo.inc.c
View File

@ -29,6 +29,7 @@ const GeoLayout mr_blizzard_hidden_geo[] = {
GEO_SCALE(0x00, 65536), GEO_SCALE(0x00, 65536),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_ASM(0, geo_mario_set_player_colors), GEO_ASM(0, geo_mario_set_player_colors),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_ALPHA, 490, 14, 43, 305, 0, 248, mario_cap_m_logo_decal),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OPAQUE, 490, 14, 43, 305, 0, 248, mario_cap_seg3_dl_03022F48), GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OPAQUE, 490, 14, 43, 305, 0, 248, mario_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),

2
src/game/behaviors/mr_blizzard.inc.c
View File

@ -246,7 +246,7 @@ static void mr_blizzard_act_death(void) {
if (o->oAnimState) { if (o->oAnimState) {
gMarioStates[0].cap &= ~SAVE_FLAG_CAP_ON_MR_BLIZZARD; gMarioStates[0].cap &= ~SAVE_FLAG_CAP_ON_MR_BLIZZARD;
cap = spawn_object_relative(0, 5, 105, 0, o, MODEL_MARIOS_CAP, bhvNormalCap); cap = spawn_object_relative(0, 5, 105, 0, o, gMarioStates[0].character->capModelId, bhvNormalCap);
if (cap != NULL) { if (cap != NULL) {
cap->globalPlayerIndex = o->globalPlayerIndex; cap->globalPlayerIndex = o->globalPlayerIndex;
cap->oMoveAngleYaw = o->oFaceAngleYaw + (o->oFaceAngleRoll < 0 ? 0x4000 : -0x4000); cap->oMoveAngleYaw = o->oFaceAngleYaw + (o->oFaceAngleRoll < 0 ? 0x4000 : -0x4000);