Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-09-13 02:55:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Factor out DEF LINK_PARTY_DATA_PADDING EQU 3

Browse Source
This commit is contained in:
Rangi
2026-01-20 16:59:02 -05:00
parent cadbc23823
commit 0e34e4fb8d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
constants/serial_constants.asm
View File

@@ -36,10 +36,11 @@ DEF SERIAL_RN_PREAMBLE_LENGTH EQU 7
DEF SERIAL_PATCH_PREAMBLE_LENGTH EQU 3
DEF SERIAL_RNS_LENGTH EQU 10
DEF LINK_PARTY_DATA_PADDING EQU 3 ; bytes unnecessarily written at the end of the data
; Gen 2 to Gen 2 link party data structure
DEF LINK_PARTY_DATA_LENGTH EQU NAME_LENGTH + (1 + PARTY_LENGTH + 1) + 2 + (PARTYMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH
DEF LINK_PARTY_DATA_LENGTH EQU NAME_LENGTH + (1 + PARTY_LENGTH + 1) + 2 + (PARTYMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH + LINK_PARTY_DATA_PADDING
; Gen 2 to Gen 1 link party data structure (Time Capsule)
DEF LINK_TIME_CAPSULE_PARTY_DATA_LENGTH EQU NAME_LENGTH + (1 + PARTY_LENGTH + 1) + (REDMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH
DEF LINK_TIME_CAPSULE_PARTY_DATA_LENGTH EQU NAME_LENGTH + (1 + PARTY_LENGTH + 1) + (REDMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH + LINK_PARTY_DATA_PADDING
DEF SERIAL_MAIL_PREAMBLE_BYTE EQU $20
DEF SERIAL_MAIL_PREAMBLE_LENGTH EQU 5

8
engine/link/link.asm
View File

@@ -88,7 +88,7 @@ endc
ld hl, wLinkSendTimeCapsuleParty
ld de, wLinkReceivedPartyData
ld bc, SERIAL_PREAMBLE_LENGTH + LINK_TIME_CAPSULE_PARTY_DATA_LENGTH + 3
ld bc, SERIAL_PREAMBLE_LENGTH + LINK_TIME_CAPSULE_PARTY_DATA_LENGTH
vc_hook Wireless_ExchangeBytes_Gen2toGen1_party_structs
call Serial_ExchangeBytes
ld a, SERIAL_NO_DATA_BYTE
@@ -120,7 +120,7 @@ endc
jp nc, ExitLinkCommunications
ld de, wLinkPlayerName
ld bc, LINK_TIME_CAPSULE_PARTY_DATA_LENGTH + 3
ld bc, LINK_TIME_CAPSULE_PARTY_DATA_LENGTH
call Link_CopyOTData
ld de, wOTPatchLists
@@ -254,7 +254,7 @@ endc
ld hl, wLinkSendParty
ld de, wLinkReceivedPartyData
ld bc, SERIAL_PREAMBLE_LENGTH + LINK_PARTY_DATA_LENGTH + 3
ld bc, SERIAL_PREAMBLE_LENGTH + LINK_PARTY_DATA_LENGTH
vc_hook Wireless_ExchangeBytes_party_structs
call Serial_ExchangeBytes
ld a, SERIAL_NO_DATA_BYTE
@@ -288,7 +288,7 @@ endc
ld hl, wLinkReceivedPartyData
call Link_FindFirstNonControlCharacter_SkipZero
ld de, wLinkPlayerName
ld bc, LINK_PARTY_DATA_LENGTH
ld bc, LINK_PARTY_DATA_LENGTH - LINK_PARTY_DATA_PADDING
call Link_CopyOTData
ld de, wOTPatchLists

9
ram/wram.asm
View File

@@ -497,7 +497,7 @@ wLinkDataEnd::
SECTION UNION "Overworld Map", WRAM0
; player's party data, formatted for link transfer (Gen 2 link session)
wLinkSendParty:: ds SERIAL_PREAMBLE_LENGTH + LINK_PARTY_DATA_LENGTH + 3
wLinkSendParty:: ds SERIAL_PREAMBLE_LENGTH + LINK_PARTY_DATA_LENGTH
ds 50
; player's party mail, formatted for link transfer, during a link session
@@ -521,7 +521,7 @@ wLinkReceivedMailEnd::
SECTION UNION "Overworld Map", WRAM0
; player's party data, formatted for link transfer (Time Capsule link session)
wLinkSendTimeCapsuleParty:: ds SERIAL_PREAMBLE_LENGTH + LINK_TIME_CAPSULE_PARTY_DATA_LENGTH + 3
wLinkSendTimeCapsuleParty:: ds SERIAL_PREAMBLE_LENGTH + LINK_TIME_CAPSULE_PARTY_DATA_LENGTH
SECTION UNION "Overworld Map", WRAM0
@@ -585,7 +585,7 @@ for n, 1, PARTY_LENGTH + 1
wTimeCapsulePartyMon{d:n}Nickname:: ds MON_NAME_LENGTH
endr
ds 3
ds LINK_PARTY_DATA_PADDING ; unused but written to
ENDU
@@ -2784,8 +2784,7 @@ wMagikarpRecordHoldersName:: ds NAME_LENGTH
; This union spans 451 bytes.
UNION
; during a link session, other player's raw party data is initially stored here
wLinkReceivedPartyData::
ds SERIAL_PREAMBLE_LENGTH + LINK_PARTY_DATA_LENGTH + 3
wLinkReceivedPartyData:: ds SERIAL_PREAMBLE_LENGTH + LINK_PARTY_DATA_LENGTH
wLinkReceivedPartyEnd:: db
NEXTU