From 7665324be076cdb7f85158ff0453f89eb8c9f6ed Mon Sep 17 00:00:00 2001 From: Hedara Date: Mon, 3 Mar 2025 10:00:53 +0100 Subject: [PATCH] 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: