From f5280fe5265e20ac2c87d9f4fed25a33e392610f Mon Sep 17 00:00:00 2001
From: zoltanvb <101990835+zoltanvb@users.noreply.github.com>
Date: Wed, 14 May 2025 07:43:16 +0200
Subject: [PATCH] Lock core and save state explanations.

---
 intl/msg_hash_us.c |  6 ++++++
 intl/msg_hash_us.h | 10 +++++++++-
 msg_hash.h         |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 85f9341d8b..df6c8064e2 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -463,6 +463,12 @@ int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
           case MENU_ENUM_LABEL_CHEAT_START_OR_CONT:
              strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHEAT_START_OR_CONT), len);
              break;
+          case MENU_ENUM_LABEL_SAVE_STATE:
+             strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SAVE_STATE), len);
+             break;
+          case MENU_ENUM_LABEL_LOAD_STATE:
+             strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_LOAD_STATE), len);
+             break;
 #ifdef HAVE_LAKKA
           case MENU_ENUM_LABEL_TIMEZONE:
              strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_TIMEZONE), len);
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 4f8ed4a426..c3674a7239 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -569,7 +569,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CORE_LOCK,
-   "Prevent modification of the currently installed core. May be used to avoid unwanted updates when content requires a specific core version (e.g. Arcade ROM sets)."
+   "Prevent modification of the currently installed core. May be used to avoid unwanted updates when content requires a specific core version (e.g. Arcade ROM sets) or the core's own save state format changes."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_SET_STANDALONE_EXEMPT,
@@ -9144,6 +9144,10 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVE_STATE,
    "Save a state to the currently selected slot."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_HELP_SAVE_STATE,
+   "Save a state to the currently selected slot. Note: save states are typically not portable and may not work with other versions of this core."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOAD_STATE,
    "Load State"
@@ -9152,6 +9156,10 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_LOAD_STATE,
    "Load a saved state from the currently selected slot."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_HELP_LOAD_STATE,
+   "Load a saved state from the currently selected slot. Note: may not work if state was saved with another version of the core."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,
    "Undo Load State"
diff --git a/msg_hash.h b/msg_hash.h
index 013a4d47ec..dfad810c46 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -2307,8 +2307,8 @@ enum msg_hash_enums
    MENU_LABEL(MICROPHONE_WASAPI_SH_BUFFER_LENGTH),
 #endif
 
-   MENU_LABEL(SAVE_STATE),
-   MENU_LABEL(LOAD_STATE),
+   MENU_LBL_H(SAVE_STATE),
+   MENU_LBL_H(LOAD_STATE),
    MENU_LABEL(UNDO_LOAD_STATE),
    MENU_LABEL(UNDO_SAVE_STATE),