Merge pull request #55 from earthoul/follow-up-53

Follow-ups to #53

src/constants/charmaps.asm

@@ -1217,7 +1217,7 @@ ENDM
 	txsymbol "CONFUSED"   ; $0b
 	txsymbol "PARALYZED"  ; $0c
 	txsymbol "CURSOR_U"   ; $0d
-	txsymbol "ATK_DESCR"  ; $0e
+	txsymbol "REF_MARK"   ; $0e
 	txsymbol "CURSOR_R"   ; $0f
 	txsymbol "HP"         ; $10
 	txsymbol "Lv"         ; $11

src/constants/game_event_constants.asm

@@ -30,5 +30,3 @@ DEF NUM_GAME_EVENTS EQU const_value ; 6
 	const OWMODE_MUSIC_POSTLOAD        ; $10
 	const OWMODE_AFTER_DUEL_PRELOAD    ; $11
 	const OWMODE_PAUSE_MENU            ; $12
-
-; DEF NUM_OWMODES EQU const_value ; $13

src/engine/bank01.asm

@@ -3607,7 +3607,7 @@ PrintAttackOrPkmnPowerInformation:
 	ld b, 7
 	ld c, e
 	inc c
-	ld a, SYM_ATK_DESCR
+	ld a, SYM_REF_MARK
 	call WriteByteToBGMap0
 .print_damage
 	inc hl

src/engine/bank04.asm

@@ -1221,9 +1221,9 @@ HandlePauseMenu:
 	farcall DrawMenuBox
 	farcall GetNewMailFlag
 	jr z, .done_show_menu
-; has new mail(s), so add an asterisk
+; has new mail(s), so add a ref mark
 	lb bc, 18, 8
-	ld d, SYM_ATK_DESCR
+	ld d, SYM_REF_MARK
 	ld e, $00 ; priority
 	call Func_383b
 .done_show_menu

src/engine/bank0c.asm

@@ -1284,18 +1284,20 @@ Func_31447:
 	farcall ZeroOutVarValue
 	pop af
 	jr nz, .done
+; cup winner, so switch the cup state from start to end/inactive
+; by incrementing if cup 1, 2
+; or by (verbosely) decremmenting if cup 3
+; due to the constants' ordering
 	ld a, VAR_GR_CHALLENGE_CUP_STATE
 	farcall GetVarValue
 	cp CHALLENGE_CUP_3_START
-	jr z, .adjust
+	jr z, .won_cup3
 	inc a
 	ld c, a
 	ld a, VAR_GR_CHALLENGE_CUP_STATE
 	farcall SetVarValue
 	jr .done
-; keep the state var < 7
-; verbose: dec a between inc a :: ld c, a above should suffice
-.adjust
+.won_cup3
 	ld a, VAR_GR_CHALLENGE_CUP_STATE
 	ld c, CHALLENGE_CUP_3_UNLOCKED
 	farcall SetVarValue

src/engine/bank0f.asm

@@ -2326,18 +2326,20 @@ Func_3d210:
 	farcall ZeroOutVarValue
 	pop af
 	jr nz, .done
+; cup winner, so switch the cup state from start to end
+; by incrementing if cup 1, 2
+; or by (verbosely) decremmenting if cup 3
+; due to the constants' ordering
 	ld a, VAR_TCG_CHALLENGE_CUP_STATE
 	farcall GetVarValue
 	cp CHALLENGE_CUP_3_START
-	jr z, .adjust
+	jr z, .won_cup3
 	inc a
 	ld c, a
 	ld a, VAR_TCG_CHALLENGE_CUP_STATE
 	farcall SetVarValue
 	jr .done
-; keep the state var < 7
-; verbose: dec a between inc a :: ld c, a above should suffice
-.adjust
+.won_cup3
 	ld a, VAR_TCG_CHALLENGE_CUP_STATE
 	ld c, CHALLENGE_CUP_3_UNLOCKED
 	farcall SetVarValue

src/text/text_offsets.asm

@@ -1065,9 +1065,11 @@ TextOffsets::
 	textpointer DebugTransmittingMenuText                             ; 0x0423
 	textpointer DebugLectureDuelText                                  ; 0x0424
 	textpointer FirstStrikeDeckText                                   ; 0x0425
-	; names of opponents and their decks, intermixed and sorted by character encoding
-	; cf. 0x09d0--: NPC names for the dialog box header
-	; causing variance, e.g. "トビちゃん" vs "とびちゃん" for Tobi-chan
+
+; names of opponents and their decks, intermixed and sorted by character encoding
+; unlike *NPCName in tcg1, npc names are split into
+; Duelist*Name (here) and Dialog*Text (0x09d0--),
+; which also causes variance, e.g. "トビちゃん" vs "とびちゃん" for Tobi-chan
 	textpointer ThunderboltDeckName                                   ; 0x0426
 	textpointer DuelistGR1Name                                        ; 0x0427
 	textpointer DuelistGR2Name                                        ; 0x0428
@@ -1277,6 +1279,7 @@ TextOffsets::
 	textpointer RockBlastDeckName                                     ; 0x04f4
 	textpointer DuelistAdamName                                       ; 0x04f5
 	textpointer DuelistMainCharacterName                              ; 0x04f6
+
 	textpointer DrMasonText                                           ; 0x04f7
 	textpointer PracticeDuelHeaderPlayersTurnNumberText               ; 0x04f8
 	textpointer PracticeDuelHeaderKnockedOutReplaceText               ; 0x04f9
@@ -2518,6 +2521,9 @@ TextOffsets::
 	textpointer MapGRPsychicStrongholdText                            ; 0x09cd
 	textpointer MapGRColorlessAltarText                               ; 0x09ce
 	textpointer MapGRCastleText                                       ; 0x09cf
+
+; npc names in the dialog box header
+; see also Duelist*Name (0x0426--)
 	textpointer DialogDrMasonText                                     ; 0x09d0
 	textpointer DialogSamText                                         ; 0x09d1
 	textpointer DialogAaronText                                       ; 0x09d2
@@ -2658,6 +2664,7 @@ TextOffsets::
 	textpointer DialogStaffText                                       ; 0x0a59
 	textpointer DialogReceptionistText                                ; 0x0a5a
 	textpointer DialogCupHostText                                     ; 0x0a5b
+
 	textpointer GRFireFortShortText                                   ; 0x0a5c
 	textpointer GRWaterFortShortText                                  ; 0x0a5d
 	textpointer GRLightningFortShortText                              ; 0x0a5e