diff --git a/src/constants/map_constants.asm b/src/constants/map_constants.asm
index 33ddb7b..821612d 100644
--- a/src/constants/map_constants.asm
+++ b/src/constants/map_constants.asm
@@ -123,8 +123,8 @@ DEF GR_ISLAND  EQU $1
 	const MAP_GR_CASTLE_ENTRANCE             ; $71
 	const MAP_GR_CASTLE                      ; $72
 	const MAP_GR_CASTLE_BIRURITCHI           ; $73
-
-DEF MAP_NONE EQU -1
+	const_def -1
+	const MAP_NONE                           ; $ff
 
 	; MAP_GFX_*
 	; referenced in MapHeaders, and others. see also: data/map_gfx.asm
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
index 9fbdbeb..616a201 100644
--- a/src/constants/npc_constants.asm
+++ b/src/constants/npc_constants.asm
@@ -331,8 +331,8 @@ DEF NUM_PICS EQU const_value
 	const NPC_WHITE_CASTLE_COIN                 ; $e6
 	const NPC_PURPLE_CASTLE_COIN                ; $e7
 	const NPC_STRONGHOLD_PLATFORM               ; $e8
-
-DEF NPC_NONE EQU -1
+	const_def -1
+	const NPC_NONE                              ; $ff
 
 ; grand masters
 	const_def
diff --git a/src/constants/ow_anim_constants.asm b/src/constants/ow_anim_constants.asm
index 411645a..9156011 100644
--- a/src/constants/ow_anim_constants.asm
+++ b/src/constants/ow_anim_constants.asm
@@ -43,7 +43,7 @@
 	const OW_ANIM_29   ; $29
 	const OW_ANIM_2A   ; $2a
 	const OW_ANIM_2B   ; $2b
-DEF const_value = $ff
+	const_def -1
 	const OW_ANIM_NONE ; $ff
 
 	const_def