diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:07:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:07:35 -0400 |
| commit | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (patch) | |
| tree | 48a735f5fc6b6dca208d8f8cdbdacfa6f54a5f88 /include | |
| parent | 5dfbdca6c7df39c8064a82aa1316d6380ccb0d85 (diff) | |
| parent | eb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/pokemon.h | 1 | ||||
| -rw-r--r-- | include/menu.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 286726838..f026fa0e3 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -230,6 +230,7 @@ #define STATUS_PRIMARY_POKERUS 6 #define STATUS_PRIMARY_FAINTED 7 +#define MAX_PER_STAT_EVS 255 #define MAX_TOTAL_EVS 510 #define EV_ITEM_RAISE_LIMIT 100 diff --git a/include/menu.h b/include/menu.h index a57b3718f..1bd800742 100644 --- a/include/menu.h +++ b/include/menu.h @@ -8,6 +8,12 @@ #define MENU_NOTHING_CHOSEN -2 #define MENU_B_PRESSED -1 +#define MENU_CURSOR_DELTA_NONE 0 +#define MENU_CURSOR_DELTA_UP -1 +#define MENU_CURSOR_DELTA_DOWN 1 +#define MENU_CURSOR_DELTA_LEFT -1 +#define MENU_CURSOR_DELTA_RIGHT 1 + enum { SAVE_MENU_NAME, @@ -77,7 +83,7 @@ void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8); void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *strs, const u8 *a8); u8 sub_8199944(u8 windowId, u8 optionWidth, u8 columns, u8 rows, u8 initialCursorPos); -u8 sub_8199134(s8, s8); +u8 ChangeListMenuCursorPosition(s8 deltaX, s8 deltaY); u8 GetStartMenuWindowId(void); void ListMenuLoadStdPalAt(u8, u8); u8 Menu_MoveCursor(s8 cursorDelta); |