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

Have debugging work again

Browse Source
This commit is contained in:
Dominic Masters
2022-04-26 22:27:50 -07:00
parent a1a99bade3
commit fbeb903ee0
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/conversation/textbox.c
View File

@@ -9,6 +9,7 @@
char TEXTBOX_TEXTS[TEXTBOX_SCROLL_ROWS_MAX * TEXTBOX_CHARS_PER_ROW]; char TEXTBOX_TEXTS[TEXTBOX_SCROLL_ROWS_MAX * TEXTBOX_CHARS_PER_ROW];
uint8_t TEXTBOX_ROW_COUNT; uint8_t TEXTBOX_ROW_COUNT;
uint8_t TEXTBOX_ROW_TILE_LAST;
uint8_t TEXTBOX_ROW_CURRENT; uint8_t TEXTBOX_ROW_CURRENT;
uint8_t TEXTBOX_STATE; uint8_t TEXTBOX_STATE;
uint8_t TEXTBOX_SCROLL; uint8_t TEXTBOX_SCROLL;
@@ -62,7 +63,6 @@ void conversationTextboxSetText(char *text) {
TEXTBOX_STATE = TEXTBOX_STATE_VISIBLE; TEXTBOX_STATE = TEXTBOX_STATE_VISIBLE;
TEXTBOX_SCROLL = 0; TEXTBOX_SCROLL = 0;
TEXTBOX_ROW_COUNT = 0; TEXTBOX_ROW_COUNT = 0;
TEXTBOX_ROW_CURRENT = 0;
TEXTBOX_ROW_COUNT = 1; TEXTBOX_ROW_COUNT = 1;
// Copy source text to buffer, also determine wordwrapping here. // Copy source text to buffer, also determine wordwrapping here.
@@ -172,6 +172,10 @@ inline void conversationTextboxUpdate() {
1, 1, 1, 1,
tiles tiles
); );
TEXTBOX_SCROLL++; TEXTBOX_SCROLL++;
// Skip spaces
while(TEXTBOX_SCROLL < TEXTBOX_CHARS_MAX && TEXTBOX_TEXTS[i+TEXTBOX_SCROLL] == ' ') TEXTBOX_SCROLL++;
} }
} }

6
src/main.c
View File

@@ -8,7 +8,7 @@
#include "main.h" #include "main.h"
inline uint8_t mainGetChar(char c) { inline uint8_t mainGetChar(char c) {
return c - 33 + 4; return c - TEXTBOX_FONT_START + FONT_DATA_POSITION;
} }
inline void mainBufferChar(uint8_t card, uint8_t *tiles) { inline void mainBufferChar(uint8_t card, uint8_t *tiles) {
@@ -187,5 +187,7 @@ void main() {
// Update conversation fade effect // Update conversation fade effect
conversationFadeUpdate(); conversationFadeUpdate();
mainDebugDraw();
} }
} }