From 686ea5be7b805498088fe0131837a62bb6298906 Mon Sep 17 00:00:00 2001
From: fgsfds <pvt.fgsfds@gmail.com>
Date: Fri, 22 May 2020 01:36:39 +0300
Subject: [PATCH] separate options menu strings and add JP strings

---
 Makefile                          |   4 +
 include/text_options_strings.h.in | 138 ++++++++++++++++++++++++++++++
 include/text_strings.h.in         |  62 ++------------
 src/game/options_menu.c           |   2 +-
 4 files changed, 148 insertions(+), 58 deletions(-)
 create mode 100644 include/text_options_strings.h.in

diff --git a/Makefile b/Makefile
index 9356281c..4acdb9de 100644
--- a/Makefile
+++ b/Makefile
@@ -639,6 +639,9 @@ $(BUILD_DIR)/include/text_strings.h: include/text_strings.h.in
 $(BUILD_DIR)/include/text_menu_strings.h: include/text_menu_strings.h.in
 	$(TEXTCONV) charmap_menu.txt $< $@
 
+$(BUILD_DIR)/include/text_options_strings.h: include/text_options_strings.h.in
+	$(TEXTCONV) charmap.txt $< $@
+
 ifeq ($(VERSION),eu)
 TEXT_DIRS := text/de text/us text/fr
 
