From 7883e8f431a0b8f995c8f581af248b53896e5aa5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 29 Oct 2020 16:43:28 -0400 Subject: [PATCH] Define SERIAL_LINK_BYTE_TIMEOUT --- constants/serial_constants.asm | 3 +++ engine/link/link.asm | 5 +++-- home/serial.asm | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/constants/serial_constants.asm b/constants/serial_constants.asm index 7113eb6906b..715534372a3 100644 --- a/constants/serial_constants.asm +++ b/constants/serial_constants.asm @@ -31,4 +31,7 @@ SERIAL_PATCH_LIST_PART_TERMINATOR EQU $ff SERIAL_PREAMBLE_LENGTH EQU 6 +; timeout duration after exchanging a byte +SERIAL_LINK_BYTE_TIMEOUT EQU $5000 + MAX_MYSTERY_GIFT_PARTNERS EQU 5 diff --git a/engine/link/link.asm b/engine/link/link.asm index 7c8edddd2b9..3fa34df0357 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -28,9 +28,10 @@ LinkCommunications: call SetTradeRoomBGPals call WaitBGMap2 ld hl, wLinkByteTimeout - xor a ; LOW($5000) + assert LOW(SERIAL_LINK_BYTE_TIMEOUT) == 0 + xor a ; LOW(SERIAL_LINK_BYTE_TIMEOUT) ld [hli], a - ld [hl], HIGH($5000) + ld [hl], HIGH(SERIAL_LINK_BYTE_TIMEOUT) ld a, [wLinkMode] cp LINK_TIMECAPSULE jp nz, Gen2ToGen2LinkComms diff --git a/home/serial.asm b/home/serial.asm index 40cdc8c33e8..f6e9e7db763 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -191,9 +191,10 @@ Serial_ExchangeByte:: sub 1 << SERIAL jr nz, .non_serial_interrupts_enabled - ; a == LOW($5000) + ; a == 0 + assert LOW(SERIAL_LINK_BYTE_TIMEOUT) == 0 ld [wLinkByteTimeout], a - ld a, HIGH($5000) + ld a, HIGH(SERIAL_LINK_BYTE_TIMEOUT) ld [wLinkByteTimeout + 1], a .non_serial_interrupts_enabled