From 91825237b68c424cfa1d7d52acdf772e42d918bd Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 3 Dec 2023 17:57:44 +0100 Subject: [PATCH 1/3] Start gen defines at Gen I --- include/config.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/config.h b/include/config.h index 49559e78e8a5..8a6e990a5d59 100644 --- a/include/config.h +++ b/include/config.h @@ -64,13 +64,15 @@ #define ITEM_EXPANSION // Generation constants used in configs to define behavior -#define GEN_3 0 -#define GEN_4 1 -#define GEN_5 2 -#define GEN_6 3 -#define GEN_7 4 -#define GEN_8 5 -#define GEN_9 6 +#define GEN_1 0 +#define GEN_2 1 +#define GEN_3 2 +#define GEN_4 3 +#define GEN_5 4 +#define GEN_6 5 +#define GEN_7 6 +#define GEN_8 7 +#define GEN_9 8 #define GEN_LATEST GEN_9 // General settings From ebf7d5dbea77ce27b7154914d4167f72a7a164b7 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 3 Dec 2023 17:59:48 +0100 Subject: [PATCH 2/3] Refactor Shuckle config --- include/config/pokemon.h | 2 +- src/battle_script_commands.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 900c66bb4012..0088128832d4 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -25,7 +25,7 @@ // Species-specific settings #define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. #define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. -#define P_SHUCKLE_BERRY_JUICE TRUE // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Setting this to TRUE will allow to do this with an Oran Berry, which is the spiritual succesor of the Berry item. +#define P_SHUCKLE_BERRY_JUICE GEN_LATEST // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Setting this to TRUE will allow to do this with an Oran Berry, which is the spiritual succesor of the Berry item. // Other settings #define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6d8769f747f7..22addc032fb8 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -14499,7 +14499,7 @@ static void Cmd_pickup(void) SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &heldItem); } } - #if P_SHUCKLE_BERRY_JUICE == TRUE + #if P_SHUCKLE_BERRY_JUICE == GEN_2 else if (species == SPECIES_SHUCKLE && heldItem == ITEM_ORAN_BERRY && (Random() % 16) == 0) From 9db29c6838904dac488db8cf69355159ed91cd73 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 3 Dec 2023 18:19:52 +0100 Subject: [PATCH 3/3] Oops --- include/config/pokemon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 0088128832d4..b7496c8687b2 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -25,7 +25,7 @@ // Species-specific settings #define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. #define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. -#define P_SHUCKLE_BERRY_JUICE GEN_LATEST // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Setting this to TRUE will allow to do this with an Oran Berry, which is the spiritual succesor of the Berry item. +#define P_SHUCKLE_BERRY_JUICE GEN_LATEST // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Enabling this will allow Shuckle to do this with an Oran Berry, which is the spiritual succesor of the Berry item. // Other settings #define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon