A few text labels

6 files changed, 43 insertions, 42 deletions

diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index f6acaf2..3e924be 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -56,7 +56,7 @@ CommentedOut_406e: ; 406e (1:406e)
 ; 0x406f
 
 Func_406f: ; 406f (1:406f)
-	call $420b
+	call Func_420b
 	call $66e9
 	ldtx hl, BackUpIsBrokenText
 	jr c, .asm_4097
@@ -84,7 +84,7 @@ Func_406f: ; 406f (1:406f)
 StartDuel: ; 409f (1:409f)
 	ld a, PLAYER_TURN
 	ldh [hWhoseTurn], a
-	ld a, $0
+	ld a, DUELIST_TYPE_PLAYER
 	ld [wPlayerDuelistType], a
 	ld a, [wcc19]
 	ld [wOpponentDeckId], a
@@ -94,7 +94,7 @@ StartDuel: ; 409f (1:409f)
 	call SwapTurn
 	jr .asm_40ca
 
-	ld a, MUSIC_DUELTHEME1
+	ld a, MUSIC_DUEL_THEME_1
 	ld [wDuelTheme], a
 	ld hl, $cc16
 	xor a
@@ -110,7 +110,7 @@ StartDuel: ; 409f (1:409f)
 	ld [wcbe6], a
 	xor a
 	ld [wCurrentDuelMenuItem], a
-	call $420b
+	call Func_420b
 	ld a, [wcc18]
 	ld [wcc08], a
 	call $70aa
@@ -183,7 +183,7 @@ StartDuel: ; 409f (1:409f)
 	cp DUEL_LOST
 	jr z, .active_duelist_lost_batte
 	ld a, $5f
-	ld c, MUSIC_DARKDIDDLY
+	ld c, MUSIC_DARK_DIDDLY
 	ldtx hl, DuelWasDrawText
 	jr .handle_duel_finished
 
@@ -195,7 +195,7 @@ StartDuel: ; 409f (1:409f)
 	xor a
 	ld [wd0c3], a
 	ld a, $5d
-	ld c, MUSIC_MATCHVICTORY
+	ld c, MUSIC_MATCH_VICTORY
 	ldtx hl, WonDuelText
 	jr .handle_duel_finished
 
@@ -207,7 +207,7 @@ StartDuel: ; 409f (1:409f)
 	ld a, $1
 	ld [wd0c3], a
 	ld a, $5e
-	ld c, MUSIC_MATCHLOSS
+	ld c, MUSIC_MATCH_LOSS
 	ldtx hl, LostDuelText
 
 .handle_duel_finished
@@ -461,7 +461,7 @@ DuelMenu_Retreat: ; 43ab (1:43ab)
 	jr c, Func_441f
 	call $4611
 	jr c, Func_441c
-	ldtx hl, SelectMonOnBenchToSwitchWithActiveText
+	ldtx hl, SelectPkmnOnBenchToSwitchWithActiveText
 	call DrawWideTextBox_WaitForInput
 	call $600c
 	jr c, Func_441c
@@ -485,7 +485,7 @@ Func_43f1: ; 43f1 (1:43f1)
 	call $4611
 	jr c, Func_441c
 	call $6558
-	ldtx hl, SelectMonOnBenchToSwitchWithActiveText
+	ldtx hl, SelectPkmnOnBenchToSwitchWithActiveText
 	call DrawWideTextBox_WaitForInput
 	call $600c
 	ld [wBenchSelectedPokemon], a
@@ -756,7 +756,7 @@ Func_481b: ; $481b (1:481b)
 	ld [hl], a
 	ret
 
-; copies the following to the c510 buffer:
+; copies the following to the wDuelCardOrAttackList buffer:
 ;   if pokemon's second moveslot is empty: <card_no>, 0
 ;   else: <card_no>, 0, <card_no>, 1
 LoadPokemonMovesToDuelCardOrAttackList: ; 4823 (1:4823)
@@ -822,7 +822,7 @@ CheckIfMoveExists: ; 4872 (1:4872)
 	ld hl, wLoadedCard1Move1Category - (wLoadedCard1Move1Name + 1)
 	add hl, de
 	ld a, [hl]
-	and $ff - RESIDUAL
+	and $ff ^ RESIDUAL
 	cp POKEMON_POWER
 	jr z, .return_no_move_found
 	or a
@@ -894,6 +894,7 @@ _CheckIfEnoughEnergies: ; 48ac (1:48ac)
 	ld [wAttachedEnergiesAccum], a
 	ld hl, wAttachedEnergies
 	ld c, (NUM_COLORED_TYPES) / 2
+
 .next_energy_type_pair
 	ld a, [de]
 	swap a
@@ -916,14 +917,14 @@ _CheckIfEnoughEnergies: ; 48ac (1:48ac)
 	cp b
 	jr c, .not_enough_energies
 	or a
