Finish bank01

5 files changed, 45 insertions, 39 deletions

diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 358aabf..3fac136 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -5694,7 +5694,6 @@ PrintPlayAreaCardAttachedEnergies: ; 63e6 (1:63e6)
 	ld b, NUM_TYPES
 	call SafeCopyDataHLtoDE
 	ret
-; 0x6423
 
 Func_6423: ; 6423 (1:6423)
 	ld hl, wDefaultText
@@ -5706,7 +5705,6 @@ Func_6423: ; 6423 (1:6423)
 	dec e
 	jr nz, .asm_6428
 	ret
-; 0x6431
 
 Func_6431: ; 6431 (1:6431)
 	xor a
@@ -5771,7 +5769,6 @@ Func_6435:
 	call LoadCardDataToBuffer1_FromCardID
 	call OpenCardPage_FromCheckPlayArea
 	jp Func_6435
-; 0x64b0
 
 Func_64b0: ; 64b0 (1:64b0)
 	call ZeroObjectPositionsAndToggleOAMCopy
@@ -5811,7 +5808,6 @@ Func_64b0: ; 64b0 (1:64b0)
 	ld [wNumPlayAreaItems], a
 	call EnableLCD
 	ret
-; 0x64fc
 
 Func_64fc: ; 64fc (1:64fc)
 	ld a, [wLoadedCard1Atk1Category]
@@ -5824,7 +5820,6 @@ Func_64fc: ; 64fc (1:64fc)
 	ld hl, wLoadedCard1Atk1Name
 	call InitTextPrinting_ProcessTextFromPointerToID
 	ret
-; 0x6510
 
 ; display the screen that prompts the player to use the selected card's
 ; Pokemon Power. Includes the card's information above, and the Pokemon Power's
@@ -8122,7 +8117,6 @@ _TossCoin: ; 71ad (1:71ad)
 	ret z
 	scf
 	ret
-; 0x72ff
 
 Func_72ff: ; 72ff (1:72ff)
 	ldh [hff96], a
@@ -8133,7 +8127,6 @@ Func_72ff: ; 72ff (1:72ff)
 	call SerialSendByte
 	call Func_7344
 	ret
-; 0x7310
 
 Func_7310: ; 7310 (1:7310)
 	ldh [hff96], a
@@ -8168,7 +8161,6 @@ Func_7338: ; 7338 (1:7338)
 	jr c, Func_7338
 	call Func_7344
 	ret
-; 0x7344
 
 Func_7344: ; 7344 (1:7344)
     push af
@@ -8181,7 +8173,6 @@ Func_7344: ; 7344 (1:7344)
     call Func_3b31
     call DuelTransmissionError
     ret
-; 0x7354
 
 BuildVersion: ; 7354 (1:7354)
 	db "VER 12/20 09:36", TX_END
@@ -8267,7 +8258,6 @@ Func_7364: ; 7364 (1:7364)
 	call GetNPCDuelConfigurations
 	or a
 	ret
-; 0x73d8
 
 ; draws the current opponent to be selected
 ; (his/her portrait and name)
@@ -8295,14 +8285,12 @@ DrawOpponentSelectionScreen: ; 73d8 (1:73d8)
 	lb bc, 15, 10
 	call WriteTwoByteNumberInTxSymbolFormat
 	ret
-; 0x7408
 
 SelectComputerOpponentData: ; 7408 (1:7408)
-	textitem 10,  0, Text0089
+	textitem 10,  0, ClearOpponentNameText
 	textitem 10, 10, NumberOfPrizesText
 	textitem  3, 14, SelectComputerOpponentText
 	db $ff
-; 0x7415
 
 Func_7415: ; 7415 (1:7415)
 	xor a
@@ -8441,7 +8429,6 @@ PlayAttackAnimation: ; 7494 (1:7494)
 	pop af
 	ldh [hWhoseTurn], a
 	ret
-; 0x74dc
 
 Func_74dc: ; 74dc (1:74dc)
 	call EmptyScreen
@@ -8480,7 +8467,7 @@ Func_74dc: ; 74dc (1:74dc)
 	ld a, [wce9a]
 	ld e, a
 	ld d, $0
-.asm_751b
+.card_loop
 	call LoadCardDataToBuffer1_FromCardID
 	ret c ; card not found
 	push de
@@ -8488,30 +8475,54 @@ Func_74dc: ; 74dc (1:74dc)
 	call Func_758a
 	pop de
 	inc de
-	jr .asm_751b
-; 0x7528
+	jr .card_loop
 
