From 3da228e99835242cf86734cf253fe7f9a704a913 Mon Sep 17 00:00:00 2001 From: Hedara Date: Sun, 2 Mar 2025 22:00:51 +0100 Subject: [PATCH 1/4] Fixed Ivy Cudgel types with type changes --- src/battle_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index b24b2dcb02..b7e81247af 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5969,12 +5969,14 @@ u32 GetDynamicMoveType(struct Pokemon *mon, u32 move, u32 battler, u8 *ateBoost) switch (species) { case SPECIES_OGERPON_WELLSPRING: - case SPECIES_OGERPON_HEARTHFLAME: - case SPECIES_OGERPON_CORNERSTONE: case SPECIES_OGERPON_WELLSPRING_TERA: + return TYPE_WATER; + case SPECIES_OGERPON_HEARTHFLAME: case SPECIES_OGERPON_HEARTHFLAME_TERA: + return TYPE_FIRE; + case SPECIES_OGERPON_CORNERSTONE: case SPECIES_OGERPON_CORNERSTONE_TERA: - return type2; + return TYPE_ROCK; } break; case EFFECT_NATURAL_GIFT: From 682b7874b2b6b0b0646547d631d50b91caa140c3 Mon Sep 17 00:00:00 2001 From: Hedara Date: Sun, 2 Mar 2025 22:11:23 +0100 Subject: [PATCH 2/4] Missed an Ivy Cudgel --- src/battle_controller_player.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 5bac769eb6..9ed1c4477c 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1718,10 +1718,12 @@ static void MoveSelectionDisplayMoveType(u32 battler) else if (effect == EFFECT_IVY_CUDGEL) { - if (speciesId == SPECIES_OGERPON_WELLSPRING || speciesId == SPECIES_OGERPON_WELLSPRING_TERA - || speciesId == SPECIES_OGERPON_HEARTHFLAME || speciesId == SPECIES_OGERPON_HEARTHFLAME_TERA - || speciesId == SPECIES_OGERPON_CORNERSTONE || speciesId == SPECIES_OGERPON_CORNERSTONE_TERA) - type = gBattleMons[battler].types[1]; + if (speciesId == SPECIES_OGERPON_WELLSPRING || speciesId == SPECIES_OGERPON_WELLSPRING_TERA) + type = TYPE_WATER; + else if (speciesId == SPECIES_OGERPON_HEARTHFLAME || speciesId == SPECIES_OGERPON_HEARTHFLAME_TERA) + type = TYPE_FIRE; + else if (speciesId == SPECIES_OGERPON_CORNERSTONE || speciesId == SPECIES_OGERPON_CORNERSTONE_TERA) + type = TYPE_ROCK; } else if (GetMoveCategory(move) == DAMAGE_CATEGORY_STATUS && (GetActiveGimmick(battler) == GIMMICK_DYNAMAX || IsGimmickSelected(battler, GIMMICK_DYNAMAX))) From 7665324be076cdb7f85158ff0453f89eb8c9f6ed Mon Sep 17 00:00:00 2001 From: Hedara Date: Mon, 3 Mar 2025 10:00:53 +0100 Subject: [PATCH 3/4] Removed hard-coded types --- src/battle_controller_player.c | 10 ++++------ src/battle_main.c | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 9ed1c4477c..b84b87d0ed 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1718,12 +1718,10 @@ static void MoveSelectionDisplayMoveType(u32 battler) else if (effect == EFFECT_IVY_CUDGEL) { - if (speciesId == SPECIES_OGERPON_WELLSPRING || speciesId == SPECIES_OGERPON_WELLSPRING_TERA) - type = TYPE_WATER; - else if (speciesId == SPECIES_OGERPON_HEARTHFLAME || speciesId == SPECIES_OGERPON_HEARTHFLAME_TERA) - type = TYPE_FIRE; - else if (speciesId == SPECIES_OGERPON_CORNERSTONE || speciesId == SPECIES_OGERPON_CORNERSTONE_TERA) - type = TYPE_ROCK; + if (speciesId == SPECIES_OGERPON_WELLSPRING || speciesId == SPECIES_OGERPON_WELLSPRING_TERA + || speciesId == SPECIES_OGERPON_HEARTHFLAME || speciesId == SPECIES_OGERPON_HEARTHFLAME_TERA + || speciesId == SPECIES_OGERPON_CORNERSTONE || speciesId == SPECIES_OGERPON_CORNERSTONE_TERA) + type = gSpeciesInfo[speciesId].types[1]; } else if (GetMoveCategory(move) == DAMAGE_CATEGORY_STATUS && (GetActiveGimmick(battler) == GIMMICK_DYNAMAX || IsGimmickSelected(battler, GIMMICK_DYNAMAX))) diff --git a/src/battle_main.c b/src/battle_main.c index b7e81247af..c50a76a4e0 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5970,13 +5970,11 @@ u32 GetDynamicMoveType(struct Pokemon *mon, u32 move, u32 battler, u8 *ateBoost) { case SPECIES_OGERPON_WELLSPRING: case SPECIES_OGERPON_WELLSPRING_TERA: - return TYPE_WATER; case SPECIES_OGERPON_HEARTHFLAME: case SPECIES_OGERPON_HEARTHFLAME_TERA: - return TYPE_FIRE; case SPECIES_OGERPON_CORNERSTONE: case SPECIES_OGERPON_CORNERSTONE_TERA: - return TYPE_ROCK; + return gSpeciesInfo[species].types[1]; } break; case EFFECT_NATURAL_GIFT: From 6b9cc083729172d013f061ac5a97bfd66f5e67af Mon Sep 17 00:00:00 2001 From: Hedara Date: Mon, 3 Mar 2025 16:20:18 +0100 Subject: [PATCH 4/4] Add Raging Bull fix --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_main.c b/src/battle_main.c index c50a76a4e0..c2779e2b9a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5962,7 +5962,7 @@ u32 GetDynamicMoveType(struct Pokemon *mon, u32 move, u32 battler, u8 *ateBoost) case SPECIES_TAUROS_PALDEA_COMBAT: case SPECIES_TAUROS_PALDEA_BLAZE: case SPECIES_TAUROS_PALDEA_AQUA: - return type2; + return gSpeciesInfo[species].types[1]; } break; case EFFECT_IVY_CUDGEL: