From bc6482a41403437172b8b48babc99bdc2286231a Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <dash@wind.garden>
Date: Mon, 9 Sep 2024 23:21:41 +0200
Subject: [PATCH] input: pull g_KeyNames

---
 docs/progress.txt                  |  2 +-
 src/game/input.c                   | 41 +++++++++++++++++++++++++++++-
 src/game/ui/controllers/controls.c |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/docs/progress.txt b/docs/progress.txt
index 6ff784f..ee729ed 100644
--- a/docs/progress.txt
+++ b/docs/progress.txt
@@ -4685,7 +4685,7 @@ typedef enum {
 0x0051A250  +       int32_t g_LayoutPage;
 0x0051A24C  +       int32_t g_KeySelector;
 0x0051A248  +       int32_t g_KeyCursor;
-0x00466FA8  -       const char *g_KeyNames[];
+0x00466FA8  +       const char *g_KeyNames[];
 0x00464500  -       const uint16_t g_Requester_BackgroundGour1[];
 0x00464520  -       const uint16_t g_Requester_BackgroundGour2[];
 0x00464538  -       const uint16_t g_Requester_MainGour1[];
diff --git a/src/game/input.c b/src/game/input.c
index 49b10c2..c8a4f9e 100644
--- a/src/game/input.c
+++ b/src/game/input.c
@@ -5,6 +5,45 @@
 #include "global/vars.h"
 #include "specific/s_input.h"
 
+#include <libtrx/log.h>
+
+static const char *m_KeyNames[] = {
+    NULL,   "ESC",   "1",     "2",     "3",     "4",     "5",     "6",
+    "7",    "8",     "9",     "0",     "-",     "+",     "BKSP",  "TAB",
+    "Q",    "W",     "E",     "R",     "T",     "Y",     "U",     "I",
+    "O",    "P",     "<",     ">",     "RET",   "CTRL",  "A",     "S",
+    "D",    "F",     "G",     "H",     "J",     "K",     "L",     ";",
+    "'",    "`",     "SHIFT", "#",     "Z",     "X",     "C",     "V",
+    "B",    "N",     "M",     ",",     ".",     "/",     "SHIFT", "PADx",
+    "ALT",  "SPACE", "CAPS",  NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    "NMLK",  NULL,    "PAD7",
+    "PAD8", "PAD9",  "PAD-",  "PAD4",  "PAD5",  "PAD6",  "PAD+",  "PAD1",
+    "PAD2", "PAD3",  "PAD0",  "PAD.",  NULL,    NULL,    "\\",    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    "ENTER", "CTRL",  NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    "SHIFT", NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    "PAD/",  NULL,    NULL,
+    "ALT",  NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    "HOME",
+    "UP",   "PGUP",  NULL,    "LEFT",  NULL,    "RIGHT", NULL,    "END",
+    "DOWN", "PGDN",  "INS",   "DEL",   NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    NULL,   NULL,    NULL,    NULL,    NULL,    NULL,    NULL,    NULL,
+    "JOY1", "JOY2",  "JOY3",  "JOY4",  "JOY5",  "JOY6",  "JOY7",  "JOY8",
+    "JOY9", "JOY10", "JOY11", "JOY12", "JOY13", "JOY14", "JOY15", "JOY16",
+};
+
 bool g_ConflictLayout[INPUT_ROLE_NUMBER_OF] = { false };
 
 bool Input_Update(void)
@@ -78,5 +117,5 @@ const char *Input_GetRoleName(const INPUT_ROLE role)
 
 const char *Input_GetKeyName(const uint16_t key)
 {
-    return g_KeyNames[key];
+    return m_KeyNames[key];
 }
diff --git a/src/game/ui/controllers/controls.c b/src/game/ui/controllers/controls.c
index de73ebc..e3d6c6b 100644
--- a/src/game/ui/controllers/controls.c
+++ b/src/game/ui/controllers/controls.c
@@ -143,7 +143,7 @@ static bool UI_ControlsController_Listen(
 
     if (!pressed
         // clang-format off
-        || g_KeyNames[pressed] == NULL
+        || Input_GetKeyName(pressed) == NULL
         || pressed == DIK_RETURN
         || pressed == DIK_LEFT
         || pressed == DIK_RIGHT