Constants for TextBoxFlags

5 files changed, 15 insertions, 7 deletions

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 2e44208ef..0bd3d54b9 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -29,6 +29,11 @@ TEXT_DELAY_SLOW EQU 5
 	const FRAME_7 ; 6
 	const FRAME_8 ; 7
 
+; TextBoxFlags:
+	const_def
+	const TEXT_DELAY_F    ; 0
+	const NO_TEXT_DELAY_F ; 1
+
 ; Options2:
 	const_def
 	const MENU_ACCOUNT ; 0
diff --git a/data/default_options.asm b/data/default_options.asm
index b1916b88c..57f621d82 100644
--- a/data/default_options.asm
+++ b/data/default_options.asm
@@ -5,12 +5,12 @@ DefaultOptions: ; 14f7c
 	db $00
 ; TextBoxFrame: frame 1
 	db FRAME_1
-; TextBoxFlags: ??
-	db $01
+; TextBoxFlags: use text speed
+	db 1 << TEXT_DELAY_F
 ; GBPrinter: normal brightness
 	db GBPRINTER_NORMAL
 ; Options2: menu account on
-	db $01
+	db 1 << MENU_ACCOUNT
 ; $cfd2: ??
 	db $00
 ; $cfd3: ??
diff --git a/home.asm b/home.asm
index 7091b58e2..9030f0a7f 100644
--- a/home.asm
+++ b/home.asm
@@ -306,7 +306,7 @@ PrintLetterDelay:: ; 313d
 
 ; non-scrolling text?
 	ld a, [TextBoxFlags]
-	bit 1, a
+	bit NO_TEXT_DELAY_F, a
 	ret z
 
 	push hl
@@ -323,7 +323,7 @@ PrintLetterDelay:: ; 313d
 
 ; force fast scroll?
 	ld a, [TextBoxFlags]
-	bit 0, a
+	bit TEXT_DELAY_F, a
 	jr z, .fast
 
 ; text speed
diff --git a/home/text.asm b/home/text.asm
index 7cf3c2c60..2c3504e6e 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -697,7 +697,7 @@ PokeFluteTerminatorCharacter:: ; 13e0
 PlaceHLTextAtBC:: ; 13e5
 	ld a, [TextBoxFlags]
 	push af
-	set 1, a
+	set NO_TEXT_DELAY_F, a
 	ld [TextBoxFlags], a
 
 	call DoTextUntilTerminator
diff --git a/wram.asm b/wram.asm
index c786495cf..317b31a1c 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1480,7 +1480,10 @@ wSaveFileExists:: db
 TextBoxFrame:: ; cfce
 ; bits 0-2: textbox frame 0-7
 	db
-TextBoxFlags:: db
+TextBoxFlags::
+; bit 0: 1-frame text delay
+; bit 4: no text delay
+	db
 GBPrinter:: ; cfd0
 ; bit 0-6: brightness
 ;   lightest: $00