diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-08 18:34:44 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-08 18:34:44 -0700 |
| commit | 2f7383f03d9e7368d744690be93e811a052d0d42 (patch) | |
| tree | df5defd866377b77223c9edf285b2bbcda0ecb43 /home/text.asm | |
| parent | 7c97dcbc6c8fc8aeeabb9629bc98af05a4d8e8de (diff) | |
Cleanup scrolling text labels. Use macro for the wram locations. Move text.asm -> text/scrolling_text.asm
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/home/text.asm b/home/text.asm index 7c67278..a78e2a1 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,3 +1,5 @@ +INCLUDE "text/scrolling_text.asm" + Func_30db: ; 0x30db ld a, $86 ld [hWY], a ;force text bar up @@ -18,9 +20,9 @@ FillBottomMessageBufferWithBlackTile: ; 0x30e8 dec b jr nz, .loop xor a - ld [wScrollingTextStruct1], a - ld [wScrollingTextStruct2], a - ld [wScrollingTextStruct3], a + ld [wScrollingText1Enabled], a + ld [wScrollingText2Enabled], a + ld [wScrollingText3Enabled], a ld [wd5e4], a ld [wd5e9], a ld [wd5ee], a @@ -324,18 +326,18 @@ UnusedPlaceString: ; 0x3268 seems to place text based on different, confusing lo inc e jr UnusedPlaceString -LoadTextHeader: ; 0x32aa +LoadScrollingText: ; 0x32aa ; Loads scrolling text into the specified buffer. ; Scrolling text appears in a black bar at the bottom of the screen during pinball gameplay. -; Input: de = pointer to scrolling text -; hl = pointer to text header buffer -; Text Header Format: +; Input: de = pointer to scrolling text data +; hl = pointer to scrolling text header (See wScrollingText1) +; Scrolling text Header Format: ; Byte 1: Step delay (in frames) ; Byte 2: Starting wBottomMessageBuffer offset (wBottomMessageBuffer + $40 = left-most tile) ; Byte 3: Stopping wBottomMessageBuffer offset (stops scrolling in the middle of the screen) ; Byte 4: Number of steps to pause ; Byte 5: Text offset in wBottomMessageText -; Byte 6: Total number of steps in the entire scolling animation +; Byte 6: Total number of steps in the entire scrolling animation ; Remaining Bytes: Raw text to load ld a, $1 ld [hli], a @@ -619,29 +621,29 @@ Func_33e3: ; 0x33e3 .asm_33ed ld c, $0 - ld a, [wScrollingTextStruct1] + ld a, [wScrollingText1Enabled] and a jr z, .asm_33fe ;if ?? is 0 push bc ;store b and 0 - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 call HandleScrolling pop bc inc c .asm_33fe - ld a, [wScrollingTextStruct2] + ld a, [wScrollingText2Enabled] and a jr z, .asm_340d push bc - ld hl, wScrollingTextStruct2 + ld hl, wScrollingText2 call HandleScrolling pop bc inc c .asm_340d - ld a, [wScrollingTextStruct3] + ld a, [wScrollingText3Enabled] and a jr z, .asm_341c push bc - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 call HandleScrolling pop bc inc c |