diff options
Diffstat (limited to 'engine/link/link.asm')
| -rw-r--r-- | engine/link/link.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index de6ed239a..7de939430 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -177,9 +177,9 @@ Gen2ToGen1LinkComms: ld hl, wTimeCapsulePlayerData call Link_ConvertPartyStruct1to2 - ld a, LOW(wOTPartyMonOT) + ld a, LOW(wOTPartyMonOTs) ld [wUnusedNamesPointer], a - ld a, HIGH(wOTPartyMonOT) + ld a, HIGH(wOTPartyMonOTs) ld [wUnusedNamesPointer + 1], a ld de, MUSIC_NONE @@ -432,9 +432,9 @@ Gen2ToGen2LinkComms: ld bc, wOTPartyDataEnd - wOTPartyMons call CopyBytes - ld a, LOW(wOTPartyMonOT) + ld a, LOW(wOTPartyMonOTs) ld [wUnusedNamesPointer], a - ld a, HIGH(wOTPartyMonOT) + ld a, HIGH(wOTPartyMonOTs) ld [wUnusedNamesPointer + 1], a ld de, MUSIC_NONE @@ -716,7 +716,7 @@ Link_PrepPartyData_Gen1: dec c jr nz, .mon_loop - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call .copy_ot_nicks ld hl, wPartyMonNicknames @@ -860,7 +860,7 @@ Link_PrepPartyData_Gen2: ld bc, PARTY_LENGTH * PARTYMON_STRUCT_LENGTH call CopyBytes - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, PARTY_LENGTH * NAME_LENGTH call CopyBytes @@ -1005,7 +1005,7 @@ Link_ConvertPartyStruct1to2: pop hl ld bc, PARTY_LENGTH * REDMON_STRUCT_LENGTH add hl, bc - ld de, wOTPartyMonOT + ld de, wOTPartyMonOTs ld bc, PARTY_LENGTH * NAME_LENGTH call CopyBytes ld de, wOTPartyMonNicknames @@ -1672,7 +1672,7 @@ LinkTrade: ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 - ld de, wBufferTrademonNick + ld de, wBufferTrademonNickname ld bc, MON_NAME_LENGTH call CopyBytes ld a, [wCurOTTradePartyMon] @@ -1811,7 +1811,7 @@ LinkTrade: push af ; OT name ld a, [wCurTradePartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames ld de, wPlayerTrademonOTName ld bc, NAME_LENGTH @@ -1858,7 +1858,7 @@ LinkTrade: ld [wOTTrademonSpecies], a ; OT name ld a, [wCurOTTradePartyMon] - ld hl, wOTPartyMonOT + ld hl, wOTPartyMonOTs call SkipNames ld de, wOTTrademonOTName ld bc, NAME_LENGTH |