diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-22 00:53:54 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-22 00:53:54 -0400 |
| commit | ae4fe08084f3c3c5775bc286bcc630f2c20af083 (patch) | |
| tree | 15c27cf935ac7fc4e63d899eff1270b9d4c9bc5f /engine | |
| parent | 3a2932cec1e8cb4ef4fb3dbabf24e341d03c7bbe (diff) | |
Identify some more labels (a few link-related)
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 218fbeb75..85cba5f85 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8470,7 +8470,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 @@ -8485,35 +8485,35 @@ ReadAndPrintLinkBattleRecord: push hl ld h, d ld l, e - ld de, wd002 + 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, wd002 + ld de, wLinkBattleRecordName pop hl call PlaceString pop hl ld de, 26 add hl, de push hl - ld de, wd00d + ld de, wLinkBattleRecordWins lb bc, 2, 4 call PrintNum pop hl ld de, 5 add hl, de push hl - ld de, wd00f + ld de, wLinkBattleRecordLosses lb bc, 2, 4 call PrintNum pop hl ld de, 5 add hl, de - ld de, wd011 + ld de, wLinkBattleRecordDraws lb bc, 2, 4 call PrintNum jr .next diff --git a/engine/link/link.asm b/engine/link/link.asm index e30f78378..855f5ed0d 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2159,7 +2159,7 @@ SetBitsForBattleRequest: ret SetBitsForTimeCapsuleRequest: - ld a, $2 + ld a, USING_INTERNAL_CLOCK ldh [rSB], a xor a ldh [hSerialReceive], a @@ -2176,7 +2176,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 @@ -2201,7 +2201,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 @@ -2219,7 +2219,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 @@ -2464,7 +2464,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 |