YourWishes/Dawn-GB
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

follow ya heart

Browse Source
This commit is contained in:
Dominic Masters
2022-02-20 21:37:05 -08:00
parent 0a339a5e64
commit 1fa9cf453e
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/conversation/textbox.c
View File

@@ -137,20 +137,19 @@ inline void conversationTextboxUpdate() {
// Have we finished scrolling?
if(TEXTBOX_STATE & TEXTBOX_STATE_SCROLLED) {
// Is the user trying to go to the next line?
BGB_printf("has scrolled");
if(INPUT_STATE & INPUT_BIND_TEXT_SKIP) {
if(INPUT_STATE & J_A) {
// First, lets figure out if there's any more text to reveal or not.
if((TEXTBOX_ROW_COUNT - TEXTBOX_ROW_CURRENT) >= TEXTBOX_TILES_ROWS) {
if((TEXTBOX_ROW_COUNT - TEXTBOX_ROW_CURRENT) < TEXTBOX_TILES_ROWS) {
TEXTBOX_STATE &= ~TEXTBOX_STATE_VISIBLE;
HIDE_WIN;
return;
}
TEXTBOX_STATE &= ~(TEXTBOX_STATE_SCROLLED);
TEXTBOX_STATE &= ~TEXTBOX_STATE_SCROLLED;
TEXTBOX_SCROLL = 0;
TEXTBOX_ROW_CURRENT += TEXTBOX_TILES_ROWS;
textboxFillBlank();
BGB_printf("tst");
}
return;
}
@@ -161,7 +160,7 @@ inline void conversationTextboxUpdate() {
if(TEXTBOX_SCROLL == TEXTBOX_CHARS_MAX) {
TEXTBOX_STATE |= TEXTBOX_STATE_SCROLLED;
} else {
tiles[0] = c - 33 + 4;
tiles[0] = c - 33 + FONT_DATA_POSITION;
set_win_tiles(
1 + (TEXTBOX_SCROLL % TEXTBOX_CHARS_PER_ROW),
1 + (TEXTBOX_SCROLL / TEXTBOX_CHARS_PER_ROW),