From a55e62d45ac4bac742eee46c890eb426db80846c Mon Sep 17 00:00:00 2001
From: shchmue <shchmue@gmail.com>
Date: Sun, 29 Dec 2019 14:32:37 -0700
Subject: [PATCH] Merge Hekate fixes to gfx, minerva

---
 source/gfx/gfx.c     | 3 ++-
 source/mem/minerva.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/gfx/gfx.c b/source/gfx/gfx.c
index 501b6f3..0d1c891 100644
--- a/source/gfx/gfx.c
+++ b/source/gfx/gfx.c
@@ -188,7 +188,7 @@ void gfx_putc(char c)
 
 			for (u32 i = 0; i < 16; i+=2)
 			{
-				u8 v = *cbuf++;
+				u8 v = *cbuf;
 				for (u32 k = 0; k < 2; k++)
 				{
 					for (u32 j = 0; j < 8; j++)
@@ -213,6 +213,7 @@ void gfx_putc(char c)
 					fb += gfx_ctxt.stride - 16;
 					v = *cbuf;
 				}
+				cbuf++;
 			}
 			gfx_con.x += 16;
 			if (gfx_con.x >= gfx_ctxt.width - 16) {
diff --git a/source/mem/minerva.c b/source/mem/minerva.c
index 68aa66d..d2c966e 100644
--- a/source/mem/minerva.c
+++ b/source/mem/minerva.c
@@ -32,6 +32,7 @@ u32 minerva_init()
 {
 	u32 curr_ram_idx = 0;
 
+	minerva_cfg = NULL;
 	mtc_config_t *mtc_cfg = (mtc_config_t *)&nyx_str->mtc_cfg;
 
 	// Set table to nyx storage.