diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index 1bb32f8e..4aff58da 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -7,3 +7,12 @@ TRUE  EQU 1
 	const FLAG_RESET ; 0
 	const FLAG_SET   ; 1
 	const FLAG_TEST  ; 2
+
+; wOptions
+TEXT_DELAY_FAST    EQU %001 ; 1
+TEXT_DELAY_MEDIUM  EQU %011 ; 3
+TEXT_DELAY_SLOW    EQU %101 ; 5
+
+	const_def 6
+	const BIT_BATTLE_SHIFT     ; 6
+	const BIT_BATTLE_ANIMATION ; 7
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index a93af9e9..476e937f 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -395,7 +395,7 @@ MoveAnimation:
 .moveAnimation
 	; check if battle animations are disabled in the options
 	ld a, [wOptions]
-	bit 7, a
+	bit BIT_BATTLE_ANIMATION, a
 	jr nz, .animationsDisabled
 	call ShareMoveAnimations
 	call PlayAnimation
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 6c0585b6..efcba34b 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1372,7 +1372,7 @@ EnemySendOutFirstMon:
 	cp LINK_STATE_BATTLING
 	jr z, .next4
 	ld a, [wOptions]
-	bit 6, a
+	bit BIT_BATTLE_SHIFT, a
 	jr nz, .next4
 	ld hl, TrainerAboutToUseText
 	call PrintText
diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm
index 860b76b6..b1fd8ac2 100644
--- a/engine/battle/move_effects/substitute.asm
+++ b/engine/battle/move_effects/substitute.asm
@@ -45,7 +45,7 @@ SubstituteEffect_:
 	ld l, c
 	set HAS_SUBSTITUTE_UP, [hl]
 	ld a, [wOptions]
-	bit 7, a ; battle animation is enabled?
+	bit BIT_BATTLE_ANIMATION, a
 	ld hl, PlayCurrentMoveAnimation
 	ld b, BANK(PlayCurrentMoveAnimation)
 	jr z, .animationEnabled
diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm
index 02280db0..f2297129 100644
--- a/engine/debug/debug_menu.asm
+++ b/engine/debug/debug_menu.asm
@@ -26,7 +26,7 @@ IF DEF(_DEBUG)
 	ld de, DebugMenuOptions
 	call PlaceString
 
-	ld a, 3 ; medium speed
+	ld a, TEXT_DELAY_MEDIUM
 	ld [wOptions], a
 
 	ld a, A_BUTTON | B_BUTTON | START
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index c3366b8e..7e4cc9be 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -125,9 +125,9 @@ MainMenu:
 	jp SpecialEnterMap
 
 InitOptions:
-	ld a, 1 ; no delay
+	ld a, TEXT_DELAY_FAST
 	ld [wLetterPrintingDelayFlags], a
-	ld a, 3 ; medium speed
+	ld a, TEXT_DELAY_MEDIUM
 	ld [wOptions], a
 	ret
 
@@ -678,11 +678,10 @@ SetCursorPositionsFromOptions:
 ; 00: X coordinate of menu cursor
 ; 01: delay after printing a letter (in frames)
 TextSpeedOptionData:
-	db 14, 5 ; Slow
-	db  7, 3 ; Medium
-	db  1, 1 ; Fast
-	db 7 ; default X coordinate (Medium)
-	db -1 ; end
+	db 14, TEXT_DELAY_SLOW
+	db  7, TEXT_DELAY_MEDIUM
+	db  1, TEXT_DELAY_FAST
+	db  7, -1 ; end (default X coordinate)
 
 CheckForPlayerNameInSRAM:
 ; Check if the player name data in SRAM has a string terminator character
diff --git a/home/start_menu.asm b/home/start_menu.asm
index ed3d9470..5a531744 100644
--- a/home/start_menu.asm
+++ b/home/start_menu.asm
@@ -33,7 +33,7 @@ RedisplayStartMenu::
 	call EraseMenuCursor
 	jr .loop
 .checkIfDownPressed
-	bit 7, a
+	bit BIT_D_DOWN, a
 	jr z, .buttonPressed
 ; if the player pressed tried to go past the bottom item, wrap around to the top
 	CheckEvent EVENT_GOT_POKEDEX
diff --git a/home/window.asm b/home/window.asm
index 45b207a8..0abe366d 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -68,7 +68,7 @@ HandleMenuInput_::
 	ld [wCurrentMenuItem], a ; wrap to the bottom of the menu
 	jr .checkOtherKeys
 .checkIfDownPressed
-	bit 7, a
+	bit BIT_D_DOWN, a
 	jr z, .checkOtherKeys
 .downPressed
 	ld a, [wCurrentMenuItem]