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 /constants | |
| parent | 15648960606da9b1e64c2171c5398d6a5f734b4f (diff) | |
| parent | 38bf21ae35504355b5c67f911c2e003c61c015b4 (diff) | |
Merge pull request #565 from Rangi42/master
Identify some Spaceworld beta content
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/menu_constants.asm | 12 | ||||
| -rw-r--r-- | constants/scgb_constants.asm | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index bf6945bf4..4aaf10802 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -93,3 +93,15 @@ HMENURETURN_ASM EQU %11111111 const PARTYMENUTEXT_REVIVE const PARTYMENUTEXT_LEVEL_UP const PARTYMENUTEXT_HEAL_CONFUSION + +; Naming types (see engine/menus/naming_screen.asm) + const_def + const NAME_MON + const NAME_PLAYER + const NAME_RIVAL + const NAME_MOM + const NAME_BOX + const NAME_FRIEND + const NAME_6 ; duplicate of NAME_MON + const NAME_7 ; duplicate of NAME_MON +NUM_NAME_TYPES EQU const_value diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 807b5003c..e60ed9795 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -6,7 +6,7 @@ const SCGB_STATS_SCREEN_HP_PALS const SCGB_POKEDEX const SCGB_SLOT_MACHINE - const SCGB_06 + const SCGB_BETA_TITLE_SCREEN const SCGB_GS_INTRO const SCGB_DIPLOMA const SCGB_MAPPALS @@ -19,7 +19,7 @@ const SCGB_POKEDEX_SEARCH_OPTION const SCGB_BETA_POKER const SCGB_POKEPIC - const SCGB_13 + const SCGB_MAGNET_TRAIN const SCGB_PACKPALS const SCGB_TRAINER_CARD const SCGB_POKEDEX_UNOWN_MODE |