print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up remaining DISABLE_LEVEL_CHECKS ifndefs (#479)

Browse Source
This commit is contained in:
Tubular Bells
2022-09-21 19:13:19 -05:00
committed by GitHub
parent 058399308a
commit d5019ffd78
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/level_update.c
View File

@@ -557,9 +557,9 @@ s16 music_unchanged_through_warp(s16 arg) {
s16 destArea = warpNode->node.destArea; s16 destArea = warpNode->node.destArea;
s16 unchanged = TRUE; 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) { if (levelNum == LEVEL_BOB && levelNum == gCurrLevelNum && destArea == gCurrAreaIndex) {
currBgMusic = get_current_background_music(); currBgMusic = get_current_background_music();
if (currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP | SEQ_VARIATION) 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) { if (get_current_background_music() != destParam2) {
unchanged = FALSE; unchanged = FALSE;
} }
#ifndef DISABLE_LEVEL_SPECIFIC_CHECKS #ifdef ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS
} }
#endif #endif
return unchanged; return unchanged;

2
src/game/puppycam2.c
View File

@@ -486,7 +486,7 @@ void puppycam_init(void) {
gPuppyCam.targetObj2 = NULL; gPuppyCam.targetObj2 = NULL;
gPuppyCam.intendedFlags = PUPPYCAM_BEHAVIOUR_DEFAULT; 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)) { if (gCurrLevelNum == LEVEL_PSS || (gCurrLevelNum == LEVEL_TTM && gCurrAreaIndex == 2) || (gCurrLevelNum == LEVEL_CCM && gCurrAreaIndex == 2)) {
gPuppyCam.intendedFlags |= PUPPYCAM_BEHAVIOUR_SLIDE_CORRECTION; gPuppyCam.intendedFlags |= PUPPYCAM_BEHAVIOUR_SLIDE_CORRECTION;
} }