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

Merge branch 'upcoming' into feature/dynmulti-expansion

Browse Source
This commit is contained in:
Alex 2023-12-31 00:16:44 +01:00 committed by GitHub
commit 15fa85ca2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 319 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle_ai_util.h
View File

@ -59,7 +59,6 @@ bool32 ShouldRestoreHpBerry(u32 battlerAtk, u32 item);
bool32 IsStatBoostingBerry(u32 item);
bool32 CanKnockOffItem(u32 battler, u32 item);
bool32 IsAbilityOfRating(u32 ability, s8 rating);
s8 GetAbilityRating(u32 ability);
bool32 AI_IsAbilityOnSide(u32 battlerId, u32 ability);
bool32 AI_MoveMakesContact(u32 ability, u32 holdEffect, u32 move);
u32 AI_GetBattlerMoveTargetType(u32 battlerId, u32 move);

1
include/pokemon.h
View File

@ -513,6 +513,7 @@ struct Ability
{
u8 name[ABILITY_NAME_LENGTH + 1];
const u8 *description;
s8 aiRating;
};
#define SPINDA_SPOT_WIDTH 16

8
src/battle_ai_main.c
View File

@ -2730,8 +2730,8 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score)
u32 atkPartnerAbility = aiData->abilities[BATTLE_PARTNER(battlerAtk)];
u32 atkPartnerHoldEffect = aiData->holdEffects[BATTLE_PARTNER(battlerAtk)];
bool32 partnerProtecting = (gBattleMoves[aiData->partnerMove].effect == EFFECT_PROTECT);
bool32 attackerHasBadAbility = (GetAbilityRating(aiData->abilities[battlerAtk]) < 0);
bool32 partnerHasBadAbility = (GetAbilityRating(atkPartnerAbility) < 0);
bool32 attackerHasBadAbility = (gAbilities[aiData->abilities[battlerAtk]].aiRating < 0);
bool32 partnerHasBadAbility = (gAbilities[atkPartnerAbility].aiRating < 0);
u32 predictedMove = aiData->predictedMoves[battlerDef];
SetTypeBeforeUsingMove(move, battlerAtk);
@ -4444,7 +4444,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score
}
break;
case EFFECT_SKILL_SWAP:
if (GetAbilityRating(aiData->abilities[battlerDef]) > GetAbilityRating(aiData->abilities[battlerAtk]))
if (gAbilities[aiData->abilities[battlerDef]].aiRating > gAbilities[aiData->abilities[battlerAtk]].aiRating)
ADJUST_SCORE(1);
break;
case EFFECT_WORRY_SEED:
@ -4454,7 +4454,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score
ADJUST_SCORE(2);
break;
case EFFECT_ENTRAINMENT:
if (IsAbilityOfRating(aiData->abilities[battlerDef], 5) || GetAbilityRating(aiData->abilities[battlerAtk]) <= 0)
if (IsAbilityOfRating(aiData->abilities[battlerDef], 5) || gAbilities[aiData->abilities[battlerAtk]].aiRating <= 0)
{
if (aiData->abilities[battlerDef] != aiData->abilities[battlerAtk] && !(gStatuses3[battlerDef] & STATUS3_GASTRO_ACID))
ADJUST_SCORE(2);

268
src/battle_ai_util.c
View File

@ -35,267 +35,6 @@
static u32 AI_GetEffectiveness(uq4_12_t multiplier);
// Const Data
static const s8 sAiAbilityRatings[ABILITIES_COUNT] =
{
[ABILITY_ADAPTABILITY] = 8,
[ABILITY_AFTERMATH] = 5,
[ABILITY_AERILATE] = 8,
[ABILITY_AIR_LOCK] = 5,
[ABILITY_ANALYTIC] = 5,
[ABILITY_ANGER_POINT] = 4,
[ABILITY_ANTICIPATION] = 2,
[ABILITY_ARENA_TRAP] = 9,
[ABILITY_AROMA_VEIL] = 3,
[ABILITY_AURA_BREAK] = 3,
[ABILITY_BAD_DREAMS] = 4,
[ABILITY_BATTERY] = 0,
[ABILITY_BATTLE_ARMOR] = 2,
[ABILITY_BATTLE_BOND] = 6,
[ABILITY_BEAST_BOOST] = 7,
[ABILITY_BERSERK] = 5,
[ABILITY_BIG_PECKS] = 1,
[ABILITY_BLAZE] = 5,
[ABILITY_BULLETPROOF] = 7,
[ABILITY_CHEEK_POUCH] = 4,
[ABILITY_CHLOROPHYLL] = 6,
[ABILITY_CLEAR_BODY] = 4,
[ABILITY_CLOUD_NINE] = 5,
[ABILITY_COLOR_CHANGE] = 2,
[ABILITY_COMATOSE] = 6,
[ABILITY_COMPETITIVE] = 5,
[ABILITY_COMPOUND_EYES] = 7,
[ABILITY_CONTRARY] = 8,
[ABILITY_CORROSION] = 5,
[ABILITY_CURSED_BODY] = 4,
[ABILITY_CUTE_CHARM] = 2,
[ABILITY_DAMP] = 2,
[ABILITY_DANCER] = 5,
[ABILITY_DARK_AURA] = 6,
[ABILITY_DAZZLING] = 5,
[ABILITY_DEFEATIST] = -1,
[ABILITY_DEFIANT] = 5,
[ABILITY_DELTA_STREAM] = 10,
[ABILITY_DESOLATE_LAND] = 10,
[ABILITY_DISGUISE] = 8,
[ABILITY_DOWNLOAD] = 7,
[ABILITY_DRIZZLE] = 9,
[ABILITY_DROUGHT] = 9,
[ABILITY_DRY_SKIN] = 6,
[ABILITY_EARLY_BIRD] = 4,
[ABILITY_EFFECT_SPORE] = 4,
[ABILITY_ELECTRIC_SURGE] = 8,
[ABILITY_EMERGENCY_EXIT] = 3,
[ABILITY_FAIRY_AURA] = 6,
[ABILITY_FILTER] = 6,
[ABILITY_FLAME_BODY] = 4,
[ABILITY_FLARE_BOOST] = 5,
[ABILITY_FLASH_FIRE] = 6,
[ABILITY_FLOWER_GIFT] = 4,
[ABILITY_FLOWER_VEIL] = 0,
[ABILITY_FLUFFY] = 5,
[ABILITY_FORECAST] = 6,
[ABILITY_FOREWARN] = 2,
[ABILITY_FRIEND_GUARD] = 0,
[ABILITY_FRISK] = 3,
[ABILITY_FULL_METAL_BODY] = 4,
[ABILITY_FUR_COAT] = 7,
[ABILITY_GALE_WINGS] = 6,
[ABILITY_GALVANIZE] = 8,
[ABILITY_GLUTTONY] = 3,
[ABILITY_GOOEY] = 5,
[ABILITY_GRASS_PELT] = 2,
[ABILITY_GRASSY_SURGE] = 8,
[ABILITY_GUTS] = 6,
[ABILITY_HARVEST] = 5,
[ABILITY_HEALER] = 0,
[ABILITY_HEATPROOF] = 5,
[ABILITY_HEAVY_METAL] = -1,
[ABILITY_HONEY_GATHER] = 0,
[ABILITY_HUGE_POWER] = 10,
[ABILITY_HUSTLE] = 7,
[ABILITY_HYDRATION] = 4,
[ABILITY_HYPER_CUTTER] = 3,
[ABILITY_ICE_BODY] = 3,
[ABILITY_ILLUMINATE] = 0,
[ABILITY_ILLUSION] = 8,
[ABILITY_IMMUNITY] = 4,
[ABILITY_IMPOSTER] = 9,
[ABILITY_INFILTRATOR] = 6,
[ABILITY_INNARDS_OUT] = 5,
[ABILITY_INNER_FOCUS] = 2,
[ABILITY_INSOMNIA] = 4,
[ABILITY_INTIMIDATE] = 7,
[ABILITY_IRON_BARBS] = 6,
[ABILITY_IRON_FIST] = 6,
[ABILITY_JUSTIFIED] = 4,
[ABILITY_KEEN_EYE] = 1,
[ABILITY_KLUTZ] = -1,
[ABILITY_LEAF_GUARD] = 2,
[ABILITY_LEVITATE] = 7,
[ABILITY_LIGHT_METAL] = 2,
[ABILITY_LIGHTNING_ROD] = 7,
[ABILITY_LIMBER] = 3,
[ABILITY_LIQUID_OOZE] = 3,
[ABILITY_LIQUID_VOICE] = 5,
[ABILITY_LONG_REACH] = 3,
[ABILITY_MAGIC_BOUNCE] = 9,
[ABILITY_MAGIC_GUARD] = 9,
[ABILITY_MAGICIAN] = 3,
[ABILITY_MAGMA_ARMOR] = 1,
[ABILITY_MAGNET_PULL] = 9,
[ABILITY_MARVEL_SCALE] = 5,
[ABILITY_MEGA_LAUNCHER] = 7,
[ABILITY_MERCILESS] = 4,
[ABILITY_MINUS] = 0,
[ABILITY_MISTY_SURGE] = 8,
[ABILITY_MOLD_BREAKER] = 7,
[ABILITY_MOODY] = 10,
[ABILITY_MOTOR_DRIVE] = 6,
[ABILITY_MOXIE] = 7,
[ABILITY_MULTISCALE] = 8,
[ABILITY_MULTITYPE] = 8,
[ABILITY_MUMMY] = 5,
[ABILITY_NATURAL_CURE] = 7,
[ABILITY_NEUROFORCE] = 6,
[ABILITY_NO_GUARD] = 8,
[ABILITY_NORMALIZE] = -1,
[ABILITY_OBLIVIOUS] = 2,
[ABILITY_OVERCOAT] = 5,
[ABILITY_OVERGROW] = 5,
[ABILITY_OWN_TEMPO] = 3,
[ABILITY_PARENTAL_BOND] = 10,
[ABILITY_PICKUP] = 1,
[ABILITY_PICKPOCKET] = 3,
[ABILITY_PIXILATE] = 8,
[ABILITY_PLUS] = 0,
[ABILITY_POISON_HEAL] = 8,
[ABILITY_POISON_POINT] = 4,
[ABILITY_POISON_TOUCH] = 4,
[ABILITY_POWER_CONSTRUCT] = 10,
[ABILITY_POWER_OF_ALCHEMY] = 0,
[ABILITY_PRANKSTER] = 8,
[ABILITY_PRESSURE] = 5,
[ABILITY_PRIMORDIAL_SEA] = 10,
[ABILITY_PRISM_ARMOR] = 6,
[ABILITY_PROTEAN] = 8,
[ABILITY_PSYCHIC_SURGE] = 8,
[ABILITY_PURE_POWER] = 10,
[ABILITY_QUEENLY_MAJESTY] = 6,
[ABILITY_QUICK_FEET] = 5,
[ABILITY_RAIN_DISH] = 3,
[ABILITY_RATTLED] = 3,
[ABILITY_RECEIVER] = 0,
[ABILITY_RECKLESS] = 6,
[ABILITY_REFRIGERATE] = 8,
[ABILITY_REGENERATOR] = 8,
[ABILITY_RIVALRY] = 1,
[ABILITY_RKS_SYSTEM] = 8,
[ABILITY_ROCK_HEAD] = 5,
[ABILITY_ROUGH_SKIN] = 6,
[ABILITY_RUN_AWAY] = 0,
[ABILITY_SAND_FORCE] = 4,
[ABILITY_SAND_RUSH] = 6,
[ABILITY_SAND_STREAM] = 9,
[ABILITY_SAND_VEIL] = 3,
[ABILITY_SAP_SIPPER] = 7,
[ABILITY_SCHOOLING] = 6,
[ABILITY_SCRAPPY] = 6,
[ABILITY_SERENE_GRACE] = 8,
[ABILITY_SHADOW_SHIELD] = 8,
[ABILITY_SHADOW_TAG] = 10,
[ABILITY_SHED_SKIN] = 7,
[ABILITY_SHEER_FORCE] = 8,
[ABILITY_SHELL_ARMOR] = 2,
[ABILITY_SHIELD_DUST] = 5,
[ABILITY_SHIELDS_DOWN] = 6,
[ABILITY_SIMPLE] = 8,
[ABILITY_SKILL_LINK] = 7,
[ABILITY_SLOW_START] = -2,
[ABILITY_SLUSH_RUSH] = 5,
[ABILITY_SNIPER] = 3,
[ABILITY_SNOW_CLOAK] = 3,
[ABILITY_SNOW_WARNING] = 8,
[ABILITY_SOLAR_POWER] = 3,
[ABILITY_SOLID_ROCK] = 6,
[ABILITY_SOUL_HEART] = 7,
[ABILITY_SOUNDPROOF] = 4,
[ABILITY_SPEED_BOOST] = 9,
[ABILITY_STAKEOUT] = 6,
[ABILITY_STALL] = -1,
[ABILITY_STAMINA] = 6,
[ABILITY_STANCE_CHANGE] = 10,
[ABILITY_STATIC] = 4,
[ABILITY_STEADFAST] = 2,
[ABILITY_STEELWORKER] = 6,
[ABILITY_STENCH] = 1,
[ABILITY_STICKY_HOLD] = 3,
[ABILITY_STORM_DRAIN] = 7,
[ABILITY_STRONG_JAW] = 6,
[ABILITY_STURDY] = 6,
[ABILITY_SUCTION_CUPS] = 2,
[ABILITY_SUPER_LUCK] = 3,
[ABILITY_SURGE_SURFER] = 4,
[ABILITY_SWARM] = 5,
[ABILITY_SWEET_VEIL] = 4,
[ABILITY_SWIFT_SWIM] = 6,
[ABILITY_SYMBIOSIS] = 0,
[ABILITY_SYNCHRONIZE] = 4,
[ABILITY_TANGLED_FEET] = 2,
[ABILITY_TANGLING_HAIR] = 5,
[ABILITY_TECHNICIAN] = 8,
[ABILITY_TELEPATHY] = 0,
[ABILITY_TERAVOLT] = 7,
[ABILITY_THICK_FAT] = 7,
[ABILITY_TINTED_LENS] = 7,
[ABILITY_TORRENT] = 5,
[ABILITY_TOXIC_BOOST] = 6,
[ABILITY_TOUGH_CLAWS] = 7,
[ABILITY_TRACE] = 6,
[ABILITY_TRIAGE] = 7,
[ABILITY_TRUANT] = -2,
[ABILITY_TURBOBLAZE] = 7,
[ABILITY_UNAWARE] = 6,
[ABILITY_UNBURDEN] = 7,
[ABILITY_UNNERVE] = 3,
[ABILITY_VICTORY_STAR] = 6,
[ABILITY_VITAL_SPIRIT] = 4,
[ABILITY_VOLT_ABSORB] = 7,
[ABILITY_WATER_ABSORB] = 7,
[ABILITY_WATER_BUBBLE] = 8,
[ABILITY_WATER_COMPACTION] = 4,
[ABILITY_WATER_VEIL] = 4,
[ABILITY_WEAK_ARMOR] = 2,
[ABILITY_WHITE_SMOKE] = 4,
[ABILITY_WIMP_OUT] = 3,
[ABILITY_WONDER_GUARD] = 10,
[ABILITY_WONDER_SKIN] = 4,
[ABILITY_ZEN_MODE] = -1,
[ABILITY_INTREPID_SWORD] = 3,
[ABILITY_DAUNTLESS_SHIELD] = 3,
[ABILITY_BALL_FETCH] = 0,
[ABILITY_COTTON_DOWN] = 3,
[ABILITY_MIRROR_ARMOR] = 6,
[ABILITY_GULP_MISSILE] = 3,
[ABILITY_STALWART] = 2,
[ABILITY_PROPELLER_TAIL] = 2,
[ABILITY_STEAM_ENGINE] = 3,
[ABILITY_PUNK_ROCK] = 2,
[ABILITY_SAND_SPIT] = 5,
[ABILITY_ICE_SCALES] = 7,
[ABILITY_RIPEN] = 4,
[ABILITY_ICE_FACE] = 4,
[ABILITY_POWER_SPOT] = 2,
[ABILITY_MIMICRY] = 2,
[ABILITY_SCREEN_CLEANER] = 3,
[ABILITY_NEUTRALIZING_GAS] = 5,
[ABILITY_HUNGER_SWITCH] = 2,
[ABILITY_PASTEL_VEIL] = 4,
[ABILITY_STEELY_SPIRIT] = 2,
[ABILITY_PERISH_BODY] = -1,
[ABILITY_WANDERING_SPIRIT] = 2,
[ABILITY_GORILLA_TACTICS] = 4,
};
static const u16 sEncouragedEncoreEffects[] =
{
EFFECT_DREAM_EATER,
@ -3470,16 +3209,11 @@ bool32 SideHasMoveCategory(u32 battlerId, u32 category)
bool32 IsAbilityOfRating(u32 ability, s8 rating)
{
if (sAiAbilityRatings[ability] >= rating)
if (gAbilities[ability].aiRating >= rating)
return TRUE;
return FALSE;
}
s8 GetAbilityRating(u32 ability)
{
return sAiAbilityRatings[ability];
}
static const u16 sRecycleEncouragedItems[] =
{
ITEM_CHESTO_BERRY,

316
src/data/abilities.h
View File

File diff suppressed because it is too large Load Diff