diff --git a/actors/snowman/geo.inc.c b/actors/snowman/geo.inc.c index ba4575baa..cecef9684 100644 --- a/actors/snowman/geo.inc.c +++ b/actors/snowman/geo.inc.c @@ -28,9 +28,10 @@ const GeoLayout mr_blizzard_hidden_geo[] = { GEO_OPEN_NODE(), 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_TRANSLATE_ROTATE(LAYER_OPAQUE, 490, 14, 43, 305, 0, 248), + GEO_OPEN_NODE(), + GEO_ASM(0, geo_mario_cap_display_list), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/src/game/characters.c b/src/game/characters.c index 8c9b54e2b..49ef2cd1d 100644 --- a/src/game/characters.c +++ b/src/game/characters.c @@ -104,7 +104,7 @@ struct Character gCharacters[CT_MAX] = { .capMetalModelId = MODEL_LUIGIS_METAL_CAP, .capWingModelId = MODEL_LUIGIS_WING_CAP, .capMetalWingModelId = MODEL_LUIGIS_WINGED_METAL_CAP, - .capEnemyLayer = LAYER_ALPHA, + .capEnemyLayer = LAYER_OPAQUE, .capEnemyGfx = luigi_cap_seg3_dl_03022F48, .capEnemyDecalGfx = NULL, .torsoRotMult = 1.0f, @@ -170,7 +170,7 @@ struct Character gCharacters[CT_MAX] = { .capMetalModelId = MODEL_TOADS_METAL_CAP, .capWingModelId = MODEL_TOADS_WING_CAP, .capMetalWingModelId = MODEL_TOADS_WINGED_METAL_CAP, - .capEnemyLayer = LAYER_ALPHA, + .capEnemyLayer = LAYER_OPAQUE, .capEnemyGfx = toad_cap_mesh_layer_1, .capEnemyDecalGfx = NULL, .torsoRotMult = 1.0f, @@ -236,7 +236,7 @@ struct Character gCharacters[CT_MAX] = { .capMetalModelId = MODEL_WALUIGIS_METAL_CAP, .capWingModelId = MODEL_WALUIGIS_WING_CAP, .capMetalWingModelId = MODEL_WALUIGIS_WINGED_METAL_CAP, - .capEnemyLayer = LAYER_ALPHA, + .capEnemyLayer = LAYER_OPAQUE, .capEnemyGfx = waluigi_cap_seg3_dl_03022F48, .capEnemyDecalGfx = NULL, .torsoRotMult = 1.0f, @@ -302,7 +302,7 @@ struct Character gCharacters[CT_MAX] = { .capMetalModelId = MODEL_WARIOS_METAL_CAP, .capWingModelId = MODEL_WARIOS_WING_CAP, .capMetalWingModelId = MODEL_WARIOS_WINGED_METAL_CAP, - .capEnemyLayer = LAYER_ALPHA, + .capEnemyLayer = LAYER_OPAQUE, .capEnemyGfx = wario_cap_seg3_dl_03022F48, .capEnemyDecalGfx = NULL, .torsoRotMult = 1.0f,