From f9c9c307de3b160004860f29b0a18ad9c8001dd9 Mon Sep 17 00:00:00 2001
From: Gin <>
Date: Sat, 17 Oct 2026 08:20:16 -0700
Subject: [PATCH] clean up options

---
 .../PokemonLZA_ShinyHunt_OverworldReset.cpp         | 13 +++++++++----
 .../PokemonLZA_ShinyHunt_OverworldReset.h           |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
index e028cab816..29762f8070 100644
--- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
@@ -72,6 +72,10 @@ ShinyHunt_OverworldReset::ShinyHunt_OverworldReset()
         LockMode::UNLOCK_WHILE_RUNNING,
         false
     )
+    , MOVEMENT_GROUP(
+        "Movement After Loading",
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
     , MOVEMENT(
         "<b>Movement:</b><br>"
         "Move the player after entering the game to close gap. ",
@@ -119,12 +123,13 @@ ShinyHunt_OverworldReset::ShinyHunt_OverworldReset()
     })
 {
     PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(MOVEMENT);
     PA_ADD_OPTION(RESET_DELAY);
+    PA_ADD_OPTION(MOVEMENT_GROUP);
+    MOVEMENT_GROUP.PA_ADD_OPTION(MOVEMENT);
+    MOVEMENT_GROUP.PA_ADD_OPTION(RUN_DIRECTION);
+    MOVEMENT_GROUP.PA_ADD_OPTION(RUN_DURATION);
+    MOVEMENT_GROUP.PA_ADD_OPTION(ROLLS);
     PA_ADD_OPTION(ROTATE_CAMERA);
-    PA_ADD_OPTION(RUN_DIRECTION);
-    PA_ADD_OPTION(RUN_DURATION);
-    PA_ADD_OPTION(ROLLS);
     PA_ADD_OPTION(SHINY_DETECTED);
     PA_ADD_OPTION(NOTIFICATIONS);
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
index 951a61ce02..d7ef27d6e2 100644
--- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
@@ -9,6 +9,7 @@
 
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
@@ -69,6 +70,8 @@ class ShinyHunt_OverworldReset : public SingleSwitchProgramInstance, ConfigOptio
     MillisecondsOption RESET_DELAY;
     BooleanCheckBoxOption ROTATE_CAMERA;
 
+    //  Holds MOVEMENT, RUN_DIRECTION, RUN_DURATION and ROLLS in one box in the UI.
+    GroupOption MOVEMENT_GROUP;
     EnumDropdownOption<Movement> MOVEMENT;
     EnumDropdownOption<RunDirection> RUN_DIRECTION;
     MillisecondsOption RUN_DURATION;