diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 84775608..9d664e4b 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -9,9 +9,9 @@ DEF TRUE EQU 1 const FLAG_TEST ; 2 ; wOptions -DEF TEXT_DELAY_FAST EQU %001 ; 1 -DEF TEXT_DELAY_MEDIUM EQU %011 ; 3 -DEF TEXT_DELAY_SLOW EQU %101 ; 5 +DEF TEXT_DELAY_FAST EQU %000 ; 0 +DEF TEXT_DELAY_MEDIUM EQU %001 ; 1 +DEF TEXT_DELAY_SLOW EQU %011 ; 3 const_def 6 const BIT_BATTLE_SHIFT ; 6 diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 117da7f6..a5cf507d 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -28,7 +28,7 @@ IF DEF(_DEBUG) ld de, DebugMenuOptions call PlaceString - ld a, TEXT_DELAY_FAST + 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 e362624e..8aad5075 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -127,7 +127,7 @@ MainMenu: InitOptions: ld a, TEXT_DELAY_FAST ld [wLetterPrintingDelayFlags], a - ld a, TEXT_DELAY_FAST ; makes fasttext come up without the need to change settings + ld a, TEXT_DELAY_MEDIUM ld [wOptions], a ret @@ -561,32 +561,32 @@ DisplayOptionMenu: jp .eraseOldMenuCursor .pressedLeftInTextSpeed ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate - cp 1 + cp 1 ; 1 = Instant jr z, .updateTextSpeedXCoord - cp 7 - jr nz, .fromSlowToMedium - sub 6 + cp 9 ; 9 = Fast + jr nz, .fromMedToFast + sub 8 ; Fast to Instant jr .updateTextSpeedXCoord -.fromSlowToMedium - sub 7 +.fromMedToFast + sub 6 ; Med to Fast jr .updateTextSpeedXCoord .pressedRightInTextSpeed ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate - cp 14 + cp 15 ; 15 = Med jr z, .updateTextSpeedXCoord - cp 7 - jr nz, .fromFastToMedium - add 7 + cp 9 ; 9 = Fast + jr nz, .fromInstantToFast + add 6 ; Fast to Medium jr .updateTextSpeedXCoord -.fromFastToMedium - add 6 +.fromInstantToFast + add 8 ; Instant to Fast .updateTextSpeedXCoord ld [wOptionsTextSpeedCursorX], a ; text speed cursor X coordinate jp .eraseOldMenuCursor TextSpeedOptionText: db "TEXT SPEED" - next " FAST MEDIUM SLOW@" + next " INSTANT FAST MED@" BattleAnimationOptionText: db "BATTLE ANIMATION" @@ -682,9 +682,9 @@ SetCursorPositionsFromOptions: ; 01: delay after printing a letter (in frames) TextSpeedOptionData: db 14, TEXT_DELAY_SLOW - db 7, TEXT_DELAY_MEDIUM + db 9, TEXT_DELAY_MEDIUM db 1, TEXT_DELAY_FAST - db 7, -1 ; end (default X coordinate) + db 9, -1 ; end (default X coordinate) CheckForPlayerNameInSRAM: ; Check if the player name data in SRAM has a string terminator character