From 0a53612f6901e2e40b24c50f140cf386f5481625 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 18 Dec 2013 18:04:55 -0500 Subject: [PATCH] NO_TEXT_SCROLL flag in Options --- constants/wram_constants.asm | 5 +++-- home.asm | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index e2739e2cf..c52cdfa39 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -6,8 +6,9 @@ BOXMON EQU 2 WILDMON EQU 4 ; Options: ; cfcc -BATTLE_SHIFT EQU 6 -BATTLE_SCENE EQU 7 +NO_TEXT_SCROLL EQU 4 +BATTLE_SHIFT EQU 6 +BATTLE_SCENE EQU 7 ; WalkingDirection: ; d043 STANDING EQU -1 diff --git a/home.asm b/home.asm index f25db6bf7..9143b2266 100644 --- a/home.asm +++ b/home.asm @@ -325,9 +325,8 @@ PrintLetterDelay: ; 313d ; $cfcf[!0] and A or B override text speed with a one-frame delay. ; Options[4] and $cfcf[!1] disable the delay. -; delay off? ld a, [Options] - bit 4, a + bit NO_TEXT_SCROLL, a ret nz ; non-scrolling text?