thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Text speed options: INSTANT, FAST, MED

Browse source 
The options menu on the main menu currently doesn't work. Options menu in-game works fine.
This commit is contained in:
BlueZangoose 2023-07-03 23:50:46 +01:00
parent ee001744dc
commit a4f066d705
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
constants/misc_constants.asm
View file

@ -9,9 +9,9 @@ DEF TRUE EQU 1
const FLAG_TEST ; 2 const FLAG_TEST ; 2
; wOptions ; wOptions
DEF TEXT_DELAY_FAST EQU %001 ; 1 DEF TEXT_DELAY_FAST EQU %000 ; 0
DEF TEXT_DELAY_MEDIUM EQU %011 ; 3 DEF TEXT_DELAY_MEDIUM EQU %001 ; 1
DEF TEXT_DELAY_SLOW EQU %101 ; 5 DEF TEXT_DELAY_SLOW EQU %011 ; 3
const_def 6 const_def 6
const BIT_BATTLE_SHIFT ; 6 const BIT_BATTLE_SHIFT ; 6

2
engine/debug/debug_menu.asm
View file

@ -28,7 +28,7 @@ IF DEF(_DEBUG)
ld de, DebugMenuOptions ld de, DebugMenuOptions
call PlaceString call PlaceString
ld a, TEXT_DELAY_FAST ld a, TEXT_DELAY_MEDIUM
ld [wOptions], a ld [wOptions], a
ld a, A_BUTTON | B_BUTTON | START ld a, A_BUTTON | B_BUTTON | START

32
engine/menus/main_menu.asm
View file

@ -127,7 +127,7 @@ MainMenu:
InitOptions: InitOptions:
ld a, TEXT_DELAY_FAST ld a, TEXT_DELAY_FAST
ld [wLetterPrintingDelayFlags], a 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 ld [wOptions], a
ret ret
@ -561,32 +561,32 @@ DisplayOptionMenu:
jp .eraseOldMenuCursor jp .eraseOldMenuCursor
.pressedLeftInTextSpeed .pressedLeftInTextSpeed
ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate
cp 1 cp 1 ; 1 = Instant
jr z, .updateTextSpeedXCoord jr z, .updateTextSpeedXCoord
cp 7 cp 9 ; 9 = Fast
jr nz, .fromSlowToMedium jr nz, .fromMedToFast
sub 6 sub 8 ; Fast to Instant
jr .updateTextSpeedXCoord jr .updateTextSpeedXCoord
.fromSlowToMedium .fromMedToFast
sub 7 sub 6 ; Med to Fast
jr .updateTextSpeedXCoord jr .updateTextSpeedXCoord
.pressedRightInTextSpeed .pressedRightInTextSpeed
ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate
cp 14 cp 15 ; 15 = Med
jr z, .updateTextSpeedXCoord jr z, .updateTextSpeedXCoord
cp 7 cp 9 ; 9 = Fast
jr nz, .fromFastToMedium jr nz, .fromInstantToFast
add 7 add 6 ; Fast to Medium
jr .updateTextSpeedXCoord jr .updateTextSpeedXCoord
.fromFastToMedium .fromInstantToFast
add 6 add 8 ; Instant to Fast
.updateTextSpeedXCoord .updateTextSpeedXCoord
ld [wOptionsTextSpeedCursorX], a ; text speed cursor X coordinate ld [wOptionsTextSpeedCursorX], a ; text speed cursor X coordinate
jp .eraseOldMenuCursor jp .eraseOldMenuCursor
TextSpeedOptionText: TextSpeedOptionText:
db "TEXT SPEED" db "TEXT SPEED"
next " FAST MEDIUM SLOW@" next " INSTANT FAST MED@"
BattleAnimationOptionText: BattleAnimationOptionText:
db "BATTLE ANIMATION" db "BATTLE ANIMATION"
@ -682,9 +682,9 @@ SetCursorPositionsFromOptions:
; 01: delay after printing a letter (in frames) ; 01: delay after printing a letter (in frames)
TextSpeedOptionData: TextSpeedOptionData:
db 14, TEXT_DELAY_SLOW db 14, TEXT_DELAY_SLOW
db 7, TEXT_DELAY_MEDIUM db 9, TEXT_DELAY_MEDIUM
db 1, TEXT_DELAY_FAST db 1, TEXT_DELAY_FAST
db 7, -1 ; end (default X coordinate) db 9, -1 ; end (default X coordinate)
CheckForPlayerNameInSRAM: CheckForPlayerNameInSRAM:
; Check if the player name data in SRAM has a string terminator character ; Check if the player name data in SRAM has a string terminator character