diff --git a/include/config/config_graphics.h b/include/config/config_graphics.h index 8fbc19e1e..3a1817fda 100644 --- a/include/config/config_graphics.h +++ b/include/config/config_graphics.h @@ -78,9 +78,9 @@ // Disables the fix to Koopa's unshelled model. #define KOOPA_KEEP_PINK_SHORTS -// Copies the object graph node (model) to the star dance cutscene's object. +// Uses the star object's model in the star dance cutscene. // This has a side effect of making the star dance star also transparent when Mario collects a transparent star. -// #define CELEBRATION_STAR_COPY_MODEL +// #define STAR_DANCE_USES_STARS_MODEL // Lightweight directional lighting engine by Fazana. Intended for giving proximity and positional pointlights to small objects. // NOTE: Still breaks occasionally, and PUPPYLIGHT_NODE might not work in areas that aren't area 1. diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index 2dbc4a426..6ecf0a169 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -599,7 +599,7 @@ void general_star_dance_handler(struct MarioState *m, s32 isInWater) { switch (++m->actionTimer) { case 1: celebStar = spawn_object(m->marioObj, MODEL_STAR, bhvCelebrationStar); -#ifdef CELEBRATION_STAR_COPY_MODEL +#ifdef STAR_DANCE_USES_STARS_MODEL celebStar->header.gfx.sharedChild = m->interactObj->header.gfx.sharedChild; #else if (obj_has_model(m->interactObj, MODEL_BOWSER_KEY)) {