diff options
author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /constants/menu_constants.asm | |
parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) |
Merge branch 'master' into the-diffening
Diffstat (limited to 'constants/menu_constants.asm')
-rw-r--r-- | constants/menu_constants.asm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 46c65474d..7c5f23377 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -32,7 +32,6 @@ shift_const SCROLLINGMENU_ENABLE_START shift_const SCROLLINGMENU_ENABLE_SELECT - ; MonMenuOptions indexes (see data/mon_menu.asm) ; used by PokemonActionSubmenu (see engine/menus/start_menu.asm) const_def 1 @@ -70,7 +69,6 @@ NUM_MONMENU_ITEMS EQU 8 HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 - ; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) const_def const PARTYMENUACTION_CHOOSE_POKEMON |