dev menu? more like... uh... shit

Added the ability to show the instructions in the help & options menu instead of the dev menu (when it's enabled) by holding x
RSDKModding · Jan 17, 2024 · 7d1cdcb · 7d1cdcb
1 parent 804ef45
commit 7d1cdcb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/RSDKv4/NativeObjects/OptionsMenu.cpp b/RSDKv4/NativeObjects/OptionsMenu.cpp
@@ -106,7 +106,8 @@ void OptionsMenu_Main(void *objPtr)
                         self->buttons[self->selectedButton]->b     = 0xFF;
                         self->state                                = OPTIONSMENU_STATE_ACTION;
 #if !RETRO_USE_ORIGINAL_CODE
-                        if (Engine.devMenu && self->selectedButton == OPTIONSMENU_BUTTON_INSTRUCTIONS)
+                        self->unused1 = Engine.devMenu && self->selectedButton == OPTIONSMENU_BUTTON_INSTRUCTIONS && !keyDown.X;
+                        if (self->unused1)
                             StopMusic(true);
 #endif
                     }
@@ -157,7 +158,7 @@ void OptionsMenu_Main(void *objPtr)
             self->menuControl->state = MENUCONTROL_STATE_NONE;
             if (!self->buttons[self->selectedButton]->state) {
 #if !RETRO_USE_ORIGINAL_CODE
-                if (!Engine.devMenu || self->selectedButton != OPTIONSMENU_BUTTON_INSTRUCTIONS) {
+                if (!self->unused1) {
 #endif
                     self->state = OPTIONSMENU_STATE_ENTERSUBMENU;
 

diff --git a/RSDKv4/NativeObjects/OptionsMenu.hpp b/RSDKv4/NativeObjects/OptionsMenu.hpp
@@ -23,7 +23,7 @@ enum OptionsMenuButtons {
 struct NativeEntity_OptionsMenu : NativeEntityBase {
     OptionsMenuStates state;
     float timer;
-    int unused1;
+    int unused1; // Used for checking if the dev menu should be entered in the decomp
     NativeEntity_MenuControl *menuControl;
     NativeEntity_InstructionsScreen *instructionsScreen;
     NativeEntity_SettingsScreen *settingsScreen;