Naming screen constants

engine/events/name_rater.asm

@@ -32,7 +32,7 @@ _NameRater:
 	ld [wNamedObjectIndexBuffer], a
 	ld [wCurSpecies], a
 	call GetBaseData
-	ld b, 0
+	ld b, NAME_MON
 	ld de, wStringBuffer2
 	farcall _NamingScreen
 ; If the new name is empty, treat it as unchanged.

engine/events/specials.asm

@@ -84,7 +84,7 @@ FoundNone:
 	ret
 
 NameRival:
-	ld b, $2 ; rival
+	ld b, NAME_RIVAL
 	ld de, wRivalName
 	farcall _NamingScreen
 	; default to "SILVER"

engine/items/item_effects.asm

@@ -584,7 +584,7 @@ PokeBallEffect:
 	push de
 	xor a ; PARTYMON
 	ld [wMonType], a
-	ld b, 0
+	ld b, NAME_MON
 	farcall NamingScreen
 
 	call RotateThreePalettesRight
@@ -637,7 +637,7 @@ PokeBallEffect:
 	ld a, BOXMON
 	ld [wMonType], a
 	ld de, wMonOrItemNameBuffer
-	ld b, $0
+	ld b, NAME_MON
 	farcall NamingScreen
 
 	ld a, BANK(sBoxMonNicknames)

engine/menus/intro_menu.asm

@@ -747,7 +747,7 @@ NamePlayer:
 	ret
 
 .NewName:
-	ld b, 1
+	ld b, NAME_PLAYER
 	ld de, wPlayerName
 	farcall NamingScreen
 

engine/menus/naming_screen.asm

@@ -61,7 +61,7 @@ NamingScreen:
 
 .GetNamingScreenSetup:
 	ld a, [wNamingScreenType]
-	and 7
+	maskbits NUM_NAME_TYPES
 	ld e, a
 	ld d, 0
 	ld hl, .Jumptable
@@ -73,6 +73,7 @@ NamingScreen:
 	jp hl
 
 .Jumptable:
+; entries correspond to NAME_* constants
 	dw .Pokemon
 	dw .Player
 	dw .Rival

engine/pokemon/bills_pc.asm

@@ -2454,7 +2454,7 @@ BillsPC_ChangeBoxSubmenu:
 	ret
 
 .Name:
-	ld b, $4 ; box
+	ld b, NAME_BOX
 	ld de, wd002
 	farcall NamingScreen
 	call ClearTileMap

engine/pokemon/breeding.asm

@@ -330,7 +330,7 @@ HatchEggs:
 	xor a
 	ld [wMonType], a
 	push de
-	ld b, $0
+	ld b, NAME_MON
 	farcall NamingScreen
 	pop hl
 	ld de, wStringBuffer1

engine/pokemon/move_mon.asm

@@ -1809,7 +1809,7 @@ InitNickname:
 	call DisableSpriteUpdates
 	pop de
 	push de
-	ld b, $0
+	ld b, NAME_MON
 	farcall NamingScreen
 	pop hl
 	ld de, wStringBuffer1