atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added OW_PC_MOVE_ORDER config (#4348)

Browse source 
* Added OW_PC_MOVE_ORDER config

* Implemented feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4348\#pullrequestreview-1981473856
This commit is contained in:
psf 2024-04-07 00:52:58 -07:00 committed by GitHub
parent 8bd5ac2e7a
commit 36cd976a03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/config/overworld.h
View file

@ -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.

10
src/pokemon_storage_system.c
View file

@ -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