summaryrefslogtreecommitdiff
path: root/constants/wram_constants.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-07-17 18:16:12 -0400
committerGitHub <noreply@github.com>2018-07-17 18:16:12 -0400
commit3e14c1f26e91b1fc1d18eed389518ae8454e938f (patch)
tree64db6e9f438a62248ef0f0fe8e874ca6cf94b720 /constants/wram_constants.asm
parent89c2646ccaa2c9a0afb358c1d9738e9bb0d42c97 (diff)
parentb23f0b2bdaa993f17d8312bcde5f2b8a59ef9c90 (diff)
Merge pull request #539 from Rangi42/master
[RTM] Miscellaneous reorganization fixes
Diffstat (limited to 'constants/wram_constants.asm')
-rw-r--r--constants/wram_constants.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 9f9132a66..5889ca7a6 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -20,17 +20,17 @@ AUTO_INPUT EQU $ff
GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
GAMETIMERPAUSE_MOBILE_7_F EQU 7
-; wOptions:: (bits 4-7) ; cfcc
+; wOptions:: ; cfcc
+TEXT_DELAY_MASK EQU %111
const_def 4
const NO_TEXT_SCROLL ; 4
const STEREO ; 5
const BATTLE_SHIFT ; 6
const BATTLE_SCENE ; 7
-; wOptions:: (bits 0-2) ; cfcc
-TEXT_DELAY_FAST EQU 1
-TEXT_DELAY_MED EQU 3
-TEXT_DELAY_SLOW EQU 5
+TEXT_DELAY_FAST EQU %001 ; 1
+TEXT_DELAY_MED EQU %011 ; 3
+TEXT_DELAY_SLOW EQU %101 ; 5
; wTextBoxFrame:: ; cfce
const_def