Skip to content

Wind Waker Client : Allow more Game IDs #5186

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
Crain-32 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

Wind Waker Client : Allow more Game IDs #5186

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
9 changes: 8 additions & 1 deletion worlds/tww/TWWClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
)
CONNECTION_CONNECTED_STATUS = "Dolphin connected successfully."
CONNECTION_INITIAL_STATUS = "Dolphin connection has not been initiated."
GAME_ID_UNEXPECTED_MESSAGE = "Editing the Game ID is something you do 'at your own risk', you have been warned."


# This address is used to check/set the player's health for DeathLink.
Expand Down Expand Up @@ -671,12 +672,18 @@ async def dolphin_sync_task(ctx: TWWContext) -> None:
logger.info("Attempting to connect to Dolphin...")
dolphin_memory_engine.hook()
if dolphin_memory_engine.is_hooked():
if dolphin_memory_engine.read_bytes(0x80000000, 6) != b"GZLE99":
game_id = dolphin_memory_engine.read_bytes(0x80000000, 6)
# Editing the Game ID is a useful method of isolating game data without memory card changes,
# Supporting 2 additional IDs is reasonable. J/P is in line with the normal GC ID Schema.
if game_id not in [b"GZLE99", b"GZLP99", b"GZLJ99"]:
logger.info(CONNECTION_REFUSED_GAME_STATUS)
ctx.dolphin_status = CONNECTION_REFUSED_GAME_STATUS
dolphin_memory_engine.un_hook()
sleep_time = 5
else:
if game_id != b"GZLE99":
# Supported doesn't mean preferred, so still throw a message in the log.
logger.info(GAME_ID_UNEXPECTED_MESSAGE)
logger.info(CONNECTION_CONNECTED_STATUS)
ctx.dolphin_status = CONNECTION_CONNECTED_STATUS
ctx.locations_checked = set()
Expand Down