diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 14 | ||||
| -rw-r--r-- | engine/link/link.asm | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 666eb9a0..4a580aca 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8081,7 +8081,7 @@ ReadAndPrintLinkBattleRecord: call .PrintBattleRecord hlcoord 0, 8 ld b, NUM_LINK_BATTLE_RECORDS - ld de, sLinkBattleRecord + 2 + ld de, sLinkBattleRecord1Name .loop push bc push hl @@ -8096,35 +8096,35 @@ ReadAndPrintLinkBattleRecord: push hl ld h, d ld l, e - ld de, wceed + ld de, wLinkBattleRecordName ld bc, NAME_LENGTH - 1 call CopyBytes ld a, "@" ld [de], a - inc de + inc de ; wLinkBattleRecordWins ld bc, 6 call CopyBytes - ld de, wceed + ld de, wLinkBattleRecordName pop hl call PlaceString pop hl ld de, 26 add hl, de push hl - ld de, wcef8 + ld de, wLinkBattleRecordWins lb bc, 2, 4 call PrintNum pop hl ld de, 5 add hl, de push hl - ld de, wcefa + ld de, wLinkBattleRecordLosses lb bc, 2, 4 call PrintNum pop hl ld de, 5 add hl, de - ld de, wcefc + ld de, wLinkBattleRecordDraws lb bc, 2, 4 call PrintNum jr .next diff --git a/engine/link/link.asm b/engine/link/link.asm index f4188bd0..230a62ae 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2018,7 +2018,7 @@ SetBitsForBattleRequest: ret SetBitsForTimeCapsuleRequest: - ld a, $2 + ld a, USING_INTERNAL_CLOCK ldh [rSB], a xor a ldh [hSerialReceive], a @@ -2035,7 +2035,7 @@ WaitForLinkedFriend: ld a, [wPlayerLinkAction] and a jr z, .no_link_action - ld a, $2 + ld a, USING_INTERNAL_CLOCK ldh [rSB], a xor a ldh [hSerialReceive], a @@ -2060,7 +2060,7 @@ WaitForLinkedFriend: jr z, .connected ld a, CONNECTION_NOT_ESTABLISHED ldh [hSerialConnectionStatus], a - ld a, $2 + ld a, USING_INTERNAL_CLOCK ldh [rSB], a xor a ldh [hSerialReceive], a @@ -2078,7 +2078,7 @@ WaitForLinkedFriend: jr z, .done .not_done - ld a, $1 + ld a, USING_EXTERNAL_CLOCK ldh [rSB], a ld a, (0 << rSC_ON) | (1 << rSC_CLOCK) ldh [rSC], a @@ -2291,7 +2291,7 @@ Link_ResetSerialRegistersAfterLinkClosure: call DelayFrames ld a, CONNECTION_NOT_ESTABLISHED ldh [hSerialConnectionStatus], a - ld a, $2 + ld a, USING_INTERNAL_CLOCK ldh [rSB], a xor a ldh [hSerialReceive], a |