Naming screen constants

2018-09-16 16:02:58 -04:00
parent 60b09f291d
commit 38bf21ae35
10 changed files with 23 additions and 10 deletions
--- a/engine/menus/naming_screen.asm
+++ b/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