diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-09-22 12:44:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 12:44:57 -0400 |
| commit | 3d6c7a464be046d6c104c62bae35e4810a1b93ae (patch) | |
| tree | 8297d60536ec4c38c3e431697af09427a2efb7ef /engine/menus | |
| parent | 15648960606da9b1e64c2171c5398d6a5f734b4f (diff) | |
| parent | 38bf21ae35504355b5c67f911c2e003c61c015b4 (diff) | |
Merge pull request #565 from Rangi42/master
Identify some Spaceworld beta content
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index df0cc4edc..8cc9cb5ad 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -747,7 +747,7 @@ NamePlayer: ret .NewName: - ld b, 1 + ld b, NAME_PLAYER ld de, wPlayerName farcall NamingScreen diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index addaed5a3..87e28263f 100644 --- 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 |