pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use more options constants

Browse Source
This commit is contained in:
Rangi 2018-07-10 17:18:23 -04:00
parent 146fa1be51
commit 90b22d602f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
constants/wram_constants.asm
View File

@ -20,17 +20,17 @@ AUTO_INPUT EQU $ff
GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
GAMETIMERPAUSE_MOBILE_7_F EQU 7 GAMETIMERPAUSE_MOBILE_7_F EQU 7
; wOptions:: (bits 4-7) ; cfcc ; wOptions:: ; cfcc
TEXT_DELAY_MASK EQU %111
const_def 4 const_def 4
const NO_TEXT_SCROLL ; 4 const NO_TEXT_SCROLL ; 4
const STEREO ; 5 const STEREO ; 5
const BATTLE_SHIFT ; 6 const BATTLE_SHIFT ; 6
const BATTLE_SCENE ; 7 const BATTLE_SCENE ; 7
; wOptions:: (bits 0-2) ; cfcc TEXT_DELAY_FAST EQU %001 ; 1
TEXT_DELAY_FAST EQU 1 TEXT_DELAY_MED EQU %011 ; 3
TEXT_DELAY_MED EQU 3 TEXT_DELAY_SLOW EQU %101 ; 5
TEXT_DELAY_SLOW EQU 5
; wTextBoxFrame:: ; cfce ; wTextBoxFrame:: ; cfce
const_def const_def

4
engine/menus/options_menu.asm
View File

@ -165,7 +165,7 @@ GetTextSpeed:
; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c, ; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
; with previous/next TEXT_DELAY_* values in d/e ; with previous/next TEXT_DELAY_* values in d/e
ld a, [wOptions] ld a, [wOptions]
and $7 and TEXT_DELAY_MASK
cp TEXT_DELAY_SLOW cp TEXT_DELAY_SLOW
jr z, .slow jr z, .slow
cp TEXT_DELAY_FAST cp TEXT_DELAY_FAST
@ -467,7 +467,7 @@ Options_Frame:
dec a dec a
.Save: .Save:
and $7 maskbits NUM_FRAMES
ld [hl], a ld [hl], a
UpdateFrame: UpdateFrame:
ld a, [wTextBoxFrame] ld a, [wTextBoxFrame]