Identify some more labels (a few link-related)

7 files changed, 34 insertions, 30 deletions

diff --git a/data/text/battle.asm b/data/text/battle.asm
index 506b0c0a..fe14f938 100644
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -192,7 +192,7 @@ SentAllToMomText:
 	text "Sent all to MOM!"
 	prompt
 
-BattleText_0x101415:
+UnusedRivalLossText: ; unreferenced
 	text "<RIVAL>: Huh? I"
 	line "should've chosen"
 	cont "your #MON!"
@@ -208,7 +208,7 @@ BattleText_UseNextMon:
 	text "Use next #MON?"
 	done
 
-BattleText_0x101459:
+UnusedRivalWinText: ; unreferenced
 	text "<RIVAL>: Yes!"
 	line "I guess I chose a"
 	cont "good #MON!"
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
diff --git a/home/gfx.asm b/home/gfx.asm
index 70e38911..efb0499a 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -1,6 +1,6 @@
 TILES_PER_CYCLE EQU 8
 
-FarCopyBytesDouble_DoubleBankSwitch:: ; unreferenced
+FarDecompressBufferedPic:: ; unreferenced
 	ld b, a
 	ldh a, [hROMBank]
 	push af
@@ -14,7 +14,7 @@ FarCopyBytesDouble_DoubleBankSwitch:: ; unreferenced
 	xor a
 	call ByteFill
 
-	ld hl, wUnusedBufferCF3C
+	ld hl, wFarDecompressPicPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/home/serial.asm b/home/serial.asm
index 155de42e..a317b5c7 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -380,7 +380,8 @@ LinkDataReceived::
 	ldh [rSC], a
 	ret
 
-Function8ca:: ; unreferenced
+SetBitsForTimeCapsuleRequestIfNotLinked:: ; unreferenced
+; Similar to SetBitsForTimeCapsuleRequest (see engine/link/link.asm).
 	ld a, [wLinkMode]
 	and a
 	ret nz
diff --git a/macros/wram.asm b/macros/wram.asm
index 5a1d0ea4..a2aa71df 100644
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -217,8 +217,8 @@ hall_of_fame: MACRO
 ENDM
 
 link_battle_record: MACRO
-\1Name::   ds NAME_LENGTH - 1
 \1ID::     dw
+\1Name::   ds NAME_LENGTH - 1
 \1Wins::   dw
 \1Losses:: dw
 \1Draws::  dw
diff --git a/wram.asm b/wram.asm
index 64233cd0..fcf43ea4 100644
--- a/wram.asm
+++ b/wram.asm
@@ -565,9 +565,12 @@ ENDU
 
 NEXTU
 ; mystery gift data
-wMysteryGiftPartyTemp:: ; ds PARTY_LENGTH * (1 + 1 + NUM_MOVES)
-wMysteryGiftStaging::
-wc700:: ds 80
+UNION
+wMysteryGiftPartyTemp:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH
+
+NEXTU
+wMysteryGiftStaging:: ds 80
+ENDU
 
 wMysteryGiftTrainerData:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2
 wMysteryGiftTrainerDataEnd::
@@ -1502,18 +1505,20 @@ wDebugRoomPagedValuesPtr:: dw
 ENDC
 
 NEXTU
+; link battle record data
+wLinkBattleRecordName::   ds NAME_LENGTH
+wLinkBattleRecordWins::   dw
+wLinkBattleRecordLosses:: dw
+wLinkBattleRecordDraws::  dw
+
+NEXTU
 ; unidentified
 wceed:: db
 wceee:: db
 wceef:: db
 
-	ds 8
+	ds 13
 
-wcef8:: ds 1
-	ds 1
-wcefa:: ds 1
-	ds 1
-wcefc:: ds 1
 wcefd:: ds 1
 
 	ds 43
@@ -1641,7 +1646,7 @@ ENDU
 	ds 1
 
 wBoxAlignment:: db
-wUnusedBufferCF3C:: dw
+wFarDecompressPicPointer:: dw
 wFXAnimID:: dw
 ENDU
 
@@ -2005,7 +2010,6 @@ wInitListType:: db
 wWildMon:: db
 wBattleHasJustStarted:: db
 
-; wd151 has many different short-term uses
 wNamedObjectIndexBuffer::
 wDeciramBuffer::
 wTempByteValue::
@@ -2022,7 +2026,6 @@ wBreedingCompatibility::
 wMoveGrammar::
 wApplyStatLevelMultipliersToEnemy::
 wUsePPUp::
-wd151::
 	db
 
 wFailedToFlee:: db