diff --git a/src/game/level_update.c b/src/game/level_update.c index 713b2a8f..0a12be7d 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -557,9 +557,9 @@ s16 music_unchanged_through_warp(s16 arg) { s16 destArea = warpNode->node.destArea; s16 unchanged = TRUE; - s16 currBgMusic; -#ifndef DISABLE_LEVEL_SPECIFIC_CHECKS +#ifdef ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS + s16 currBgMusic; if (levelNum == LEVEL_BOB && levelNum == gCurrLevelNum && destArea == gCurrAreaIndex) { currBgMusic = get_current_background_music(); if (currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP | SEQ_VARIATION) @@ -577,7 +577,7 @@ s16 music_unchanged_through_warp(s16 arg) { if (get_current_background_music() != destParam2) { unchanged = FALSE; } -#ifndef DISABLE_LEVEL_SPECIFIC_CHECKS +#ifdef ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS } #endif return unchanged; diff --git a/src/game/puppycam2.c b/src/game/puppycam2.c index 01fd5f3c..089155ad 100644 --- a/src/game/puppycam2.c +++ b/src/game/puppycam2.c @@ -486,7 +486,7 @@ void puppycam_init(void) { gPuppyCam.targetObj2 = NULL; gPuppyCam.intendedFlags = PUPPYCAM_BEHAVIOUR_DEFAULT; -#ifndef DISABLE_LEVEL_SPECIFIC_CHECKS +#ifdef ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS if (gCurrLevelNum == LEVEL_PSS || (gCurrLevelNum == LEVEL_TTM && gCurrAreaIndex == 2) || (gCurrLevelNum == LEVEL_CCM && gCurrAreaIndex == 2)) { gPuppyCam.intendedFlags |= PUPPYCAM_BEHAVIOUR_SLIDE_CORRECTION; }