diff --git a/src/constants.asm b/src/constants.asm
index d29495e..ef5320c 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -4,9 +4,9 @@ INCLUDE "constants/animation_constants.asm"
 INCLUDE "constants/attack_animation_constants.asm"
 INCLUDE "constants/card_constants.asm"
 INCLUDE "constants/card_data_constants.asm"
+INCLUDE "constants/challenge_cup_constants.asm"
 INCLUDE "constants/coin_constants.asm"
 INCLUDE "constants/credits_constants.asm"
-INCLUDE "constants/cup_constants.asm"
 INCLUDE "constants/deck_ai_constants.asm"
 INCLUDE "constants/deck_constants.asm"
 INCLUDE "constants/duel_constants.asm"
diff --git a/src/constants/cup_constants.asm b/src/constants/challenge_cup_constants.asm
similarity index 100%
rename from src/constants/cup_constants.asm
rename to src/constants/challenge_cup_constants.asm
diff --git a/src/constants/menu_constants.asm b/src/constants/menu_constants.asm
index 0b1f1d0..bd023ac 100644
--- a/src/constants/menu_constants.asm
+++ b/src/constants/menu_constants.asm
@@ -35,7 +35,7 @@
 	const_def
 	const DEBUGMENU_POWER_ON      ; 0
 	const DEBUGMENU_COIN          ; 1
-	const DEBGUMENU_CONFIG        ; 2
+	const DEBUGMENU_CONFIG        ; 2
 	const DEBUGMENU_EFFECT_VIEWER ; 3
 	const DEBUGMENU_CREDITS       ; 4
 	const DEBUGMENU_DUEL          ; 5
diff --git a/src/data/auto_deck_machine.asm b/src/data/auto_deck_machine.asm
index 1ae91f8..ba3b6a7 100644
--- a/src/data/auto_deck_machine.asm
+++ b/src/data/auto_deck_machine.asm
@@ -157,7 +157,8 @@ AutoDeckMachine2Entries:
 		MachineAtrociousWeezingDeckDescriptionText
 ; dark lightning
 	auto_deck MachineTheBenchIsAlsoASurpriseDeckList, \
-		MachineTheBenchIsAlsoASurpriseDeckText, MachineTheBenchIsAlsoASurpriseDeckDescriptionText
+		MachineTheBenchIsAlsoASurpriseDeckText, \
+		MachineTheBenchIsAlsoASurpriseDeckDescriptionText
 	auto_deck MachineEnergyConservationDeckList, \
 		MachineEnergyConservationDeckText, \
 		MachineEnergyConservationDeckDescriptionText
diff --git a/src/data/black_box_promos.asm b/src/data/black_box_promos.asm
index 521c79c..67f716d 100644
--- a/src/data/black_box_promos.asm
+++ b/src/data/black_box_promos.asm
@@ -5,10 +5,7 @@ MACRO blackbox_promo
 ENDM
 
 MACRO blackbox_promo_recipe
-	REPT _NARG
-		dw \1 ; input card id
-		SHIFT
-	ENDR
+	dw \# ; input card ids
 	dw 0 ; end of list
 ENDM
 
@@ -111,7 +108,7 @@ BlackboxPromoCards:
 
 ; phantoms, ishihara tradings, and game center prizes (but a few exceptions)
 ; used as special cases in black box, but actually redundant
-; might be intended for non-recipe promos?
+; could've been intended for non-recipe promos?
 SpecialPromoCards:
 	dw VENUSAUR_LV64
 	dw MARILL
@@ -120,14 +117,14 @@ SpecialPromoCards:
 	dw MACHAMP_LV54
 	dw ALAKAZAM_LV45
 	dw GENGAR_LV40
-	dw MEWTWO_LV30 ; weird, out of the pattern
+	dw MEWTWO_LV30 ; not as special as the others
 	dw MEW_LV15
 	dw MEW_LV8
 	dw SURFING_PIKACHU_LV13
 	dw SURFING_PIKACHU_ALT_LV13
 	dw FLYING_PIKACHU_LV12
 	dw FLYING_PIKACHU_ALT_LV12
-	dw DRAGONITE_LV43 ; weird, out of the pattern
+	dw DRAGONITE_LV43 ; not as special as the others
 	dw TOGEPI
 	dw LUGIA
 	dw HERE_COMES_TEAM_ROCKET
diff --git a/src/data/challenge_cup.asm b/src/data/challenge_cup.asm
index 282a97c..e8e988e 100644
--- a/src/data/challenge_cup.asm
+++ b/src/data/challenge_cup.asm
@@ -1,7 +1,7 @@
 ; exclude Legendaries, GR Mewtwo, Phantoms, Bill's Computer and related ones
 
 TCGChallengeCupPromoPrizes:
-  dw ARCANINE_LV34
+	dw ARCANINE_LV34
 	dw PIKACHU_LV16
 	dw PIKACHU_ALT_LV16
 	dw SURFING_PIKACHU_LV13