-	INCROM $7528, $755d
+LinkDuel_WaitForStartButton: ; 7528 (1:7528)
+	call Func_0e8e
+	ldtx hl, PressStartWhenReadyText
+	call DrawWideTextBox_PrintText
+	call EnableLCD
+.input_loop
+	call DoFrame
+	ldh a, [hKeysPressed]
+	bit B_BUTTON_F, a
+	jr nz, .link_cancel
+	and START
+	call Func_0cc5
+	jr nc, .input_loop
+	ld hl, wPlayerDuelVariables
+	ld a, [wSerialOp]
+	cp $29
+	jr z, .link_continue
+	ld hl, wOpponentDuelVariables
+	cp $12
+	jr z, .link_continue
+.link_cancel
+	call ResetSerial
+	scf
+	ret
+.link_continue
+	or a
+	ret
+
+Func_755c: ; 755c (1:755c)
+	ret
 
 Func_755d: ; 755d (1:755d)
 	farcall Func_19bfb
 	ret
-; 0x7562
 
 Func_7562: ; 7562 (1:7562)
 	farcall Func_19bc5
 	ret
-; 0x7567
 
 Func_7567: ; 7567 (1:7567)
 	farcall Func_19b8c
 	ret
-; 0x756c
 
 Func_756c: ; 756c (1:756c)
 	farcall Func_19b41
 	ret
-; 0x7571
 
 ; handles all the Card Pop! functionality
 DoCardPop: ; 7571 (1:7571)
@@ -8521,27 +8532,22 @@ DoCardPop: ; 7571 (1:7571)
 Func_7576: ; 7576 (1:7576)
 	farcall Func_1991f
 	ret
-; 0x757b
 
 Func_757b: ; 757b (1:757b)
 	farcall Func_19e42
 	ret
-; 0x7580
 
 Func_7580: ; 7580 (1:7580)
 	farcall Func_1a162
 	ret
-; 0x7585
 
 Func_7585: ; 7585 (1:7585)
 	farcall Func_1a270
 	ret
-; 0x758a
 
 Func_758a: ; 758a (1:758a)
 	farcall Func_19eb4
 	ret
-; 0x758f
 
 Func_758f: ; 758f (1:758f)
 	farcall Func_1a4cf
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index d0c928c..223a2af 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -3331,29 +3331,29 @@ Func_1a61f: ; 1a61f (6:661f)
 	pop af
 	or a
 	jr nz, .else
-	ld a, $40
+	ld a, MOLTRES2
 	call .legendary_card_text
-	ld a, $5f
+	ld a, ARTICUNO2
 	call .legendary_card_text
-	ld a, $76
+	ld a, ZAPDOS3
 	call .legendary_card_text
-	ld a, $c1
+	ld a, DRAGONITE1
 .legendary_card_text
 	ldtx hl, ReceivedLegendaryCardText
 	jr .print_text
 .else
 	ldtx hl, ReceivedCardText
-	cp $1e
+	cp VILEPLUME
 	jr z, .print_text
-	cp $43
+	cp BLASTOISE
 	jr z, .print_text
 	ldtx hl, ReceivedPromotionalFlyingPikachuText
-	cp $64
+	cp FLYING_PIKACHU
 	jr z, .print_text
 	ldtx hl, ReceivedPromotionalSurfingPikachuText
-	cp $65
+	cp SURFING_PIKACHU1
 	jr z, .print_text
-	cp $66
+	cp SURFING_PIKACHU2
 	jr z, .print_text
 	ldtx hl, ReceivedPromotionalCardText
 .print_text
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 6935e0b..76a7f20 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2310,7 +2310,7 @@ SerialTimerHandler: ; 0c91 (0:0c91)
 	ld [hl], $0
 	ret
 
-Func_cc5: ; 0cc5 (0:0cc5)
+Func_0cc5: ; 0cc5 (0:0cc5)
 	ld hl, wSerialRecvCounter
 	or a
 	jr nz, .asm_cdc
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 2b683d8..31abd28 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -612,7 +612,7 @@ DuelistIsThinkingText: ; 36f4a (d:6f4a)
 	text "<RAMNAME> is thinking."
 	done
 
-Text0089: ; 36f5a (d:6f5a)
+ClearOpponentNameText: ; 36f5a (d:6f5a)
 	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 7040fc8..ecf1d03 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -138,7 +138,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer SelectCheckText                                    ; 0x0086
 	textpointer Text0087                                           ; 0x0087
 	textpointer DuelistIsThinkingText                              ; 0x0088
-	textpointer Text0089                                           ; 0x0089
+	textpointer ClearOpponentNameText                              ; 0x0089
 	textpointer SelectComputerOpponentText                         ; 0x008a
 	textpointer NumberOfPrizesText                                 ; 0x008b
 	textpointer Text008c                                           ; 0x008c