Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 35 insertions, 29 deletions

diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm
index 170d5d64..e0f39eda 100644
--- a/engine/menus/link_menu.asm
+++ b/engine/menus/link_menu.asm
@@ -22,9 +22,9 @@ Func_f531b::
 	call TextBoxBorder
 	call UpdateSprites
 	xor a
-	ld [wUnusedCD37], a
-	ld [wd72d], a
-	ld [wd11e], a
+	ld [wUnusedLinkMenuByte], a
+	ld [wCableClubDestinationMap], a
+	ld [wNamedObjectIndex], a
 	ld hl, wTopMenuItemY
 	ld a, $2
 	ld [hli], a
@@ -90,7 +90,7 @@ Func_f531b::
 	jr z, .asm_f53df
 .asm_f53d1
 	ld a, $1
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	ld a, b
 	ld [wLinkMenuSelectionSendBuffer], a
 	and $3
@@ -310,21 +310,21 @@ PetitCup::
 	jp z, DuplicateSpecies
 	dec hl
 	ld a, [hl]
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	push hl
 	callfar Func_3b10f
 	pop hl
 	jp c, asm_f56ad
 	inc hl
 	ld a, [hl]
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	push hl
 	callfar Func_3b10f
 	pop hl
 	jp c, asm_f56ad
 	inc hl
 	ld a, [hl]
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	push hl
 	callfar Func_3b10f
 	pop hl
@@ -343,19 +343,19 @@ PetitCup::
 	ld hl, PokedexEntryPointers
 	add hl, bc
 	add hl, bc
-	ld de, wcd6d
+	ld de, wNameBuffer
 	ld bc, $2
 	ld a, BANK(PokedexEntryPointers)
 	call FarCopyData
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wcd6d
+	ld de, wNameBuffer
 	ld bc, $14
 	ld a, BANK(PokedexEntryPointers)
 	call FarCopyData
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 .loop2
 	ld a, [hli]
 	cp "@"
@@ -483,7 +483,7 @@ asm_f5689::
 	pop af
 	pop bc
 	pop hl
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld hl, ColosseumHeightText
 	call PrintText
@@ -494,7 +494,7 @@ asm_f569b::
 	pop af
 	pop bc
 	pop hl
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld hl, ColosseumWeightText
 	call PrintText
@@ -503,7 +503,7 @@ asm_f569b::
 
 asm_f56ad::
 	ld a, [hl]
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld hl, ColosseumEvolvedText
 	call PrintText
@@ -635,8 +635,8 @@ ColosseumIneligibleText::
 LinkMenu:
 	xor a
 	ld [wLetterPrintingDelayFlags], a
-	ld hl, wd72e
-	set 6, [hl]
+	ld hl, wStatusFlags4
+	set BIT_LINK_CONNECTED, [hl]
 	ld hl, TextTerminator_f5a16
 	call PrintText
 	call SaveScreenTilesToBuffer1
@@ -650,20 +650,26 @@ LinkMenu:
 	ld de, TradeCenterText
 	call PlaceString
 	xor a
-	ld [wUnusedCD37], a
-	ld [wd72d], a
-	ld [wd11e], a
+	ld [wUnusedLinkMenuByte], a
+	ld [wCableClubDestinationMap], a
+	ld [wNamedObjectIndex], a
 	ld hl, wTopMenuItemY
-	ld a, $5
+	ld a, 5
 	ld [hli], a
-	ld a, $6
+	assert wTopMenuItemY + 1 == wTopMenuItemX
+	ld a, 6
 	ld [hli], a
+	assert wTopMenuItemX + 1 == wCurrentMenuItem
 	xor a
 	ld [hli], a
 	inc hl
-	ld a, $3
+	assert wCurrentMenuItem + 2 == wMaxMenuItem
+	ld a, 3
 	ld [hli], a
+	assert wMaxMenuItem + 1 == wMenuWatchedKeys
+	assert 2 == B_BUTTON
 	ld [hli], a
+	assert wMenuWatchedKeys + 1 == wLastMenuItem
 	xor a
 	ld [hl], a
 .waitForInputLoop
@@ -716,7 +722,7 @@ LinkMenu:
 	jr z, .doneChoosingMenuSelection
 .useEnemyMenuSelection
 	ld a, $1
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	ld a, b
 	ld [wLinkMenuSelectionSendBuffer], a
 	and $3
@@ -769,12 +775,12 @@ LinkMenu:
 	jr nz, .next
 	ld a, TRADE_CENTER
 .next
-	ld [wd72d], a
+	ld [wCableClubDestinationMap], a
 	ld hl, ColosseumPleaseWaitText
 	call PrintText
 	ld c, 50
 	call DelayFrames
-	ld hl, wd732
+	ld hl, wStatusFlags6
 	res BIT_DEBUG_MODE, [hl]
 	ld a, [wDefaultMap]
 	ld [wDestinationMap], a
@@ -796,13 +802,13 @@ LinkMenu:
 	ld hl, ColosseumCanceledText
 	vc_hook Wireless_net_stop
 	call PrintText
-	ld hl, wd72e
-	res 6, [hl]
+	ld hl, wStatusFlags4
+	res BIT_LINK_CONNECTED, [hl]
 	vc_hook Wireless_net_end
 	ret
 
 .asm_f5963
-	ld a, [wd11e]
+	ld a, [wNamedObjectIndex]
 	and a
 	jr nz, .asm_f5974
 	ld b, " "
@@ -847,7 +853,7 @@ LinkMenu:
 	xor a
 	ld [wUnknownSerialCounter], a
 	ld [wUnknownSerialCounter+1], a
-	ld a, [wd11e]
+	ld a, [wNamedObjectIndex]
 	and a
 	jr z, .asm_f59cd
 	ld b, " "