diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 16:08:43 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 16:08:43 -0500 |
| commit | ead103d2c6d21cd4774e5c32b9c66f9435f7adbb (patch) | |
| tree | 2eb0fb2875fe9597167e83f88d5f8db287983292 /constants | |
| parent | 8f2878c37e6755a4ac41ea65568bbfabd77bbe83 (diff) | |
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/menu_constants.asm | 6 | ||||
| -rw-r--r-- | constants/script_constants.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index e8f85a8db..390d3921c 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -1,4 +1,4 @@ -; MenuDataHeader flags +; MenuHeader flags const_def shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set. shift_const MENU_UNUSED_1 @@ -9,7 +9,7 @@ shift_const MENU_BACKUP_TILES shift_const MENU_BACKUP_TILES_2 -; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuDataHeader2 flags +; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags ; Per flag the comment specifies which menus actually implement it const_def shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu @@ -21,7 +21,7 @@ shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu -; ScrollingMenu MenuDataHeader2 flags +; ScrollingMenu MenuData flags const_def shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 952837065..cfab61c87 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -267,7 +267,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 NUM_UNOWN_PUZZLES EQU const_value ; Special_DisplayUnownWords writebyte arguments -; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm) +; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_LIGHT ; 1 |