Misc fixes

Labeled some things and fixed a few labels

6 files changed, 19 insertions, 17 deletions

diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 3946ee8..103abfd 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -1345,7 +1345,7 @@ RaticateSuperFangEffectCommands:
 	dbw $09, $6f01
 	db  $00
 
-; Unreferenced?
+TrainerCardAsPokemonEffectCommands:
 	dbw $02, $6f18
 	dbw $03, $6f3c
 	dbw $05, $6f27
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 35a6e9a..6a458f0 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -516,7 +516,7 @@ OpenBattleAttackMenu: ; 46fc (1:46fc)
 	ldh a, [hButtonsPressed]
 	and $08
 	jr nz, .displaySelectedMoveInfo
-	call Func_264b
+	call MenuCursorAcceptInput
 	jr nc, .asm_4736
 	cp $ff
 	jp z, Func_4295
@@ -789,7 +789,8 @@ LoadPlayerDeck: ; 6793 (1:6793)
 
 INCBIN "baserom.gbc",$67b2,$6d84 - $67b2
 
-ConvertItemToPokemon:
+;converts clefairy doll/mysterious fossil at specified wCardBuffer to pokemon card
+ConvertTrainerCardToPokemon:
 	ld c, a
 	ld a, [hl]
 	cp TRAINER_CARD
@@ -799,28 +800,28 @@ ConvertItemToPokemon:
 	ld h, a
 	ld l, c
 	ld a, [hl]
-	and $10
+	and TRAINER_CARD
 	pop hl
 	ret z
 	ld a, e
-	cp $cc
+	cp MYSTERIOUS_FOSSIL
 	jr nz, .checkForClefairyDoll
 	ld a, d
 	cp $00
 	jr z, .startRamDataOverwrite
 	ret
 .checkForClefairyDoll
-	cp $cb
+	cp CLEFAIRY_DOLL
 	ret nz
 	ld a, d
 	cp $00
 	ret nz
 .startRamDataOverwrite
 	push de
-	ld [hl], $06
+	ld [hl], COLORLESS
 	ld bc, wCardBuffer1HP - wCardBuffer1
 	add hl, bc
-	ld de, $6db9
+	ld de, .dataToOverwrite
 	ld c, wCardBuffer1Unknown2 - wCardBuffer1HP
 .loop
 	ld a, [de]
@@ -833,12 +834,12 @@ ConvertItemToPokemon:
 
 .dataToOverwrite
 	db $0a            ; hp
-	ds $07 
+	ds $07
 	dw $0030          ; move1 name
 	dw $0041          ; move1 description
 	ds $03
 	db $04            ; move1 category
-	dw $4e35          ; move1 effect commands
+	dw TrainerCardAsPokemonEffectCommands         ; move1 effect commands
 	ds $18
 	db UNABLE_RETREAT ; retreat cost
 	ds $0d
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index f989ee7..7901f9e 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -88,7 +88,7 @@ Func_8dbc: ; 8dbc (2:4dbc)
 	jr c, Func_8dbc
 	call Func_8dea
 	jr c, Func_8dbc
-	call Func_264b
+	call MenuCursorAcceptInput
 	jr nc, .asm_8dc8
 	ldh a, [hCurrentMenuItem]
 	cp $ff
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index ce85533..f4fb571 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -958,7 +958,7 @@ MainMenu_c75a: ; c75a (3:475a)
 	call Func_c29b
 .asm_c76a
 	call DoFrameIfLCDEnabled
-	call Func_264b
+	call MenuCursorAcceptInput
 	jr nc, .asm_c76a
 	ld a, e
 	ld [$d0b8], a
@@ -1042,7 +1042,7 @@ PC_c7ea: ; c7ea (3:47ea)
 	call Func_c29b
 .asm_c806
 	call DoFrameIfLCDEnabled
-	call Func_264b
+	call MenuCursorAcceptInput
 	jr nc, .asm_c806
 	ld a, e
 	ld [$d0b9], a
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index 8e52cef..3ddd151 100755
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -214,7 +214,7 @@ Func_1d11c: ; 1d11c (7:511c)
 .asm_1d15a
 	call DoFrameIfLCDEnabled
 	call UpdateRNGSources
-	call Func_264b
+	call MenuCursorAcceptInput
 	push af
 	call $51e9
 	pop af
diff --git a/src/engine/home.asm b/src/engine/home.asm
index d29ffaa..180bb18 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2413,7 +2413,7 @@ LoadDeckCardToBuffer1: ; 1376 (0:1376)
 	call LoadCardDataToBuffer1
 	pop af
 	ld hl, wCardBuffer1
-	bank1call ConvertItemToPokemon
+	bank1call ConvertTrainerCardToPokemon
 	ld a, e
 	pop bc
 	pop de
@@ -2429,7 +2429,7 @@ LoadDeckCardToBuffer2: ; 138c (0:138c)
 	call LoadCardDataToBuffer2
 	pop af
 	ld hl, wCardBuffer2
-	bank1call ConvertItemToPokemon
+	bank1call ConvertTrainerCardToPokemon
 	ld a, e
 	pop bc
 	pop de
@@ -4237,7 +4237,8 @@ InitializeCursorParameters: ; 2636 (0:2636)
 	ld [wCursorBlinkCounter], a
 	ret
 
-Func_264b: ; 264b (0:264b)
+; returns with the carry flag set if a or b were pressed
+MenuCursorAcceptInput: ; 264b (0:264b)
 	xor a
 	ld [wcd99], a
 	ldh a, [hButtonsPressed2]