From fbeb903ee0119a0f5b2a5486316da256df10c249 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Tue, 26 Apr 2022 22:27:50 -0700
Subject: [PATCH] Have debugging work again

---
 src/conversation/textbox.c | 6 +++++-
 src/main.c                 | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/conversation/textbox.c b/src/conversation/textbox.c
index 86a434e..b164d77 100644
--- a/src/conversation/textbox.c
+++ b/src/conversation/textbox.c
@@ -9,6 +9,7 @@
 
 char TEXTBOX_TEXTS[TEXTBOX_SCROLL_ROWS_MAX * TEXTBOX_CHARS_PER_ROW];
 uint8_t TEXTBOX_ROW_COUNT;
+uint8_t TEXTBOX_ROW_TILE_LAST;
 uint8_t TEXTBOX_ROW_CURRENT;
 uint8_t TEXTBOX_STATE;
 uint8_t TEXTBOX_SCROLL;
@@ -62,7 +63,6 @@ void conversationTextboxSetText(char *text) {
   TEXTBOX_STATE = TEXTBOX_STATE_VISIBLE;
   TEXTBOX_SCROLL = 0;
   TEXTBOX_ROW_COUNT = 0;
-  TEXTBOX_ROW_CURRENT = 0;
   TEXTBOX_ROW_COUNT = 1;
   
   // Copy source text to buffer, also determine wordwrapping here.
@@ -172,6 +172,10 @@ inline void conversationTextboxUpdate() {
       1, 1,
       tiles
     );
+
     TEXTBOX_SCROLL++;
+    
+    // Skip spaces
+    while(TEXTBOX_SCROLL < TEXTBOX_CHARS_MAX && TEXTBOX_TEXTS[i+TEXTBOX_SCROLL] == ' ') TEXTBOX_SCROLL++;
   }
 }
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 6a950d5..ab7d3e8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,7 +8,7 @@
 #include "main.h"
 
 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) {
@@ -187,5 +187,7 @@ void main() {
 
     // Update conversation fade effect
     conversationFadeUpdate();
+
+    mainDebugDraw();
   }
-}
+}
\ No newline at end of file