Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Debug Menu on Tournament Mode and re-enable the latter. #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove Debug Menu on Tournament Mode and re-enable the latter. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Online/Menus/TitleMenu/AllowSwapToSameSubmenu.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know what this value is for? Maybe we should use a different r13 offset for FORCE_MENU_CLEAR instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its not clear to what id being used for exactly.

I just know that after you leave tournament mode it is not reset.

But it is always updated when you open up tournament mode. Its safe to use it for now.

beq CLEAR

# Skip clear handling
branch r12, 0x8022B11C
Expand Down
10 changes: 4 additions & 6 deletions Output/Netplay/GALE01r2.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions Output/Netplay/GALJ01r2.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions netplay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down