Merge branch 'develop' into bradmerge

2023-01-17 16:44:46 -05:00
parent 1fe862515d ba13e6b2c4
commit 15a6568607
867 changed files with 9259 additions and 4439 deletions
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -395,7 +395,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
        sGraphUpdateTime = time;
    }

-    if (CVar_GetS32("gDebugEnabled", 0))
+    if (CVarGetInteger("gDebugEnabled", 0))
    {
        if (CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) &&
            CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) {