hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop/2.0.1' of https://github.com/Reonu/HackerSM64 into develop/arceveti/general_2

Browse Source
This commit is contained in:
Arceveti
2022-01-22 14:09:35 -08:00
parent 59bd837ad1 4265019923
commit ddcd9bcd22
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/config/config_graphics.h
View File

@@ -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.

2
src/game/mario_actions_cutscene.c
View File

@@ -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)) {