Constants for TextBoxFlags

This commit is contained in:
Remy Oukaour 2017-12-29 13:18:17 -05:00
parent 9f017cbab8
commit e1a672e427
5 changed files with 15 additions and 7 deletions

View File

@ -29,6 +29,11 @@ TEXT_DELAY_SLOW EQU 5
const FRAME_7 ; 6 const FRAME_7 ; 6
const FRAME_8 ; 7 const FRAME_8 ; 7
; TextBoxFlags:
const_def
const TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1
; Options2: ; Options2:
const_def const_def
const MENU_ACCOUNT ; 0 const MENU_ACCOUNT ; 0

View File

@ -5,12 +5,12 @@ DefaultOptions: ; 14f7c
db $00 db $00
; TextBoxFrame: frame 1 ; TextBoxFrame: frame 1
db FRAME_1 db FRAME_1
; TextBoxFlags: ?? ; TextBoxFlags: use text speed
db $01 db 1 << TEXT_DELAY_F
; GBPrinter: normal brightness ; GBPrinter: normal brightness
db GBPRINTER_NORMAL db GBPRINTER_NORMAL
; Options2: menu account on ; Options2: menu account on
db $01 db 1 << MENU_ACCOUNT
; $cfd2: ?? ; $cfd2: ??
db $00 db $00
; $cfd3: ?? ; $cfd3: ??

View File

@ -306,7 +306,7 @@ PrintLetterDelay:: ; 313d
; non-scrolling text? ; non-scrolling text?
ld a, [TextBoxFlags] ld a, [TextBoxFlags]
bit 1, a bit NO_TEXT_DELAY_F, a
ret z ret z
push hl push hl
@ -323,7 +323,7 @@ PrintLetterDelay:: ; 313d
; force fast scroll? ; force fast scroll?
ld a, [TextBoxFlags] ld a, [TextBoxFlags]
bit 0, a bit TEXT_DELAY_F, a
jr z, .fast jr z, .fast
; text speed ; text speed

View File

@ -697,7 +697,7 @@ PokeFluteTerminatorCharacter:: ; 13e0
PlaceHLTextAtBC:: ; 13e5 PlaceHLTextAtBC:: ; 13e5
ld a, [TextBoxFlags] ld a, [TextBoxFlags]
push af push af
set 1, a set NO_TEXT_DELAY_F, a
ld [TextBoxFlags], a ld [TextBoxFlags], a
call DoTextUntilTerminator call DoTextUntilTerminator

View File

@ -1480,7 +1480,10 @@ wSaveFileExists:: db
TextBoxFrame:: ; cfce TextBoxFrame:: ; cfce
; bits 0-2: textbox frame 0-7 ; bits 0-2: textbox frame 0-7
db db
TextBoxFlags:: db TextBoxFlags::
; bit 0: 1-frame text delay
; bit 4: no text delay
db
GBPrinter:: ; cfd0 GBPrinter:: ; cfd0
; bit 0-6: brightness ; bit 0-6: brightness
; lightest: $00 ; lightest: $00