From 29e915e4df83ecf6c1856422c231e2d7816a87c3 Mon Sep 17 00:00:00 2001
From: fgsfds <pvt.fgsfds@gmail.com>
Date: Wed, 17 Jun 2020 05:18:05 +0300
Subject: [PATCH] fix JP build

---
 include/text_options_strings.h.in | 17 ++++++++++-------
 src/game/options_menu.c           | 10 +++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in
index 7b68f0c4..141d3548 100644
--- a/include/text_options_strings.h.in
+++ b/include/text_options_strings.h.in
@@ -47,12 +47,15 @@
 #define TEXT_OPT_NEAREST   _("NEAREST")
 #define TEXT_OPT_LINEAR    _("LINEAR")
 #define TEXT_OPT_MVOLUME   _("MASTER VOLUME")
+#define TEXT_OPT_MUSVOLUME _("MUSIC VOLUME")
+#define TEXT_OPT_SFXVOLUME _("SFX VOLUME")
+#define TEXT_OPT_ENVVOLUME _("ENV VOLUME")
 #define TEXT_OPT_VSYNC     _("VERTICAL SYNC")
 #define TEXT_OPT_DOUBLE    _("DOUBLE")
-#define TEXT_RESET_WINDOW  _("RESET WINDOW")
 #define TEXT_OPT_HUD       _("HUD")
-#define TEXT_OPT_THREEPOINT _("THREE POINT")
+#define TEXT_OPT_THREEPT   _("THREE POINT")
 #define TEXT_OPT_APPLY     _("APPLY")
+#define TEXT_OPT_RESETWND  _("RESET WINDOW")
 
 #define TEXT_BIND_A        _("A BUTTON")
 #define TEXT_BIND_B        _("B BUTTON")
@@ -107,15 +110,15 @@
 #define TEXT_OPT_NEAREST   _("Nearest")
 #define TEXT_OPT_LINEAR    _("Linear")
 #define TEXT_OPT_MVOLUME   _("Master Volume")
-#define TEXT_OPT_MUSIC_VOLUME   _("Music Volume")
-#define TEXT_OPT_SFX_VOLUME     _("Sfx Volume")
-#define TEXT_OPT_ENV_VOLUME     _("Env Volume")
+#define TEXT_OPT_MUSVOLUME _("Music Volume")
+#define TEXT_OPT_SFXVOLUME _("Sfx Volume")
+#define TEXT_OPT_ENVVOLUME _("Env Volume")
 #define TEXT_OPT_VSYNC     _("Vertical Sync")
 #define TEXT_OPT_DOUBLE    _("Double")
-#define TEXT_RESET_WINDOW  _("Reset Window")
 #define TEXT_OPT_HUD       _("HUD")
-#define TEXT_OPT_THREEPOINT _("Three-point")
+#define TEXT_OPT_THREEPT   _("Three-point")
 #define TEXT_OPT_APPLY     _("Apply")
+#define TEXT_OPT_RESETWND  _("Reset Window")
 
 #define TEXT_BIND_A        _("A Button")
 #define TEXT_BIND_B        _("B Button")
diff --git a/src/game/options_menu.c b/src/game/options_menu.c
index 3c084c49..e004749c 100644
--- a/src/game/options_menu.c
+++ b/src/game/options_menu.c
@@ -76,19 +76,19 @@ static const u8 optsVideoStr[][32] = {
     { TEXT_OPT_TEXFILTER },
     { TEXT_OPT_NEAREST },
     { TEXT_OPT_LINEAR },
-    { TEXT_RESET_WINDOW },
+    { TEXT_OPT_RESETWND },
     { TEXT_OPT_VSYNC },
     { TEXT_OPT_DOUBLE },
     { TEXT_OPT_HUD },
-    { TEXT_OPT_THREEPOINT },
+    { TEXT_OPT_THREEPT },
     { TEXT_OPT_APPLY },
 };
 
 static const u8 optsAudioStr[][32] = {
     { TEXT_OPT_MVOLUME },    
-    { TEXT_OPT_MUSIC_VOLUME },
-    { TEXT_OPT_SFX_VOLUME },
-    { TEXT_OPT_ENV_VOLUME },
+    { TEXT_OPT_MUSVOLUME },
+    { TEXT_OPT_SFXVOLUME },
+    { TEXT_OPT_ENVVOLUME },
 };
 
 static const u8 optsCheatsStr[][64] = {