-.asm_48fb
+.done
 	pop de
 	ret
 
 .not_usable
 .not_enough_energies
 	scf
-	jr .asm_48fb
+	jr .done
 ; 0x4900
 
 ; given the amount of energies of a specific type required for an attack in the
@@ -1019,7 +1020,7 @@ Func_4b60: ; 4b60 (1:4b60)
 	jr .asm_4bd0
 
 .asm_4bb2
-	ld hl, $006b
+	ldtx hl, NeitherPlayerHasBasicPkmnText
 	call DrawWideTextBox_WaitForInput
 	call $4e06
 	call $7107
@@ -1041,14 +1042,14 @@ Func_4b60: ; 4b60 (1:4b60)
 	call SwapTurn
 	jp c, $4c77
 	call Func_311d
-	ld hl, $0072
+	ldtx hl, PlacingThePrizesText
 	call DrawWideTextBox_WaitForInput
 	call Func_0f58
 	ld a, [wcc08]
 	ld l, a
 	ld h, $0
 	call Func_2ec4
-	ld hl, $0073
+	ldtx hl, PleasePlacePrizesText
 	call DrawWideTextBox_PrintText
 	call EnableLCD
 	call $4c7c
@@ -1062,7 +1063,7 @@ Func_4b60: ; 4b60 (1:4b60)
 	call EmptyScreen
 	ld a, BOXMSG_COIN_TOSS
 	call DrawDuelBoxMessage
-	ld hl, $0075
+	ldtx hl, CoinTossToDetermineWhoFirstText
 	call DrawWideTextBox_WaitForInput
 	ld a, [$ff97]
 	cp $c2
@@ -1071,12 +1072,12 @@ Func_4b60: ; 4b60 (1:4b60)
 	call PrintPlayerName
 	ld hl, $0000
 	call Func_2ebb
-	ld hl, $0053
-	ld de, $0074
+	ldtx hl, YouPlayFirstText
+	ldtx de, IfHeadPlayerPlaysFirstText
 	call TossCoin
 	jr c, .asm_4c4a
 	call SwapTurn
-	ld hl, $0054
+	ldtx hl, YouPlaySecondText
 
 .asm_4c4a
 	call DrawWideTextBox_WaitForInput
@@ -1089,12 +1090,12 @@ Func_4b60: ; 4b60 (1:4b60)
 	call PrintOpponentName
 	ld hl, $0000
 	call Func_2ebb
-	ld hl, $0054
-	ld de, $0074
+	ldtx hl, YouPlaySecondText
+	ldtx de, IfHeadPlayerPlaysFirstText
 	call TossCoin
 	jr c, .asm_4c6f
 	call SwapTurn
-	ld hl, $0053
+	ldtx hl, YouPlayFirstText
 
 .asm_4c6f
 	call DrawWideTextBox_WaitForInput
@@ -1124,7 +1125,7 @@ Func_4cd5: ; 4cd5 (1:4cd5)
 	ret
 
 .asm_4cec
-	ld hl, $0057
+	ldtx hl, TransmitingDataText
 	call DrawWideTextBox_PrintText
 	call Func_0f58
 	ld hl, wPlayerCardLocations
@@ -1148,7 +1149,7 @@ Func_4cd5: ; 4cd5 (1:4cd5)
 	call EmptyScreen
 	ld a, BOXMSG_ARENA_POKEMON
 	call DrawDuelBoxMessage
-	ld hl, $0069
+	ldtx hl, ChooseBasicPkmnToPlaceInArenaText
 	call DrawWideTextBox_WaitForInput
 	ld a, $1
 	call $51e7
@@ -1196,7 +1197,7 @@ Func_4cd5: ; 4cd5 (1:4cd5)
 	jr .asm_4d5f
 
 .asm_4d86
-	ld hl, $00b2
+	ldtx hl, NoSpaceOnTheBenchText
 	call DrawWideTextBox_WaitForInput
 	jr .asm_4d5f
 
@@ -1277,7 +1278,7 @@ AIMakeDecision: ; 67be (1:67be)
 	or a
 	ret nz
 	ld [wVBlankCtr], a
-	ld hl, $0088
+	ldtx hl, DuelistIsThinkingText
 	call DrawWideTextBox_PrintTextNoDelay
 	or a
 	ret
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index 8211d07..a9871fd 100644
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -802,9 +802,9 @@ Func_b19d: ; b19d (2:719d)
 	call $5a6d
 	call $7704
 	call $7545
-	ld hl, $0224
+	ldtx hl, PleaseSelectDeckText
 	call DrawWideTextBox_PrintText
-	ld de, $0224
+	ld de, $0224 ; PleaseSelectDeckText?
 	call $7285
 	call $729f
 	jr c, .asm_b1b3
