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 /data/mon_menu.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/mon_menu.asm')
| -rw-r--r-- | data/mon_menu.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/data/mon_menu.asm b/data/mon_menu.asm index ec9a59a94..b6130a199 100644 --- a/data/mon_menu.asm +++ b/data/mon_menu.asm @@ -8,7 +8,7 @@ const MONMENUVALUE_MAIL ; 6 const MONMENUVALUE_ERROR ; 7 -MonMenuOptionStrings: ; 24caf +MonMenuOptionStrings: ; entries correspond to MONMENUVALUE_* constants db "STATS@" db "SWITCH@" @@ -17,9 +17,8 @@ MonMenuOptionStrings: ; 24caf db "MOVE@" db "MAIL@" db "ERROR!@" -; 24cd9 -MonMenuOptions: ; 24cd9 +MonMenuOptions: ; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm) ; moves db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT @@ -45,4 +44,3 @@ MonMenuOptions: ; 24cd9 db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR db -1 -; 24d19 |