diff --git a/Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm b/Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm index 88ea3a0f..03e21ece 100644 --- a/Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm +++ b/Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm @@ -10,8 +10,8 @@ bne CLEAR # Check force bool lbz r3, OFST_R13_FORCE_MENU_CLEAR(r13) -cmpwi r3, 0 -bne CLEAR +cmpwi r3, 1 +beq CLEAR # Skip clear handling branch r12, 0x8022B11C diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini index de54982e..985dc589 100644 --- a/Output/Netplay/GALE01r2.ini +++ b/Output/Netplay/GALE01r2.ini @@ -55,8 +55,6 @@ C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm 3B600000 3BA00000 60000000 00000000 0416B480 60000000 #C-Stick in Single Player [Zauron] -0422D638 38000006 #Debug Menu [Magus, donny2112] -041B0A14 38600002 #Exiting Debug Menu Returns to CSS [Achilles] C216E510 00000093 #External/NeutralSpawn/NeutralSpawn.asm 7C0802A6 90010004 9421FF50 BE810008 @@ -2770,15 +2768,15 @@ BE810008 4BFFFDFD 38800005 38A00080 3D808039 618C01F0 7D8903A6 4E800421 -7C761B78 38600004 +7C791B78 38600004 3D808037 618CF1E4 7D8903A6 4E800421 -7C781B78 38760000 +7C781B78 38790000 38800004 3CA08037 60A5F1B0 38D80000 3D808039 618C0B68 7D8903A6 4E800421 -38760000 48000261 +38790000 48000261 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 4E800421 @@ -4083,7 +4081,7 @@ C2259CC8 0000000D #Online/Menus/SSS/ExitSSSUponStageSelect.asm 38600004 00000000 C222B044 00000006 #Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm 40820020 886DAFA2 -2C030000 40820014 +2C030001 41820014 3D808022 618CB11C 7D8903A6 4E800420 38600000 986DAFA2 diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini index f1992e64..1b477ba1 100644 --- a/Output/Netplay/GALJ01r2.ini +++ b/Output/Netplay/GALJ01r2.ini @@ -55,8 +55,6 @@ C21A5B14 0000000A #External/Salty Runback/Salty Runback.asm 3B600000 3BA00000 60000000 00000000 0416B480 60000000 #C-Stick in Single Player [Zauron] -0422D638 38000006 #Debug Menu [Magus, donny2112] -041B0A14 38600002 #Exiting Debug Menu Returns to CSS [Achilles] C216E510 00000093 #External/NeutralSpawn/NeutralSpawn.asm 7C0802A6 90010004 9421FF50 BE810008 @@ -2770,15 +2768,15 @@ BE810008 4BFFFDFD 38800005 38A00080 3D808039 618C01F0 7D8903A6 4E800421 -7C761B78 38600004 +7C791B78 38600004 3D808037 618CF1E4 7D8903A6 4E800421 -7C781B78 38760000 +7C781B78 38790000 38800004 3CA08037 60A5F1B0 38D80000 3D808039 618C0B68 7D8903A6 4E800421 -38760000 48000261 +38790000 48000261 7C8802A6 38A00004 3D808038 618CFD54 7D8903A6 4E800421 @@ -4083,7 +4081,7 @@ C2259CC8 0000000D #Online/Menus/SSS/ExitSSSUponStageSelect.asm 38600004 00000000 C222B044 00000006 #Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm 40820020 886DAFA2 -2C030000 40820014 +2C030001 41820014 3D808022 618CB11C 7D8903A6 4E800420 38600000 986DAFA2 diff --git a/netplay.json b/netplay.json index 28ebc3d1..75827287 100644 --- a/netplay.json +++ b/netplay.json @@ -118,16 +118,6 @@ "sourceFile": "Binary/FasterMeleeSettings/CStickSinglePlayer.bin", "annotation": "C-Stick in Single Player [Zauron]" }, - { - "type": "binary", - "sourceFile": "Binary/FasterMeleeSettings/DebugMenu.bin", - "annotation": "Debug Menu [Magus, donny2112]" - }, - { - "type": "binary", - "sourceFile": "Binary/FasterMeleeSettings/CssFromDebugMenu.bin", - "annotation": "Exiting Debug Menu Returns to CSS [Achilles]" - }, { "type": "injectFolder", "sourceFolder": "External/NeutralSpawn",