Skip to content

Cleanup redundant data for frozen stadium/alt stage toggle #140

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

Open
sadkellz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cleanup redundant data for frozen stadium/alt stage toggle #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e88108f
remove redundant toggle data to unify addresses
sadkellz Aug 14, 2025
33e6726
clean up unused header data and build codeset
sadkellz Aug 14, 2025
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
2 changes: 1 addition & 1 deletion Online/Menus/CSS/HandleInputsOnCSS.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ sth r3, PSTB_STAGE_ID(REG_TXB_ADDR)
stb r4, PSTB_STAGE_OPT(REG_TXB_ADDR)

# Write the alt stage mode
computeBranchTargetAddress r3, 0x8025a530
computeBranchTargetAddress r3, INJ_FREEZE_STADIUM
addi r3, r3, 0x8
lbz r3, 0(r3)
stb r3, PSTB_ALT_STAGE_MODE(REG_TXB_ADDR)
Expand Down
2 changes: 1 addition & 1 deletion Online/Menus/SSS/FrozenStadiumToggle/CheckForFrozenOnStageName.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CODE_START:
bne EXIT

# get our static toggle data
computeBranchTargetAddress REG_FROZEN, 0x8025a530
computeBranchTargetAddress REG_FROZEN, INJ_FREEZE_STADIUM
addi REG_FROZEN, REG_FROZEN, 0x8

lwz r3, 0x0(REG_FROZEN)
Expand Down
2 changes: 1 addition & 1 deletion Online/Menus/SSS/FrozenStadiumToggle/CheckForToggledOnStageName.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ blrl
CODE_START:
backup
# get our static toggle data
computeBranchTargetAddress REG_FROZEN, 0x8025a530
computeBranchTargetAddress REG_FROZEN, INJ_FREEZE_STADIUM
addi REG_FROZEN, REG_FROZEN, 0x8

bl DATA_BLRL
Expand Down
12 changes: 1 addition & 11 deletions Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,9 @@

b CODE_START

DATA_BLRL:
blrl
.set FROZEN_TOGGLE, 0
.byte 0
.align 2

CODE_START:
backup

bl DATA_BLRL
mflr REG_DATA

# load branch target address early to use later. this macro clobbers r3
computeBranchTargetAddress r12, INJ_FREEZE_STADIUM

Expand All @@ -43,9 +34,8 @@ LOOP_TOGGLE:
beq LOOP_TOGGLE_CHECK

# weve pressed z, so toggle stadium and continue
lbz r4, 0(REG_DATA)
lbz r4, 0x8(r12)
xori r4, r4, 1
stb r4, 0(REG_DATA)
stb r4, 0x8(r12) # Store selection in the gecko code space
b COLOR_START

Expand Down
5 changes: 1 addition & 4 deletions Online/Menus/SSS/FrozenStadiumToggle/SSSToggles.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
################################################################################
# Functions
################################################################################
.set JOBJ_GetDobj, 0x80371bec
.set JOBJ_AddConstraintPos, 0x8000c1c0
.set SSS_CreateStageNameText, 0x80259ed8

################################################################################
Expand All @@ -14,15 +12,14 @@
################################################################################
# Directives
################################################################################
.set MnSlMapModels, 0x804d6c98 # (*StaticModeDesc[12 + WarCmnTop])
.set SSS_IconData, 0x803f06d0
.set SSS_HoveredIcon, 0x804d6cae # u8
.set GOBJ_Current, 0x804d781c
.set SSS_CustomData, 0x804a2f48 # some unk exit data, should be unused and unreachable in emulation
.set HSD_PadMaster, 0x804c1fac

.set ID_GRPS, 18
.set SZ_ICON, 28
.set OFST_HOVERED_ICON, -0x49F2

