summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/menu_constants.asm12
-rw-r--r--constants/scgb_constants.asm8
2 files changed, 16 insertions, 4 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..4c2faa438 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
@@ -115,8 +115,8 @@ SCGB_RAM EQU -1
const PREDEFPAL_GS_TITLE_SCREEN_2
const PREDEFPAL_GS_TITLE_SCREEN_3
const PREDEFPAL_UNOWN_PUZZLE
- const PREDEFPAL_4D
- const PREDEFPAL_GAMEFREAK_LOGO
+ const PREDEFPAL_GAMEFREAK_LOGO_OB
+ const PREDEFPAL_GAMEFREAK_LOGO_BG
; SGB system command codes
; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table