Project-slippi/slippi-ssbm-asm
1
0
Fork 0
mirror of https://github.com/project-slippi/slippi-ssbm-asm.git synced 2025-10-05 23:52:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix regression causing frozen to always be played

Browse Source
This commit is contained in:
Jas Laferriere
2025-07-22 12:10:59 -04:00
parent 9f54e51bd7
commit f154fb847e
4 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Online/Core/InitOnlinePlay.asm
View File

@@ -136,9 +136,9 @@ addi r4, REG_MSRB_ADDR, MSRB_GAME_INFO_BLOCK
li r5, MATCH_STRUCT_LEN
branchl r12, memcpy
computeBranchTargetAddress r4, INJ_FREEZE_STADIUM
lbz r3, MSRB_ALT_STAGE_MODE(REG_MSRB_ADDR)
computeBranchTargetAddress r3, INJ_FREEZE_STADIUM
stb r3, 0x8(r3) # Store selection in the gecko code space
stb r3, 0x8(r4) # Store selection in the gecko code space
# logf LOG_LEVEL_ERROR, "alt stage mode: %d"
lbz r3, OFST_R13_ONLINE_MODE(r13)

6
Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
View File

@@ -28,6 +28,9 @@ CODE_START:
bl DATA_BLRL
mflr REG_DATA
# load branch target address early to use later. this macro clobbers r3
computeBranchTargetAddress r12, INJ_FREEZE_STADIUM
# check if we pressed z
load r3, HSD_PadMaster
lwz r4, 0x8(r3) # instant buttons
@@ -38,8 +41,7 @@ CODE_START:
lbz r4, 0(REG_DATA)
xori r4, r4, 1
stb r4, 0(REG_DATA)
computeBranchTargetAddress r4, INJ_FREEZE_STADIUM
stb r4, 0x8(r4) # Store selection in the gecko code space
stb r4, 0x8(r12) # Store selection in the gecko code space
PAD_CHECK_END:
# get our jobj

24
Output/Netplay/GALE01r2.ini
View File

@@ -1450,11 +1450,11 @@ B06C0001 38600001
7FE3FB78 3898025C
38A00138 3D808000
618C31F4 7D8903A6
4E800421 887803C7
3C60801D 6063457C
80830000 5485302E
38800040 7C8523D6
7C632214 98630008
4E800421 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7C832214
887803C7 98640008
886DAFA0 2C030000
40820048 3CA0803D
60A5AD40 80A50000
@@ -4374,15 +4374,15 @@ C225A530 00000019 #Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
00000000 7C0802A6
90010004 9421FF20
BE8100B0 4BFFFFE9
7EA802A6 3C60804C
60631FAC 80830008
548006F7 41820030
88950000 68840001
98950000 3C60801D
7EA802A6 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7C832214
98840008 3C60804D
7C8523D6 7D832214
3C60804C 60631FAC
80830008 548006F7
41820014 88950000
68840001 98950000
988C0008 3C60804D
6063781C 80630000
82830028 2C1E0012
40820020 3C808052

24
Output/Netplay/GALJ01r2.ini
View File

@@ -1449,11 +1449,11 @@ B06C0001 38600001
7FE3FB78 3898025C
38A00138 3D808000
618C31F4 7D8903A6
4E800421 887803C7
3C60801D 6063457C
80830000 5485302E
38800040 7C8523D6
7C632214 98630008
4E800421 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7C832214
887803C7 98640008
886DAFA0 2C030000
40820048 3CA0803D
60A5AD40 80A50000
@@ -4373,15 +4373,15 @@ C225A530 00000019 #Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
00000000 7C0802A6
90010004 9421FF20
BE8100B0 4BFFFFE9
7EA802A6 3C60804C
60631FAC 80830008
548006F7 41820030
88950000 68840001
98950000 3C60801D
7EA802A6 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7C832214
98840008 3C60804D
7C8523D6 7D832214
3C60804C 60631FAC
80830008 548006F7
41820014 88950000
68840001 98950000
988C0008 3C60804D
6063781C 80630000
82830028 2C1E0012
40820020 3C808052