.endif
.set HEADER_SSS_TOGGLES, 1
51 changes: 24 additions & 27 deletions Output/Netplay/GALE01r2.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2909,8 +2909,8 @@ BE8100B0 7C7F1B78
38800000 48000010
7FE3FB78 38800001
48000004 B0790005
98990007 3C608025
6063A530 80830000
98990007 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7C632214
38630008 88630000
Expand Down Expand Up @@ -4222,8 +4222,8 @@ C2259E90 0000000E #Online/Menus/SSS/FrozenStadiumToggle/CheckForFrozenOnStageNam
90010004 9421FF20
BE8100B0 886DB60E
7C7E1B78 2C1E0012
40820034 3C608025
6063A530 80830000
40820034 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7FE32214
3BFF0008 807F0000
Expand All @@ -4236,8 +4236,8 @@ C2259E34 0000002A #Online/Menus/SSS/FrozenStadiumToggle/CheckForToggledOnStageNa
4800000C 4E800021
00000000 7C0802A6
90010004 9421FF20
BE8100B0 3C608025
6063A530 80830000
BE8100B0 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7EC32214
3AD60008 4BFFFFC9
Expand Down Expand Up @@ -4275,36 +4275,33 @@ A07F0000 3D808025
7C0803A6 3D808025
618C9EC0 7D8903A6
4E800420 00000000
C225A530 0000001D #Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
4800000C 4E800021
00000000 7C0802A6
C225A530 0000001A #Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
48000004 7C0802A6
90010004 9421FF20
BE8100B0 4BFFFFE9
7EA802A6 3C60801D
BE8100B0 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7D832214
3A600000 3C60804C
60631FAC 1C130044
7C630214 80830008
548006F7 41820018
88950000 68840001
98950000 988C0008
48000010 3A730001
2C130004 4180FFC8
3C60804D 6063781C
80630000 82830028
2C1E0012 40820020
3C808052 6084D5FF
548006F7 41820014
888C0008 68840001
988C0008 48000010
3A730001 2C130004
4180FFCC 3C60804D
6063781C 80630000
82830028 2C1E0012
40820020 3C808052
6084D5FF 80740018
80630008 8063000C
90830004 4800001C
3C8099B3 6084B3FF
80740018 80630008
8063000C 90830004
4800001C 3C8099B3
6084B3FF 80740018
80630008 8063000C
90830004 BA8100B0
800100E4 382100E0
7C0803A6 9BCDB60E
60000000 00000000
BA8100B0 800100E4
382100E0 7C0803A6
9BCDB60E 00000000
04259FB4 2C1E0020 #Online/Menus/SSS/FrozenStadiumToggle/IncMaxNames.asm
C225AC6C 00000052 #Online/Menus/SSS/FrozenStadiumToggle/StageSelectTextProc.asm
7C0802A6 90010004
Expand Down
51 changes: 24 additions & 27 deletions Output/Netplay/GALJ01r2.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2908,8 +2908,8 @@ BE8100B0 7C7F1B78
38800000 48000010
7FE3FB78 38800001
48000004 B0790005
98990007 3C608025
6063A530 80830000
98990007 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7C632214
38630008 88630000
Expand Down Expand Up @@ -4221,8 +4221,8 @@ C2259E90 0000000E #Online/Menus/SSS/FrozenStadiumToggle/CheckForFrozenOnStageNam
90010004 9421FF20
BE8100B0 886DB60E
7C7E1B78 2C1E0012
40820034 3C608025
6063A530 80830000
40820034 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7FE32214
3BFF0008 807F0000
Expand All @@ -4235,8 +4235,8 @@ C2259E34 0000002A #Online/Menus/SSS/FrozenStadiumToggle/CheckForToggledOnStageNa
4800000C 4E800021
00000000 7C0802A6
90010004 9421FF20
BE8100B0 3C608025
6063A530 80830000
BE8100B0 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7EC32214
3AD60008 4BFFFFC9
Expand Down Expand Up @@ -4274,36 +4274,33 @@ A07F0000 3D808025
7C0803A6 3D808025
618C9EC0 7D8903A6
4E800420 00000000
C225A530 0000001D #Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
4800000C 4E800021
00000000 7C0802A6
C225A530 0000001A #Online/Menus/SSS/FrozenStadiumToggle/CursorOnHoverStadium.asm
48000004 7C0802A6
90010004 9421FF20
BE8100B0 4BFFFFE9
7EA802A6 3C60801D
BE8100B0 3C60801D
6063457C 80830000
5485302E 38800040
7C8523D6 7D832214
3A600000 3C60804C
60631FAC 1C130044
7C630214 80830008
548006F7 41820018
88950000 68840001
98950000 988C0008
48000010 3A730001
2C130004 4180FFC8
3C60804D 6063781C
80630000 82830028
2C1E0012 40820020
3C808052 6084D5FF
548006F7 41820014
888C0008 68840001
988C0008 48000010
3A730001 2C130004
4180FFCC 3C60804D
6063781C 80630000
82830028 2C1E0012
40820020 3C808052
6084D5FF 80740018
80630008 8063000C
90830004 4800001C
3C8099B3 6084B3FF
80740018 80630008
8063000C 90830004
4800001C 3C8099B3
6084B3FF 80740018
80630008 8063000C
90830004 BA8100B0
800100E4 382100E0
7C0803A6 9BCDB60E
60000000 00000000
BA8100B0 800100E4
382100E0 7C0803A6
9BCDB60E 00000000
04259FB4 2C1E0020 #Online/Menus/SSS/FrozenStadiumToggle/IncMaxNames.asm
C225AC6C 00000052 #Online/Menus/SSS/FrozenStadiumToggle/StageSelectTextProc.asm
7C0802A6 90010004
Expand Down