Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added WEATHER_DOWNPOUR to Weather Ball's dynamic type (#6100)

Browse Source
This commit is contained in:
Frank DeBlasio 2025-01-25 04:10:12 -05:00 committed by GitHub
parent 774e61e74a
commit a075166b6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle_controller_player.c
View File

@ -1708,7 +1708,7 @@ static void MoveSelectionDisplayPpNumber(u32 battler)
static void MoveSelectionDisplayMoveType(u32 battler)
{
u8 *txtPtr, *end;
u32 speciesId;
u32 speciesId = gBattleMons[battler].species;
struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[battler][4]);
txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
u32 move = moveInfo->moves[gMoveSelectionCursor[battler]];
@ -1722,7 +1722,6 @@ static void MoveSelectionDisplayMoveType(u32 battler)
}
else if (effect == EFFECT_IVY_CUDGEL)
{
speciesId = gBattleMons[battler].species;
if (speciesId == SPECIES_OGERPON_WELLSPRING || speciesId == SPECIES_OGERPON_WELLSPRING_TERA
|| speciesId == SPECIES_OGERPON_HEARTHFLAME || speciesId == SPECIES_OGERPON_HEARTHFLAME_TERA
@ -1736,8 +1735,8 @@ static void MoveSelectionDisplayMoveType(u32 battler)
}
else if (effect == EFFECT_TERA_STARSTORM)
{
if (gBattleMons[battler].species == SPECIES_TERAPAGOS_STELLAR
|| (IsGimmickSelected(battler, GIMMICK_TERA) && gBattleMons[battler].species == SPECIES_TERAPAGOS_TERASTAL))
if (speciesId == SPECIES_TERAPAGOS_STELLAR
|| (IsGimmickSelected(battler, GIMMICK_TERA) && speciesId == SPECIES_TERAPAGOS_TERASTAL))
type = TYPE_STELLAR;
}
else if (P_SHOW_DYNAMIC_TYPES) // Non-vanilla changes to battle UI showing dynamic types

1
src/battle_main.c
View File

@ -5870,6 +5870,7 @@ u32 GetDynamicMoveType(struct Pokemon *mon, u32 move, u32 battler, u8 *ateBoost)
break;
case WEATHER_RAIN:
case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_DOWNPOUR:
if (holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA)
return TYPE_WATER;
break;