From dcd3665b7aa0b48d233903230cd73ef3be7ca834 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Fri, 5 Jul 2024 22:47:22 -0400 Subject: [PATCH] Fix snowman cap --- actors/snowman/geo.inc.c | 1 + src/game/behaviors/mr_blizzard.inc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/actors/snowman/geo.inc.c b/actors/snowman/geo.inc.c index ad3b5d93..ba4575ba 100644 --- a/actors/snowman/geo.inc.c +++ b/actors/snowman/geo.inc.c @@ -29,6 +29,7 @@ const GeoLayout mr_blizzard_hidden_geo[] = { GEO_SCALE(0x00, 65536), GEO_OPEN_NODE(), 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_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/src/game/behaviors/mr_blizzard.inc.c b/src/game/behaviors/mr_blizzard.inc.c index 1d0e0343..6a0edf29 100644 --- a/src/game/behaviors/mr_blizzard.inc.c +++ b/src/game/behaviors/mr_blizzard.inc.c @@ -246,7 +246,7 @@ static void mr_blizzard_act_death(void) { if (o->oAnimState) { 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) { cap->globalPlayerIndex = o->globalPlayerIndex; cap->oMoveAngleYaw = o->oFaceAngleYaw + (o->oFaceAngleRoll < 0 ? 0x4000 : -0x4000);