@@ -678,6 +681,7 @@ ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS) $(GOD
 DUMMY != mkdir -p $(ALL_DIRS)
 
 $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
+$(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_options_strings.h
 
 ifeq ($(VERSION),eu)
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in
new file mode 100644
index 00000000..7580ec9e
--- /dev/null
+++ b/include/text_options_strings.h.in
@@ -0,0 +1,138 @@
+#ifndef TEXT_OPTIONS_STRINGS_H
+#define TEXT_OPTIONS_STRINGS_H
+
+/* Extended options menu text */
+
+// Menu title strings
+
+#define TEXT_OPT_OPTIONS   _("OPTIONS")
+#define TEXT_OPT_CAMERA    _("CAMERA")
+#define TEXT_OPT_CONTROLS  _("CONTROLS")
+#define TEXT_OPT_VIDEO     _("DISPLAY")
+#define TEXT_OPT_AUDIO     _("SOUND")
+#define TEXT_OPT_CHEATS    _("CHEATS")
+
+// Markers
+
+#define TEXT_OPT_HIGHLIGHT _("O")
+#define TEXT_OPT_UNBOUND   _("NONE")
+
+// Language specific strings
+
+#if defined(VERSION_JP) || defined(VERSION_SH)
+
+// TODO: Actually translate this to JP
+
+// No . in JP
+
+#define TEXT_OPT_PRESSKEY  _("・・・")
+
+// Option strings
+
+#define TEXT_OPT_BUTTON1   _("Ｒ OPTIONS")
+#define TEXT_OPT_BUTTON2   _("Ｒ RETURN")
+#define TEXT_OPT_ENABLED   _("ENABLED")
+#define TEXT_OPT_DISABLED  _("DISABLED")
+#define TEXT_OPT_CAMX      _("CAMERA X SENSITIVITY")
+#define TEXT_OPT_CAMY      _("CAMERA Y SENSITIVITY")
+#define TEXT_OPT_INVERTX   _("INVERT X AXIS")
+#define TEXT_OPT_INVERTY   _("INVERT Y AXIS")
+#define TEXT_OPT_CAMC      _("CAMERA CENTRE AGGRESSION")
+#define TEXT_OPT_CAMP      _("CAMERA PAN LEVEL")
+#define TEXT_OPT_CAMD      _("CAMERA DECELERATION")
+#define TEXT_OPT_ANALOGUE  _("ANALOGUE CAMERA")
+#define TEXT_OPT_MOUSE     _("MOUSE LOOK")
+#define TEXT_OPT_TEXFILTER _("TEXTURE FILTERING")
+#define TEXT_OPT_FSCREEN   _("FULLSCREEN")
+#define TEXT_OPT_NEAREST   _("NEAREST")
+#define TEXT_OPT_LINEAR    _("LINEAR")
+#define TEXT_OPT_MVOLUME   _("MASTER 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_BIND_A        _("A BUTTON")
+#define TEXT_BIND_B        _("B BUTTON")
+#define TEXT_BIND_START    _("START BUTTON")
+#define TEXT_BIND_L        _("L TRIGGER")
+#define TEXT_BIND_R        _("R TRIGGER")
+#define TEXT_BIND_Z        _("Z TRIGGER")
+#define TEXT_BIND_C_UP     _("C-UP")
+#define TEXT_BIND_C_DOWN   _("C-DOWN")
+#define TEXT_BIND_C_LEFT   _("C-LEFT")
+#define TEXT_BIND_C_RIGHT  _("C-RIGHT")
+#define TEXT_BIND_UP       _("STICK UP")
+#define TEXT_BIND_DOWN     _("STICK DOWN")
+#define TEXT_BIND_LEFT     _("STICK LEFT")
+#define TEXT_BIND_RIGHT    _("STICK RIGHT")
+
+#define TEXT_OPT_CHEAT1    _("ENABLE CHEATS")
+#define TEXT_OPT_CHEAT2    _("MOONJUMP (PRESS L)")
+#define TEXT_OPT_CHEAT3    _("INVINCIBLE MARIO")
+#define TEXT_OPT_CHEAT4    _("INFINITE LIVES")
+#define TEXT_OPT_CHEAT5    _("SUPER SPEED")
+#define TEXT_OPT_CHEAT6    _("SUPER RESPONSIVE CONTROLS")
+#define TEXT_OPT_CHEAT7    _("EXIT COURSE AT ANY TIME")
+#define TEXT_OPT_CHEAT8    _("HUGE MARIO")
+#define TEXT_OPT_CHEAT9    _("TINY MARIO")
+
+#else // VERSION
+
+// Markers
+
+#define TEXT_OPT_PRESSKEY  _("...")
+
+// Option strings
+
+#define TEXT_OPT_BUTTON1   _("[R] Options")
+#define TEXT_OPT_BUTTON2   _("[R] Return")
+#define TEXT_OPT_ENABLED   _("Enabled")
+#define TEXT_OPT_DISABLED  _("Disabled")
+#define TEXT_OPT_CAMX      _("Camera X Sensitivity")
+#define TEXT_OPT_CAMY      _("Camera Y Sensitivity")
+#define TEXT_OPT_INVERTX   _("Invert X Axis")
+#define TEXT_OPT_INVERTY   _("Invert Y Axis")
+#define TEXT_OPT_CAMC      _("Camera Centre Aggression")
+#define TEXT_OPT_CAMP      _("Camera Pan Level")
+#define TEXT_OPT_CAMD      _("Camera Deceleration")
+#define TEXT_OPT_ANALOGUE  _("Analogue Camera")
+#define TEXT_OPT_MOUSE     _("Mouse Look")
+#define TEXT_OPT_TEXFILTER _("Texture Filtering")
+#define TEXT_OPT_FSCREEN   _("Fullscreen")
+#define TEXT_OPT_NEAREST   _("Nearest")
+#define TEXT_OPT_LINEAR    _("Linear")
+#define TEXT_OPT_MVOLUME   _("Master 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_BIND_A        _("A Button")
+#define TEXT_BIND_B        _("B Button")
+#define TEXT_BIND_START    _("Start Button")
+#define TEXT_BIND_L        _("L Trigger")
+#define TEXT_BIND_R        _("R Trigger")
+#define TEXT_BIND_Z        _("Z Trigger")
+#define TEXT_BIND_C_UP     _("C-Up")
+#define TEXT_BIND_C_DOWN   _("C-Down")
+#define TEXT_BIND_C_LEFT   _("C-Left")
+#define TEXT_BIND_C_RIGHT  _("C-Right")
+#define TEXT_BIND_UP       _("Stick Up")
+#define TEXT_BIND_DOWN     _("Stick Down")
+#define TEXT_BIND_LEFT     _("Stick Left")
+#define TEXT_BIND_RIGHT    _("Stick Right")
+
+#define TEXT_OPT_CHEAT1    _("Enable cheats")
+#define TEXT_OPT_CHEAT2    _("Moonjump (Press L)")
+#define TEXT_OPT_CHEAT3    _("Invincible Mario")
+#define TEXT_OPT_CHEAT4    _("Infinite lives")
+#define TEXT_OPT_CHEAT5    _("Super speed")
+#define TEXT_OPT_CHEAT6    _("Super responsive controls")
+#define TEXT_OPT_CHEAT7    _("Exit course at any time")
+#define TEXT_OPT_CHEAT8    _("Huge Mario")
+#define TEXT_OPT_CHEAT9    _("Tiny Mario")
+
+#endif // VERSION
+
+#endif // TEXT_OPTIONS_STRINGS_H
diff --git a/include/text_strings.h.in b/include/text_strings.h.in
index d4ec173a..786e3a36 100644
--- a/include/text_strings.h.in
+++ b/include/text_strings.h.in
@@ -1,64 +1,12 @@
-	#ifndef TEXT_STRINGS_H
+#ifndef TEXT_STRINGS_H
 #define TEXT_STRINGS_H
 
 #include "text_menu_strings.h"
 
-#define TEXT_OPT_CAMX      _("Camera X Sensitivity")
-#define TEXT_OPT_CAMY      _("Camera Y Sensitivity")
-#define TEXT_OPT_INVERTX   _("Invert X Axis")
-#define TEXT_OPT_INVERTY   _("Invert Y Axis")
-#define TEXT_OPT_CAMC      _("Camera Centre Aggression")
-#define TEXT_OPT_CAMP      _("Camera Pan Level")
-#define TEXT_OPT_CAMD      _("Camera Deceleration")
-#define TEXT_OPT_ENABLED   _("Enabled")
-#define TEXT_OPT_DISABLED  _("Disabled")
-#define TEXT_OPT_BUTTON1   _("[R]: Options")
-#define TEXT_OPT_BUTTON2   _("[R]: Return")
-#define TEXT_OPT_OPTIONS   _("OPTIONS")
-#define TEXT_OPT_CAMERA    _("CAMERA")
-#define TEXT_OPT_CONTROLS  _("CONTROLS")
-#define TEXT_OPT_VIDEO     _("DISPLAY")
-#define TEXT_OPT_AUDIO     _("SOUND")
-#define TEXT_OPT_HIGHLIGHT _("O")
-#define TEXT_OPT_ANALOGUE  _("Analogue Camera")
-#define TEXT_OPT_MOUSE     _("Mouse Look")
-#define TEXT_OPT_TEXFILTER _("Texture Filtering")
-#define TEXT_OPT_FSCREEN   _("Fullscreen")
-#define TEXT_OPT_NEAREST   _("Nearest")
-#define TEXT_OPT_LINEAR    _("Linear")
-#define TEXT_OPT_MVOLUME   _("Master Volume")
-#define TEXT_OPT_VSYNC     _("Vertical Sync")
-#define TEXT_OPT_DOUBLE    _("Double")
-#define TEXT_RESET_WINDOW  _("Reset Window")
-#define TEXT_OPT_HUD       _("HUD")
+#ifdef EXT_OPTIONS_MENU
+#include "text_options_strings.h"
+#endif
 
-#define TEXT_OPT_UNBOUND   _("NONE")
-#define TEXT_OPT_PRESSKEY  _("...")
-#define TEXT_BIND_A        _("A Button")
-#define TEXT_BIND_B        _("B Button")
-#define TEXT_BIND_START    _("Start Button")
-#define TEXT_BIND_L        _("L Trigger")
-#define TEXT_BIND_R        _("R Trigger")
-#define TEXT_BIND_Z        _("Z Trigger")
-#define TEXT_BIND_C_UP     _("C-Up")
-#define TEXT_BIND_C_DOWN   _("C-Down")
-#define TEXT_BIND_C_LEFT   _("C-Left")
-#define TEXT_BIND_C_RIGHT  _("C-Right")
-#define TEXT_BIND_UP       _("Stick Up")
-#define TEXT_BIND_DOWN     _("Stick Down")
-#define TEXT_BIND_LEFT     _("Stick Left")
-#define TEXT_BIND_RIGHT    _("Stick Right")
-
-#define TEXT_OPT_CHEATS _("CHEATS")
-#define TEXT_OPT_CHEAT1 _("Enable cheats")
-#define TEXT_OPT_CHEAT2 _("Moonjump (Press L)")
-#define TEXT_OPT_CHEAT3 _("Invincible Mario")
-#define TEXT_OPT_CHEAT4 _("Infinite lives")
-#define TEXT_OPT_CHEAT5 _("Super speed")
-#define TEXT_OPT_CHEAT6 _("Super responsive controls")
-#define TEXT_OPT_CHEAT7 _("Exit course at any time")
-#define TEXT_OPT_CHEAT8 _("Huge Mario")
-#define TEXT_OPT_CHEAT9 _("Tiny Mario")
 /**
  * Global Symbols
  */
@@ -146,7 +94,7 @@
 #define TEXT_COURSE _("コース")
 #define TEXT_MYSCORE _("マイスコア")
 #define TEXT_CONTINUE _("つづけて　マリオする？")
-#define TEXT_EXIT_GAME _("ゲームをしゅうりょうする？")
+#define TEXT_EXIT_GAME _("ゲームをしゅうりょうする")
 #define TEXT_EXIT_COURSE _("コースからでる？")
 #define TEXT_CAMERA_ANGLE_R _("Ｒボタンのカメラきりかえ")
 
diff --git a/src/game/options_menu.c b/src/game/options_menu.c
index 6c9c1a1c..8d1661bf 100644
--- a/src/game/options_menu.c
+++ b/src/game/options_menu.c
@@ -462,7 +462,7 @@ void optmenu_draw(void) {
 //This has been separated for interesting reasons. Don't question it.
 void optmenu_draw_prompt(void) {
     gSPDisplayList(gDisplayListHead++, dl_ia_text_begin);
-    optmenu_draw_text(278, 212, menuStr[1 + optmenu_open], 0);
+    optmenu_draw_text(264, 212, menuStr[1 + optmenu_open], 0);
     gSPDisplayList(gDisplayListHead++, dl_ia_text_end);
 }