From 682b7874b2b6b0b0646547d631d50b91caa140c3 Mon Sep 17 00:00:00 2001 From: Hedara Date: Sun, 2 Mar 2025 22:11:23 +0100 Subject: [PATCH] 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)))