@@ -911,7 +911,7 @@ Func_ba04: ; ba04 (2:7a04)
 	xor a
 	ld hl, $7b6e
 	call InitializeCursorParameters
-	ld hl, $0224
+	ldtx hl, PleaseSelectDeckText
 	call DrawWideTextBox_PrintText
 	ld a, $5
 	ld [$cea9], a
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index b4f7cf1..d614842 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -978,7 +978,7 @@ Func_c74d: ; c74d (3:474d)
 
 MainMenu_c75a: ; c75a (3:475a)
 	call PauseSong
-	ld a, MUSIC_PAUSEMENU
+	ld a, MUSIC_PAUSE_MENU
 	call PlaySong
 	call Func_c797
 .asm_c765
@@ -1057,7 +1057,7 @@ Func_c7e5: ; c7e5 (3:47e5)
 	ret
 
 PC_c7ea: ; c7ea (3:47ea)
-	ld a, MUSIC_PCMAINMENU
+	ld a, MUSIC_PC_MAIN_MENU
 	call PlaySong
 	call Func_c241
 	call $4915
@@ -2646,7 +2646,7 @@ DeckMachine_d336: ; d336 (3:5336)
 	push bc
 	call Func_c2a3
 	call PauseSong
-	ld a, MUSIC_DECKMACHINE
+	ld a, MUSIC_DECK_MACHINE
 	call PlaySong
 	call EmptyScreen
 	xor a
@@ -3019,7 +3019,7 @@ OWSequence_Sara: ; e177 (3:6177)
 	run_script OWScript_StartBattle
 	db 2
 	db WATERFRONT_POKEMON_DECK - 2 ; 6189
-	db MUSIC_DUELTHEME1
+	db MUSIC_DUEL_THEME_1
 	run_script OWScript_EndScriptCloseText
 
 OWSequence_BeatSara: ; e18c (3:618c)
@@ -3057,7 +3057,7 @@ OWSequence_Amanda: ; e19e (03:619e)
 	run_script OWScript_StartBattle
 	db 03
 	db LONELY_FRIENDS_DECK - 2
-	db MUSIC_DUELTHEME1
+	db MUSIC_DUEL_THEME_1
 	run_script OWScript_EndScriptCloseText
 
 OWSequence_BeatAmanda: ; e1b3 (03:61b3)
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 27c4ac0..c2a95ac 100644
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -137,7 +137,7 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	ld [wce40], a
 	call $4031
 	call PauseSong
-	ld a, MUSIC_BOOSTERPACK
+	ld a, MUSIC_BOOSTER_PACK
 	call PlaySong
 	pop bc
 	ld a, c
@@ -1141,7 +1141,7 @@ Func_12741: ; 12741 (4:6741)
 	ret
 
 CardPop_12768: ; 12768 (4:6768)
-	ld a, MUSIC_CARDPOP
+	ld a, MUSIC_CARD_POP
 	call PlaySong
 	bank1call Func_7571
 	farcall Func_c1a4
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index a049d7c..1423278 100644
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -439,7 +439,7 @@ Func_1d078: ; 1d078 (7:5078)
 	INCROM $1d0fa, $1d11c
 
 Func_1d11c: ; 1d11c (7:511c)
-	ld a, MUSIC_PCMAINMENU
+	ld a, MUSIC_PC_MAIN_MENU
 	call PlaySong
 	call DisableLCD
 	farcallx $4, $4000
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 23842a0..7ccea04 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -3296,7 +3296,7 @@ Func_1485: ; 1485 (0:1485)
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY
 	call GetTurnDuelistVariable
 	cp MAX_POKEMON_IN_PLAY
-	jr nc, .too_many_pokemon_in_play
+	jr nc, .already_max_pkmn_in_play
 	inc [hl]
 	ld e, a
 	pop af
@@ -3341,7 +3341,7 @@ Func_1485: ; 1485 (0:1485)
 	or a
 	ret
 
-.too_many_pokemon_in_play
+.already_max_pkmn_in_play
 	pop af
 	scf
 	ret
@@ -7919,7 +7919,7 @@ Func_3876: ; 3876 (0:3876)
 	ldh a, [hBankROM]
 	push af
 	call PauseSong
-	ld a, MUSIC_CARDPOP
+	ld a, MUSIC_CARD_POP
 	call PlaySong
 	ld a, $3
 	ld [wd0c2], a
@@ -7945,7 +7945,7 @@ Func_38a3: ; 38a3 (0:38a3)
 	ld [wd0c3], a
 	ld a, $2
 	ld [wDuelTheme], a
-	ld a, MUSIC_CARDPOP
+	ld a, MUSIC_CARD_POP
 	call PlaySong
 	bank1call Func_758f
 	scf