diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 660b87f846..41db53c954 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -349,7 +349,7 @@ LilycoveCity_ContestLobby_EventScript_SetMasterContestType::
 @ Functionally unused
 LilycoveCity_ContestLobby_EventScript_SetDebug::
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-#if UBFIX
+#ifdef UBFIX
 	setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 #else
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 8f08e01808..1ac10a4016 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -76,7 +76,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall::
 	applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN
-#if UBFIX
+#ifdef UBFIX
 	setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 #else
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index 9a75a4d951..a530e01113 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -6,7 +6,7 @@ SkyPillar_2F_MapScripts::
 
 SkyPillar_2F_OnTransition:
 	call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_2F_EventScript_CleanFloor
-#if UBFIX
+#ifdef UBFIX
 	setvar VAR_ICE_STEP_COUNT, 1
 #else
 	copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index b3f6020105..603144f04b 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -6,7 +6,7 @@ SkyPillar_4F_MapScripts::
 
 SkyPillar_4F_OnTransition:
 	call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_4F_EventScript_CleanFloor
-#if UBFIX
+#ifdef UBFIX
 	setvar VAR_ICE_STEP_COUNT, 1
 #else
 	copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index ca2a8404be..e6f9084705 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -3,7 +3,7 @@ CaveHole_CheckFallDownHole:
 	.2byte 0
 
 CaveHole_FixCrackedGround:
-#if UBFIX
+#ifdef UBFIX
 	setvar VAR_ICE_STEP_COUNT, 1
 #else
 	copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE