Skip to content

Use separate constants for wChosenCableClubRoom #144

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

Merged
Rangi42 merged 1 commit into from
Feb 8, 2026
Merged

Use separate constants for wChosenCableClubRoom #144

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
6 changes: 6 additions & 0 deletions constants/serial_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
const LINK_TRADECENTER ; 2
const LINK_COLOSSEUM ; 3

; wChosenCableClubRoom
const_def
const CABLECLUBROOM_NULL ; 0
const CABLECLUBROOM_TRADECENTER ; 1
const CABLECLUBROOM_COLOSSEUM ; 2

; hSerialReceive high nybbles
DEF SERIAL_TIMECAPSULE EQU $60
DEF SERIAL_TRADECENTER EQU $70
Expand Down
6 changes: 3 additions & 3 deletions engine/link/link.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2124,13 +2124,13 @@ WaitForOtherPlayerToExit:
ret

SetBitsForLinkTradeRequest:
ld a, LINK_TRADECENTER - 1
ld a, CABLECLUBROOM_TRADECENTER
ld [wPlayerLinkAction], a
ld [wChosenCableClubRoom], a
ret

SetBitsForBattleRequest:
ld a, LINK_COLOSSEUM - 1
ld a, CABLECLUBROOM_COLOSSEUM
ld [wPlayerLinkAction], a
ld [wChosenCableClubRoom], a
ret
Expand All @@ -2144,7 +2144,7 @@ SetBitsForTimeCapsuleRequest:
ldh [rSC], a
ld a, SC_START | SC_EXTERNAL
ldh [rSC], a
xor a ; LINK_NULL
xor a ; CABLECLUBROOM_NULL
ld [wPlayerLinkAction], a
ld [wChosenCableClubRoom], a
ret
Expand Down
Loading