diff --git a/src/data/grand_master_cup.asm b/src/data/grand_master_cup.asm
index 8b63833..6d6f98e 100644
--- a/src/data/grand_master_cup.asm
+++ b/src/data/grand_master_cup.asm
@@ -1,4 +1,4 @@
-; deck id, bitmask
+; deck id and bitmask for SetGrandMasterCupOpponents
 GrandMasterCupOpps:
 	db EVEN3_YEARS_ON_A_ROCK_DECK_ID,  %01111111 ; GRANDMASTERCUP_GENE
 	db RAGING_BILLOW_OF_FISTS_DECK_ID, %01111111 ; GRANDMASTERCUP_MITCH
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index 932b59e..b6d166f 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -884,7 +884,7 @@ OpenPrizeCardPageIfFaceUp:
 	or a
 	ret z ; not face-up
 
-	ld a, SFX_CURSOR
+	ld a, MENU_CONFIRM
 	call PlaySFXConfirmOrCancel
 
 	ld a, [wd0c1]
@@ -7516,4 +7516,3 @@ AutoDeckMachineMenuParams:
 	db SYM_CURSOR_R ; cursor tile number
 	db SYM_SPACE ; tile behind cursor
 	dw NULL ; function pointer if non-0
-; 0xbb04, end of bank 2
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index d54c291..3390a8e 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -91,7 +91,7 @@ HandleStartupDebugMenuOption:
 .FunctionMap
 	key_func DEBUGMENU_POWER_ON,      _CoreGameLoop
 	key_func DEBUGMENU_COIN,          SetAllCoinsObtainedAndShowCoinMenu
-	key_func DEBGUMENU_CONFIG,        DebugShowConfigMenu
+	key_func DEBUGMENU_CONFIG,        DebugShowConfigMenu
 	key_func DEBUGMENU_EFFECT_VIEWER, DebugMenuEffectViewer
 	key_func DEBUGMENU_CREDITS,       _PlayCredits
 	key_func DEBUGMENU_DUEL,          StartDebugDuelVsRandomOpponent
diff --git a/src/engine/bank0a.asm b/src/engine/bank0a.asm
index 85ec4e9..d4d05ff 100644
--- a/src/engine/bank0a.asm
+++ b/src/engine/bank0a.asm
@@ -3760,4 +3760,3 @@ Func_2bd92:
 	tx DarkSpecialDeckMachineText
 	tx RareCardDeckMachineText
 	tx MysteriousCardDeckMachineTextPadded
-; 0x2bdeb, end of bank a
diff --git a/src/engine/bank0f.asm b/src/engine/bank0f.asm
index fa819e5..21353fd 100644
--- a/src/engine/bank0f.asm
+++ b/src/engine/bank0f.asm
@@ -7267,7 +7267,7 @@ Func_3f858:
 	ld b, a
 	ld a, [wTextBoxFrameColor]
 	ld c, a
-	cp16bc_lb 0, 3
+	cp16bc_bytes 0, 3
 	jr nz, .asm_3f87b
 	farcall Func_1352a
 	ret
diff --git a/src/engine/card_list_ops.asm b/src/engine/card_list_ops.asm
index 5bc01f2..c58a3e5 100644
--- a/src/engine/card_list_ops.asm
+++ b/src/engine/card_list_ops.asm
@@ -833,7 +833,7 @@ CheckIfListInBCIsSubsetOfListInHL:
 	ret
 
 ; for each card in bc,
-; drop the first occurence of it in hl and shift the rest
+; drop the first occurrence of it in hl and shift the rest
 ; set carry if not found
 RemoveCardsInBCFromHL:
 	push af
diff --git a/src/macros/code.asm b/src/macros/code.asm
index c710377..3f160a1 100644
--- a/src/macros/code.asm
+++ b/src/macros/code.asm
@@ -72,7 +72,7 @@ MACRO? cp16bc_long
 :
 ENDM
 
-MACRO? cp16_lb
+MACRO? cp16_bytes
 	ld a, d
 	cp \1
 	jr c, :+
@@ -82,7 +82,7 @@ MACRO? cp16_lb
 :
 ENDM
 
-MACRO? cp16bc_lb
+MACRO? cp16bc_bytes
 	ld a, b
 	cp \1
 	jr c, :+
@@ -92,6 +92,10 @@ MACRO? cp16bc_lb
 :
 ENDM
 
+MACRO? cpcoord
+	cp16_bytes \1, \2
+ENDM
+
 MACRO? cphl
 	inc hl
 	ld a, [hld]
@@ -102,10 +106,6 @@ MACRO? cphl
 :
 ENDM
 
-MACRO? cpcoord
-	cp16_lb \1, \2
-ENDM
-
 MACRO? add_r16_r8
 	add LOW(\1)
 	ld LOW(\1), \2