Skip to content

Create text speed constants #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dannye merged 1 commit into from
Oct 9, 2025
Merged

Create text speed constants #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/constants/menu_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,10 @@ DEF NUM_CARDS_PROMOTIONAL EQU 20
const START_MENU_CONTINUE_DUEL ; 3

DEF NUM_MAILS EQU 15

; TextDelaySettings constants
DEF TEXT_SPEED_1 EQU 6
DEF TEXT_SPEED_2 EQU 4
DEF TEXT_SPEED_3 EQU 2
DEF TEXT_SPEED_4 EQU 1
DEF TEXT_SPEED_5 EQU 0
2 changes: 1 addition & 1 deletion src/engine/menus/config.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ DuelAnimationSettings:
; text printing delay
TextDelaySettings:
; slow to fast
db 6, 4, 2, 1, 0
db TEXT_SPEED_1, TEXT_SPEED_2, TEXT_SPEED_3, TEXT_SPEED_4, TEXT_SPEED_5

UpdateConfigMenuCursor:
push af
Expand Down
2 changes: 1 addition & 1 deletion src/engine/starter_deck.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ InitSaveData:
; saved configuration options
ld a, 2
ld [sPrinterContrastLevel], a
ld a, $2
ld a, TEXT_SPEED_3
ld [sTextSpeed], a
ld [wTextSpeed], a

Expand Down
8 changes: 4 additions & 4 deletions src/home/print_text.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ PrintScrollableText::
jr .go
.nonzero_text_speed
ld a, [wTextSpeed]
cp 2
cp TEXT_SPEED_3
jr nc, .apply_delay
; if text speed is 1, pressing b ignores it
; if TEXT_SPEED_4, pressing B ignores the delay
ldh a, [hKeysHeld]
and PAD_B
jr nz, .skip_delay
Expand Down Expand Up @@ -455,9 +455,9 @@ PrintText::
ld b, a
ld a, [wTextSpeed]
inc a
cp 3
cp TEXT_SPEED_3 + 1
jr nc, .apply_delay
; if text speed is 1, pressing b ignores it
; if TEXT_SPEED_4, pressing B ignores the delay
bit B_PAD_B, b
jr nz, .skip_delay
jr .apply_delay
Expand Down