From 333235a2c5f2b7f44dbc72575cf9536def04c2ac Mon Sep 17 00:00:00 2001 From: Ninjdai Date: Fri, 10 Nov 2023 21:21:17 +0100 Subject: [PATCH] Set Exp Share to behave like newer versions --- include/config/item.h | 6 +++--- include/constants/flags.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/config/item.h b/include/config/item.h index 0822d35b1..4f0a8eac4 100644 --- a/include/config/item.h +++ b/include/config/item.h @@ -15,13 +15,13 @@ #define I_TYPE_BOOST_POWER GEN_LATEST // In Gen4+, all regular type boosting held items had their power increased from 10% to 20%. eg. Charcoal // TM config -#define I_REUSABLE_TMS FALSE // In Gen5-8, TMs are reusable. Setting this to TRUE will make all vanilla TMs reusable, though they can also be cherry-picked by setting their importance to 1. +#define I_REUSABLE_TMS TRUE // In Gen5-8, TMs are reusable. Setting this to TRUE will make all vanilla TMs reusable, though they can also be cherry-picked by setting their importance to 1. // Exp. Share config // To use this feature, replace the 0 with the flag ID you're assigning it to. // Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature. -#define I_EXP_SHARE_FLAG 0 // If this flag is set, every Pokémon in the party will gain experience, regardless if they participated in the battle or not. -#define I_EXP_SHARE_ITEM GEN_5 // In Gen6+, the Exp. Share was changed from a held item to a Key item that toggles the effect described above. +#define I_EXP_SHARE_FLAG FLAG_EXP_SHARE_GIVES_TO_ALL // If this flag is set, every Pokémon in the party will gain experience, regardless if they participated in the battle or not. +#define I_EXP_SHARE_ITEM GEN_LATEST // In Gen6+, the Exp. Share was changed from a held item to a Key item that toggles the effect described above. // Repel/Lure config // These two settings are both independent and complementary. diff --git a/include/constants/flags.h b/include/constants/flags.h index 0479e46e9..865712b78 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -652,7 +652,7 @@ #define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6E) #define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x6F) -#define FLAG_UNUSED_0x264 0x264 // Unused Flag +#define FLAG_EXP_SHARE_GIVES_TO_ALL 0x264 #define FLAG_UNUSED_0x265 0x265 // Unused Flag #define FLAG_UNUSED_0x266 0x266 // Unused Flag #define FLAG_UNUSED_0x267 0x267 // Unused Flag @@ -1383,7 +1383,7 @@ #define FLAG_IS_CHAMPION (SYSTEM_FLAGS + 0x1F) // Seems to be related to linking. #define FLAG_NURSE_UNION_ROOM_REMINDER (SYSTEM_FLAGS + 0x20) -#define FLAG_VISITED_BUDPORT_CITY (SYSTEM_FLAGS + 0x21) // Unused Flag +#define FLAG_VISITED_BUDPORT_CITY (SYSTEM_FLAGS + 0x21) #define FLAG_UNUSED_0x882 (SYSTEM_FLAGS + 0x22) // Unused Flag #define FLAG_UNUSED_0x883 (SYSTEM_FLAGS + 0x23) // Unused Flag #define FLAG_UNUSED_0x884 (SYSTEM_FLAGS + 0x24) // Unused Flag