Instant text speed + Roof colors

Added instant text speed and changed ruins of alph and silent hills's roof palettes
This commit is contained in:
Zeta_Null 2023-10-20 14:33:35 -04:00
parent 55f4427fc1
commit f7d3f9b08d
5 changed files with 31 additions and 12 deletions

View file

@ -37,6 +37,7 @@ DEF TEXT_DELAY_MASK EQU %111
const BATTLE_SHIFT ; 6 const BATTLE_SHIFT ; 6
const BATTLE_SCENE ; 7 const BATTLE_SCENE ; 7
DEF TEXT_DELAY_NONE EQU %000 ; 0
DEF TEXT_DELAY_FAST EQU %001 ; 1 DEF TEXT_DELAY_FAST EQU %001 ; 1
DEF TEXT_DELAY_MED EQU %011 ; 3 DEF TEXT_DELAY_MED EQU %011 ; 3
DEF TEXT_DELAY_SLOW EQU %101 ; 5 DEF TEXT_DELAY_SLOW EQU %101 ; 5

View file

@ -109,6 +109,7 @@ GetOptionPointer:
const OPT_TEXT_SPEED_FAST ; 0 const OPT_TEXT_SPEED_FAST ; 0
const OPT_TEXT_SPEED_MED ; 1 const OPT_TEXT_SPEED_MED ; 1
const OPT_TEXT_SPEED_SLOW ; 2 const OPT_TEXT_SPEED_SLOW ; 2
const OPT_TEXT_SPEED_NONE ; 3
Options_TextSpeed: Options_TextSpeed:
call GetTextSpeed call GetTextSpeed
@ -118,7 +119,7 @@ Options_TextSpeed:
bit D_RIGHT_F, a bit D_RIGHT_F, a
jr z, .NonePressed jr z, .NonePressed
ld a, c ; right pressed ld a, c ; right pressed
cp OPT_TEXT_SPEED_SLOW cp OPT_TEXT_SPEED_NONE
jr c, .Increase jr c, .Increase
ld c, OPT_TEXT_SPEED_FAST - 1 ld c, OPT_TEXT_SPEED_FAST - 1
@ -131,7 +132,7 @@ Options_TextSpeed:
ld a, c ld a, c
and a and a
jr nz, .Decrease jr nz, .Decrease
ld c, OPT_TEXT_SPEED_SLOW + 1 ld c, OPT_TEXT_SPEED_NONE + 1
.Decrease: .Decrease:
dec c dec c
@ -162,10 +163,12 @@ Options_TextSpeed:
dw .Fast dw .Fast
dw .Mid dw .Mid
dw .Slow dw .Slow
dw .Instant
.Fast: db "FAST@" .Fast: db "FAST @"
.Mid: db "MID @" .Mid: db "MID @"
.Slow: db "SLOW@" .Slow: db "SLOW @"
.Instant: db "INSTANT@"
GetTextSpeed: 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,
@ -176,6 +179,8 @@ GetTextSpeed:
jr z, .slow jr z, .slow
cp TEXT_DELAY_FAST cp TEXT_DELAY_FAST
jr z, .fast jr z, .fast
cp TEXT_DELAY_NONE
jr z, .none
; none of the above ; none of the above
ld c, OPT_TEXT_SPEED_MED ld c, OPT_TEXT_SPEED_MED
lb de, TEXT_DELAY_FAST, TEXT_DELAY_SLOW lb de, TEXT_DELAY_FAST, TEXT_DELAY_SLOW
@ -183,14 +188,19 @@ GetTextSpeed:
.slow .slow
ld c, OPT_TEXT_SPEED_SLOW ld c, OPT_TEXT_SPEED_SLOW
lb de, TEXT_DELAY_MED, TEXT_DELAY_FAST lb de, TEXT_DELAY_MED, TEXT_DELAY_NONE
ret ret
.fast .fast
ld c, OPT_TEXT_SPEED_FAST ld c, OPT_TEXT_SPEED_FAST
lb de, TEXT_DELAY_SLOW, TEXT_DELAY_MED lb de, TEXT_DELAY_NONE, TEXT_DELAY_MED
ret ret
.none
ld c, OPT_TEXT_SPEED_NONE
lb de, TEXT_DELAY_SLOW, TEXT_DELAY_FAST
ret
Options_BattleScene: Options_BattleScene:
ld hl, wOptions ld hl, wOptions
ldh a, [hJoyPressed] ldh a, [hJoyPressed]

View file

@ -11,8 +11,8 @@
RGB 06,09,07, 04,05,06 ; nite RGB 06,09,07, 04,05,06 ; nite
; group 3 (dungeons) ; group 3 (dungeons)
RGB 21,21,21, 11,11,11 ; morn/day RGB 19,19,31, 11,11,25 ; morn/day
RGB 21,21,21, 17,08,07 ; nite RGB 11,10,24, 08,07,13 ; nite
; group 4 (Ecruteak) ; group 4 (Ecruteak)
RGB 31,19,00, 27,10,05 ; morn/day RGB 31,19,00, 27,10,05 ; morn/day
@ -107,5 +107,5 @@
RGB 14,07,17, 13,00,08 ; nite RGB 14,07,17, 13,00,08 ; nite
; group 27 (Silent Hills) ; group 27 (Silent Hills)
RGB 20,31,14, 11,23,05 ; morn/day RGB 09,31,23, 10,22,22 ; morn/day
RGB 09,13,08, 06,09,04 ; nite RGB 03,15,17, 02,10,15 ; nite

View file

@ -30,6 +30,7 @@ PrintLetterDelay::
; text speed ; text speed
ld a, [wOptions] ld a, [wOptions]
and %111 and %111
jr z, .end
jr .updatedelay jr .updatedelay
.fast .fast

View file

@ -483,9 +483,16 @@ _ContText::
ld a, [wLinkMode] ld a, [wLinkMode]
or a or a
call z, UnloadBlinkingCursor call z, UnloadBlinkingCursor
; fallthrough jr _ContTextNoPause.not_instant
_ContTextNoPause:: _ContTextNoPause::
ld a, [wOptions]
and TEXT_DELAY_MASK
cp TEXT_DELAY_FAST
jr nz, .not_instant
ld c, 15
call DelayFrames
.not_instant
push de push de
call TextScroll call TextScroll
call TextScroll call TextScroll