diff --git a/include/config/overworld.h b/include/config/overworld.h index fcbcf707d8..ca7a25311c 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -9,15 +9,15 @@ #define OW_TIMES_OF_DAY GEN_LATEST // Different generations have the times of day change at different times. #define OW_DOUBLE_APPROACH_WITH_ONE_MON FALSE // If enabled, you can be spotted by two trainers at the same time even if you only have one eligible Pokémon in your party. +// These generational defines only make a distinction for Berries and the OW_PC_MOVE_ORDER +#define GEN_6_XY GEN_6 +#define GEN_6_ORAS GEN_LATEST + 1 + // PC settings #define OW_PC_PRESS_B GEN_LATEST // In Gen4, pressing B when holding a Pokémon is equivalent to placing it. In Gen3, it gives the "You're holding a Pokémon!" error. #define OW_PC_JAPAN_WALDA_ICONS TRUE // In the US release of Emerald, the Cross, Bolt, and Plusle icons for Walda's wallpapers were left blank from the Japan release. Setting this to TRUE will restore them. #define OW_PC_HEAL GEN_LATEST // In Gen8+, Pokémon are not healed when deposited in the PC. - -// Berry settings -// These generational defines only make a distinction for Berries! -#define GEN_6_XY GEN_6 -#define GEN_6_ORAS GEN_LATEST + 1 +#define OW_PC_MOVE_ORDER GEN_LATEST // Starting in Gen4, the order of options in the PC menu change. #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. #define OW_BERRY_MUTATION_CHANCE 25 // Determines the % chance of a mutation. diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 8f981ed854..013f7e21b4 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -52,9 +52,19 @@ // PC main menu options enum { +#if OW_PC_MOVE_ORDER <= GEN_3 OPTION_WITHDRAW, OPTION_DEPOSIT, OPTION_MOVE_MONS, +#elif OW_PC_MOVE_ORDER >= GEN_4 && OW_PC_MOVE_ORDER <= GEN_6_XY + OPTION_DEPOSIT, + OPTION_WITHDRAW, + OPTION_MOVE_MONS, +#elif OW_PC_MOVE_ORDER >= GEN_7 + OPTION_MOVE_MONS, + OPTION_DEPOSIT, + OPTION_WITHDRAW, +#endif OPTION_MOVE_ITEMS, OPTION_EXIT, OPTIONS_COUNT