Rename MainMenu::SelectRelated to MainMenu::SwapMapping

happyhavoc · Dec 1, 2024 · a0ac5cf · a0ac5cf
1 parent abd51ba
commit a0ac5cf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/config/implemented.csv b/config/implemented.csv
@@ -249,7 +249,7 @@ th06::MainMenu::WeirdSecondInputCheck
 th06::MainMenu::OnUpdateOptionsMenu
 th06::MainMenu::ColorMenuItem
 th06::MainMenu::LoadReplayMenu
-th06::MainMenu::SelectRelated
+th06::MainMenu::SwapMapping
 th06::MidiDevice::MidiDevice
 th06::MidiDevice::Close
 th06::MidiDevice::OpenDevice

diff --git a/src/MainMenu.cpp b/src/MainMenu.cpp
@@ -205,39 +205,39 @@ ChainCallbackResult MainMenu::OnUpdate(MainMenu *menu)
                 switch (menu->cursor)
                 {
                 case 0:
-                    SelectRelated(menu, sVar1, menu->controlMapping[0], 1);
+                    SwapMapping(menu, sVar1, menu->controlMapping[0], 1);
                     menu->controlMapping[0] = sVar1;
                     break;
                 case 1:
-                    SelectRelated(menu, sVar1, menu->controlMapping[1], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[1], 0);
                     menu->controlMapping[1] = sVar1;
                     break;
                 case 2:
-                    SelectRelated(menu, sVar1, menu->controlMapping[2], 1);
+                    SwapMapping(menu, sVar1, menu->controlMapping[2], 1);
                     menu->controlMapping[2] = sVar1;
                     break;
                 case 3:
-                    SelectRelated(menu, sVar1, menu->controlMapping[3], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[3], 0);
                     menu->controlMapping[3] = sVar1;
                     break;
                 case 4:
-                    SelectRelated(menu, sVar1, menu->controlMapping[4], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[4], 0);
                     menu->controlMapping[4] = sVar1;
                     break;
                 case 5:
-                    SelectRelated(menu, sVar1, menu->controlMapping[5], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[5], 0);
                     menu->controlMapping[5] = sVar1;
                     break;
                 case 6:
-                    SelectRelated(menu, sVar1, menu->controlMapping[6], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[6], 0);
                     menu->controlMapping[6] = sVar1;
                     break;
                 case 7:
-                    SelectRelated(menu, sVar1, menu->controlMapping[7], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[7], 0);
                     menu->controlMapping[7] = sVar1;
                     break;
                 case 8:
-                    SelectRelated(menu, sVar1, menu->controlMapping[8], 0);
+                    SwapMapping(menu, sVar1, menu->controlMapping[8], 0);
                     menu->controlMapping[8] = sVar1;
                 }
             }
@@ -925,7 +925,7 @@ CursorMovement MainMenu::MoveCursor(MainMenu *menu, i32 menuLength)
 #pragma optimize("", on)
 
 #pragma optimize("s", on)
-void MainMenu::SelectRelated(MainMenu *menu, i16 btnPressed, i16 oldMapping, ZunBool unk)
+void MainMenu::SwapMapping(MainMenu *menu, i16 btnPressed, i16 oldMapping, ZunBool unk)
 {
     if (unk == 0 && menu->controlMapping[0] == btnPressed)
     {

diff --git a/src/MainMenu.hpp b/src/MainMenu.hpp
@@ -68,7 +68,7 @@ struct MainMenu
     static CursorMovement MoveCursor(MainMenu *menu, i32 menuLength);
     static void DrawMenuItem(AnmVm *vm, i32 itemNumber, i32 cursor, D3DCOLOR activeItemColor,
                              D3DCOLOR inactiveItemColor, i32 spriteIdx /* I think*/);
-    static void SelectRelated(MainMenu *menu, i16 btnPressed, i16 oldMapping, ZunBool unk);
+    static void SwapMapping(MainMenu *menu, i16 btnPressed, i16 oldMapping, ZunBool unk);
 
     i32 ReplayHandling();
     static ZunResult LoadReplayMenu(MainMenu *menu);