Fix text speed options

Author: FredrIQ

constants/ram_constants.asm

@@ -39,10 +39,10 @@ DEF AUTOSCROLL_AORB    EQU %01100
 DEF TURNING_SPEED_MASK EQU %10000
 
 	const_def
-	const INST_TEXT ; %00
-	const FAST_TEXT ; %01
-	const MED_TEXT  ; %10
-	const SLOW_TEXT ; %11
+	const SLOW_TEXT ; %00
+	const MED_TEXT ; %01
+	const FAST_TEXT  ; %10
+	const INST_TEXT ; %11
 
 ; wTextboxFrame::
 	const_def

engine/battle/core.asm

@@ -5221,9 +5221,9 @@ MoveSelectionScreen:
 	call ClearSprites
 	pop hl
 	call BattleMoveDescTextbox
-	assert INST_TEXT == 0
 	ld a, [wOptions1]
 	and TEXT_DELAY_MASK
+	cp INST_TEXT
 	jr nz, .no_delay
 	ld c, 10
 	call DelayFrames ; 0.333s delay to allow users with autoscroll on start to see the description

engine/menus/options_menu.asm

@@ -167,17 +167,17 @@ Options_TextSpeed:
 	ret
 
 .Strings:
-	dw .Instant
-	dw .Fast
-	dw .Medium
 	dw .Slow
+	dw .Medium
+	dw .Fast
+	dw .Instant
 
-.Fast:
-	db "Fast   @"
-.Medium:
-	db "Medium @"
 .Slow:
 	db "Slow   @"
+.Medium:
+	db "Medium @"
+.Fast:
+	db "Fast   @"
 .Instant:
 	db "Instant@"
 

home/print_text.asm

@@ -1,11 +1,6 @@
 PrintLetterDelay::
 ; Wait before printing the next letter.
 
-; The text speed setting in wOptions1 is actually a frame count:
-; 	fast: 1 frame
-; 	mid:  3 frames
-; 	slow: 5 frames
-
 ; wTextboxFlags[!0] and A or B override text speed with a one-frame delay.
 ; wOptions1[4] and wTextboxFlags[!1] disable the delay.
 
@@ -18,7 +13,8 @@ PrintLetterDelay::
 	ld a, [wOptions1]
 	bit NO_TEXT_SCROLL, a
 	ret nz
-	and %11
+	and TEXT_DELAY_MASK
+	cp INST_TEXT
 	ret z
 	ld a, $1
 	ldh [hBGMapHalf], a
@@ -29,14 +25,17 @@ PrintLetterDelay::
 ; force fast scroll?
 	ld a, [wTextboxFlags]
 	bit 0, a
-	ld a, 2
+	ld a, FAST_TEXT
 	jr z, .updateDelay
 ; text speed
+
+	; Slow/Mid/Fast: 5/3/1 frames.
 	ld a, [wOptions1]
-	and %11
-	rlca
+	and TEXT_DELAY_MASK
 .updateDelay
-	dec a
+	add a
+	cpl
+	add 6
 	ld [wTextDelayFrames], a
 .textDelayLoop
 	ld a, [wTextDelayFrames]