diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index f95a08bc4..6d3ccedef 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -4629,7 +4629,9 @@ UpdateHPPal:
 	jp FinishBattleAnim
 
 Battle_DummyFunction:
-; called before placing either battler's nickname in the HUD
+; Called before placing either battler's nickname in the HUD.
+; This was CenterMonName in Gen 1.
+; In Gen 2, pokemon nicknames are always left-aligned on the HUD.
 	ret
 
 BattleMenu:
@@ -7806,7 +7808,7 @@ StartBattle:
 	lb bc, 4, 10
 	call ClearBox
 	call ClearSprites
-	ld a, [wEnemyMonEnd]
+	ld a, [wBattleMode]
 	cp WILD_BATTLE
 	call z, UpdateEnemyHUD
 	ld a, $1
@@ -8135,7 +8137,7 @@ ReadAndPrintLinkBattleRecord:
 	pop hl
 	call PlaceString
 	pop hl
-	ld de, 26
+	ld de, SCREEN_WIDTH + 6
 	add hl, de
 	push hl
 	ld de, wLinkBattleRecordWins
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index a83385d22..daea1f495 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -166,7 +166,7 @@ SetDefaultBoxNames:
 	ld [hli], a
 	ld [hl], '@'
 	pop hl
-	ld de, 9
+	ld de, BOX_NAME_LENGTH
 	add hl, de
 	inc c
 	ld a, c
@@ -474,11 +474,7 @@ Continue_DisplayPokedexNumCaught:
 	ret z
 	push hl
 	ld hl, wPokedexCaught
-if NUM_POKEMON % 8
-	ld b, NUM_POKEMON / 8 + 1
-else
-	ld b, NUM_POKEMON / 8
-endc
+	ld b, (NUM_POKEMON + 7) / 8
 	call CountSetBits
 	pop hl
 	ld de, wNumSetBits