ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 21:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some AI tweaking

Browse Source
This commit is contained in:
DizzyEggg 2019-05-23 11:41:35 +02:00
parent 1b7493e47a
commit 32aeba21e0
5 changed files with 220 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asm/macros/battle_ai_script.inc
View File

@ -633,6 +633,13 @@
.4byte \ptr
.endm
.macro if_has_move_with_flag battler:req, flag:req, ptr:req
.byte 0x6E
.byte \battler
.4byte \flag
.4byte \ptr
.endm
@ useful script macros
.macro if_has_physical_move battler:req, ptr:req
if_has_move_with_split \battler, SPLIT_PHYSICAL, \ptr

197
data/battle_ai_scripts.s
View File

@ -253,6 +253,14 @@ AI_CheckBadMove_CheckEffect: @ 82DC045
if_effect EFFECT_POWDER, AI_CBM_Powder
if_effect EFFECT_PROTECT, AI_CBM_Protect
if_effect EFFECT_TAUNT, AI_CBM_Taunt
if_effect EFFECT_HEAL_BELL, AI_CBM_HealBell
end
AI_CBM_HealBell:
if_status AI_TARGET, STATUS1_ANY, AI_CBM_HealBell_End
if_status_in_party AI_TARGET, STATUS1_ANY, AI_CBM_HealBell_End
score -5
AI_CBM_HealBell_End:
end
AI_CBM_Taunt:
@ -964,6 +972,7 @@ AI_CheckViability:
if_effect EFFECT_SUPER_FANG, AI_CV_SuperFang
if_effect EFFECT_TRAP, AI_CV_Trap
if_effect EFFECT_CONFUSE, AI_CV_Confuse
if_effect EFFECT_FOCUS_ENERGY, AI_CV_FocusEnergy
if_effect EFFECT_ATTACK_UP_2, AI_CV_AttackUp
if_effect EFFECT_DEFENSE_UP_2, AI_CV_DefenseUp
if_effect EFFECT_SPEED_UP_2, AI_CV_SpeedUp
@ -979,7 +988,9 @@ AI_CheckViability:
if_effect EFFECT_ACCURACY_DOWN_2, AI_CV_AccuracyDown
if_effect EFFECT_EVASION_DOWN_2, AI_CV_EvasionDown
if_effect EFFECT_REFLECT, AI_CV_Reflect
if_effect EFFECT_AURORA_VEIL, AI_CV_AuroraVeil
if_effect EFFECT_POISON, AI_CV_Poison
if_effect EFFECT_TOXIC_THREAD, AI_CV_ToxicThread
if_effect EFFECT_PARALYZE, AI_CV_Paralyze
if_effect EFFECT_SWAGGER, AI_CV_Swagger
if_effect EFFECT_SPEED_DOWN_HIT, AI_CV_SpeedDownFromChance
@ -987,7 +998,7 @@ AI_CheckViability:
if_effect EFFECT_VITAL_THROW, AI_CV_VitalThrow
if_effect EFFECT_SUBSTITUTE, AI_CV_Substitute
if_effect EFFECT_RECHARGE, AI_CV_Recharge
if_effect EFFECT_LEECH_SEED, AI_CV_Toxic
if_effect EFFECT_LEECH_SEED, AI_CV_LeechSeed
if_effect EFFECT_DISABLE, AI_CV_Disable
if_effect EFFECT_COUNTER, AI_CV_Counter
if_effect EFFECT_ENCORE, AI_CV_Encore
@ -1056,8 +1067,23 @@ AI_CheckViability:
if_effect EFFECT_GRASSY_TERRAIN, AI_CV_GrassyTerrain
if_effect EFFECT_ELECTRIC_TERRAIN, AI_CV_ElectricTerrain
if_effect EFFECT_PSYCHIC_TERRAIN, AI_CV_PsychicTerrain
if_effect EFFECT_STEALTH_ROCK, AI_CV_Hazards
if_effect EFFECT_SPIKES, AI_CV_Hazards
if_effect EFFECT_STICKY_WEB, AI_CV_Hazards
if_effect EFFECT_TOXIC_SPIKES, AI_CV_Hazards
end
AI_CV_Hazards:
if_ability AI_TARGET, ABILITY_MAGIC_BOUNCE,
is_first_turn_for AI_USER
if_equal 0, AI_CV_StealthRockEnd
score +2
AI_CV_StealthRockEnd:
end
AI_CV_StealthRock2:
score -2
goto AI_CV_StealthRockEnd
AI_CV_MistyTerrain:
call AI_CV_TerrainExpander
end
@ -1520,11 +1546,9 @@ AI_CV_SpeedDown: @ 82DCE81
if_target_faster AI_CV_SpeedDown2
score -3
goto AI_CV_SpeedDown_End
AI_CV_SpeedDown2: @ 82DCE8E
if_random_less_than 70, AI_CV_SpeedDown_End
score +2
AI_CV_SpeedDown_End: @ 82DCE96
end
@ -1629,17 +1653,24 @@ AI_CV_AccuracyDown_End:
AI_CV_EvasionDown:
if_hp_less_than AI_USER, 70, AI_CV_EvasionDown2
if_stat_level_more_than AI_TARGET, STAT_EVASION, 3, AI_CV_EvasionDown3
AI_CV_EvasionDown2:
if_random_less_than 50, AI_CV_EvasionDown3
score -2
AI_CV_EvasionDown3:
if_hp_more_than AI_TARGET, 70, AI_CV_EvasionDown_End
if_hp_more_than AI_TARGET, 70, AI_CV_EvasionDown_4
score -2
AI_CV_EvasionDown_4:
if_stat_level_less_than AI_USER, STAT_ACC, 6, AI_CV_EvasionDown_5
if_stat_level_less_than AI_TARGET, STAT_EVASION, 7, AI_CV_EvasionDown_6
if_ability AI_USER, ABILITY_NO_GUARD, AI_CV_EvasionDown_6
AI_CV_EvasionDown_End:
end
AI_CV_EvasionDown_5:
score +1
goto AI_CV_EvasionDown_End
AI_CV_EvasionDown_6:
score -2
goto AI_CV_EvasionDown_End
AI_CV_Haze:
if_stat_level_more_than AI_USER, STAT_ATK, 8, AI_CV_Haze2
@ -1756,41 +1787,46 @@ AI_CV_Heal6:
AI_CV_Heal_End:
end
EncouragePsnVenoshock:
if_doesnt_have_move_with_effect AI_USER, EFFECT_VENOSHOCK, EncouragePsnVenoshockEnd
score +1
if_random_less_than 128, EncouragePsnVenoshockEnd
score +1
EncouragePsnVenoshockEnd:
end
AI_CV_Toxic:
call EncouragePsnVenoshock
AI_CV_LeechSeed:
if_user_has_no_attacking_moves AI_CV_Toxic3
if_hp_more_than AI_USER, 50, AI_CV_Toxic2
if_random_less_than 50, AI_CV_Toxic2
score -3
AI_CV_Toxic2:
if_hp_more_than AI_TARGET, 50, AI_CV_Toxic3
if_random_less_than 50, AI_CV_Toxic3
score -3
AI_CV_Toxic3:
if_has_move_with_effect AI_USER, EFFECT_SPECIAL_DEFENSE_UP, AI_CV_Toxic4
if_has_move_with_effect AI_USER, EFFECT_PROTECT, AI_CV_Toxic4
goto AI_CV_Toxic_End
AI_CV_Toxic4:
if_random_less_than 60, AI_CV_Toxic_End
score +2
AI_CV_Toxic_End:
end
AI_CV_LightScreen:
call EncourageLightClay
if_hp_less_than AI_USER, 50, AI_CV_LightScreen_ScoreDown2
get_target_type1
if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End
get_target_type2
if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End
if_random_less_than 50, AI_CV_LightScreen_End
AI_CV_LightScreen_ScoreDown2:
score -2
AI_CV_LightScreen_End:
end
@ -1852,16 +1888,26 @@ AI_CV_SuperFang_End:
AI_CV_Trap:
if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_Trap2
if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_Trap2
if_status3 AI_TARGET, STATUS3_PERISH_SONG, AI_CV_Trap2
if_status2 AI_TARGET, STATUS2_INFATUATION, AI_CV_Trap2
goto AI_CV_Trap_End
if_status2 AI_TARGET, STATUS2_CURSED | STATUS2_INFATUATION, AI_CV_Trap2
if_status3 AI_TARGET, STATUS3_PERISH_SONG, AI_CV_Trap5
goto AI_CV_TrapItem
AI_CV_Trap5:
score +2
goto AI_CV_TrapItem
AI_CV_Trap2:
if_random_less_than 128, AI_CV_Trap_End
if_random_less_than 128, AI_CV_TrapItem
score +1
AI_CV_Trap_End:
AI_CV_TrapItem:
get_considered_move_power
if_equal 0, AI_CV_TrapEnd
if_status2 AI_TARGET, STATUS2_WRAPPED, AI_CV_TrapEnd
get_hold_effect AI_USER
if_equal HOLD_EFFECT_GRIP_CLAW AI_CV_Trap4
if_equal HOLD_EFFECT_BINDING_BAND AI_CV_Trap4
goto AI_CV_TrapEnd
AI_CV_Trap4:
score +2
AI_CV_TrapEnd:
end
AI_CV_HighCrit:
@ -1877,6 +1923,18 @@ AI_CV_HighCrit2:
AI_CV_HighCrit_End:
end
AI_CV_FocusEnergy:
if_has_move_with_flag AI_USER, FLAG_HIGH_CRIT, AI_CV_FocusEnergy2
AI_CV_FocusEnergy3:
get_hold_effect AI_USER
if_not_equal HOLD_EFFECT_SCOPE_LENS, AI_CV_FocusEnergyEnd
score +1
AI_CV_FocusEnergyEnd:
end
AI_CV_FocusEnergy2:
score +1
goto AI_CV_FocusEnergy3
AI_CV_Swagger:
if_has_move AI_USER, MOVE_PSYCH_UP, AI_CV_SwaggerHasPsychUp
@ -1912,18 +1970,30 @@ AI_CV_SwaggerHasPsychUp_Minus5:
AI_CV_SwaggerHasPsychUp_End:
end
EncourageLightClay:
get_hold_effect AI_USER
if_not_equal HOLD_EFFECT_LIGHT_CLAY, EncourageLightClayEnd
score +1
if_random_less_than 111, EncourageLightClayEnd
score +1
EncourageLightClayEnd:
end
AI_CV_AuroraVeil:
call EncourageLightClay
end
AI_CV_Reflect:
call EncourageLightClay
if_hp_less_than AI_USER, 50, AI_CV_Reflect_ScoreDown2
get_target_type1
if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End
get_target_type2
if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End
if_random_less_than 50, AI_CV_Reflect_End
AI_CV_Reflect_ScoreDown2:
score -2
AI_CV_Reflect_End:
end
@ -1939,13 +2009,26 @@ AI_CV_Reflect_PhysicalTypeList:
.byte TYPE_STEEL
.byte -1
AI_CV_ToxicThread:
if_status AI_TARGET, STATUS1_ANY, AI_CV_ToxicThreadSpd
call EncouragePsnVenoshock
AI_CV_ToxicThreadSpd:
if_target_faster AI_CV_ToxicThread2
if_not_status AI_TARGET, STATUS1_ANY, AI_CV_ToxicThread3
score -1
goto AI_CV_ToxicThread3
AI_CV_ToxicThread2:
score +1
AI_CV_ToxicThread3:
goto AI_CV_Poison2
AI_CV_Poison:
call EncouragePsnVenoshock
AI_CV_Poison2:
if_hp_less_than AI_USER, 50, AI_CV_Poison_ScoreDown1
if_hp_more_than AI_TARGET, 50, AI_CV_Poison_End
AI_CV_Poison_ScoreDown1:
score -1
AI_CV_Poison_End:
end
@ -2281,14 +2364,17 @@ AI_CV_Flail_ScoreDown1:
AI_CV_Flail_End:
end
AI_CV_HealBell:
if_status AI_TARGET, STATUS1_ANY, AI_CV_HealBell_End
if_status_in_party AI_TARGET, STATUS1_ANY, AI_CV_HealBell_End
score -5
AI_CV_HealBell_End:
if_move MOVE_HEAL_BELL AI_CV_HealBell2
AI_CV_HealBellEnd:
end
@ Don't use Heal Bell to heal a partner that has Soundproof
AI_CV_HealBell2:
if_status AI_USER, STATUS1_ANY, AI_CV_HealBellEnd
if_not_status AI_USER_PARTNER, STATUS1_ANY, AI_CV_HealBellEnd
if_ability AI_USER_PARTNER, ABILITY_SOUNDPROOF, Score_Minus3
goto AI_CV_HealBellEnd
AI_CV_Thief:
get_hold_effect AI_TARGET
@ -2314,29 +2400,30 @@ AI_CV_Thief_EncourageItemsToSteal:
.byte -1
AI_CV_Curse:
get_user_type1
if_equal TYPE_GHOST, AI_CV_Curse4
get_user_type2
if_equal TYPE_GHOST, AI_CV_Curse4
if_stat_level_more_than AI_USER, STAT_DEF, 9, AI_CV_Curse_End
if_type AI_USER, TYPE_GHOST, AI_CV_CurseGhost
if_stat_level_more_than AI_USER, STAT_DEF, 9, AI_CV_Curse2
if_random_less_than 128, AI_CV_Curse2
score +1
AI_CV_Curse2:
if_stat_level_more_than AI_USER, STAT_DEF, 7, AI_CV_Curse_End
if_stat_level_more_than AI_USER, STAT_ATK, 9, AI_CV_Curse3
if_random_less_than 128, AI_CV_Curse3
score +1
AI_CV_Curse3:
if_stat_level_more_than AI_USER, STAT_DEF, 6, AI_CV_Curse_End
if_random_less_than 128, AI_CV_Curse_End
if_stat_level_more_than AI_USER, STAT_DEF, 6, AI_CV_Curse4
if_random_less_than 98, AI_CV_Curse4
score +1
goto AI_CV_Curse_End
AI_CV_Curse4:
if_stat_level_more_than AI_USER, STAT_ATK, 6, AI_CV_Curse5
if_random_less_than 99, AI_CV_Curse5
score +1
AI_CV_Curse5:
get_hold_effect AI_USER
if_not_equal HOLD_EFFECT_RESTORE_STATS, AI_CV_Curse_End
score +2
goto AI_CV_Curse_End
AI_CV_CurseGhost:
if_hp_more_than AI_USER, 80, AI_CV_Curse_End
score -1
AI_CV_Curse_End:
end
@ -3141,25 +3228,29 @@ AI_TryToFaint:
get_how_powerful_move_is
if_equal MOVE_NOT_MOST_POWERFUL, Score_Minus1
if_type_effectiveness AI_EFFECTIVENESS_x4, AI_TryToFaint_DoubleSuperEffective
end
goto AI_TryToFaint_InDanger
AI_TryToFaint_DoubleSuperEffective:
if_random_less_than 80, AI_TryToFaint_End
if_random_less_than 80, AI_TryToFaint_InDanger
score +2
end
goto AI_TryToFaint_InDanger
AI_TryToFaint_TryToEncourageQuickAttack:
if_effect EFFECT_EXPLOSION, AI_TryToFaint_End
if_effect EFFECT_EXPLOSION, AI_TryToFaint_InDanger
if_user_faster AI_TryToFaint_ScoreUp4
if_move_flag FLAG_HIGH_CRIT AI_TryToFaint_ScoreUp4
score +2
end
goto AI_TryToFaint_InDanger
AI_TryToFaint_ScoreUp4:
score +4
AI_TryToFaint_InDanger:
if_target_faster AI_TryToFaint_End
if_ai_can_go_down AI_TryToFaint_IsInDanger
AI_TryToFaint_End:
end
AI_TryToFaint_IsInDanger:
get_how_powerful_move_is
if not_equal MOVE_MOST_POWERFUL Score_Minus1
score +1
goto AI_TryToFaint_End
AI_SetupFirstTurn:
if_target_is_ally AI_Ret

203
src/battle_ai_script_commands.c
View File

@ -166,6 +166,7 @@ static void BattleAICmd_if_physical_moves_unusable(void);
static void BattleAICmd_if_ai_can_go_down(void);
static void BattleAICmd_if_has_move_with_type(void);
static void BattleAICmd_if_no_move_used(void);
static void BattleAICmd_if_has_move_with_flag(void);
// ewram
EWRAM_DATA const u8 *gAIScriptPtr = NULL;
@ -287,6 +288,7 @@ static const BattleAICmdFunc sBattleAICmdTable[] =
BattleAICmd_if_ai_can_go_down, // 0x6C
BattleAICmd_if_has_move_with_type, // 0x6D
BattleAICmd_if_no_move_used, // 0x6E
BattleAICmd_if_has_move_with_flag, // 0x6F
};
static const u16 sDiscouragedPowerfulMoveEffects[] =
@ -895,14 +897,25 @@ static void BattleAICmd_score(void)
gAIScriptPtr += 2; // AI return.
}
static u8 BattleAI_GetWantedBattler(u8 wantedBattler)
{
switch (wantedBattler)
{
case AI_USER:
return sBattler_AI;
case AI_TARGET:
default:
return gBattlerTarget;
case AI_USER_PARTNER:
return sBattler_AI ^ BIT_FLANK;
case AI_TARGET_PARTNER:
return gBattlerTarget ^ BIT_FLANK;
}
}
static void BattleAICmd_if_hp_less_than(void)
{
u16 battlerId;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
if ((u32)(100 * gBattleMons[battlerId].hp / gBattleMons[battlerId].maxHP) < gAIScriptPtr[2])
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@ -912,12 +925,7 @@ static void BattleAICmd_if_hp_less_than(void)
static void BattleAICmd_if_hp_more_than(void)
{
u16 battlerId;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
if ((u32)(100 * gBattleMons[battlerId].hp / gBattleMons[battlerId].maxHP) > gAIScriptPtr[2])
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@ -927,12 +935,7 @@ static void BattleAICmd_if_hp_more_than(void)
static void BattleAICmd_if_hp_equal(void)
{
u16 battlerId;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
if ((u32)(100 * gBattleMons[battlerId].hp / gBattleMons[battlerId].maxHP) == gAIScriptPtr[2])
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@ -942,12 +945,7 @@ static void BattleAICmd_if_hp_equal(void)
static void BattleAICmd_if_hp_not_equal(void)
{
u16 battlerId;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
if ((u32)(100 * gBattleMons[battlerId].hp / gBattleMons[battlerId].maxHP) != gAIScriptPtr[2])
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@ -957,15 +955,8 @@ static void BattleAICmd_if_hp_not_equal(void)
static void BattleAICmd_if_status(void)
{
u16 battlerId;
u32 status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
if (gBattleMons[battlerId].status1 & status)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -975,15 +966,8 @@ static void BattleAICmd_if_status(void)
static void BattleAICmd_if_not_status(void)
{
u16 battlerId;
u32 status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
if (!(gBattleMons[battlerId].status1 & status))
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -993,15 +977,8 @@ static void BattleAICmd_if_not_status(void)
static void BattleAICmd_if_status2(void)
{
u16 battlerId;
u32 status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
if ((gBattleMons[battlerId].status2 & status))
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -1011,15 +988,8 @@ static void BattleAICmd_if_status2(void)
static void BattleAICmd_if_not_status2(void)
{
u16 battlerId;
u32 status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
if (!(gBattleMons[battlerId].status2 & status))
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -1029,15 +999,8 @@ static void BattleAICmd_if_not_status2(void)
static void BattleAICmd_if_status3(void)
{
u16 battlerId;
u32 status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
if (gStatuses3[battlerId] & status)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -1047,15 +1010,8 @@ static void BattleAICmd_if_status3(void)
static void BattleAICmd_if_not_status3(void)
{
u16 battlerId;
u32 status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
if (!(gStatuses3[battlerId] & status))
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -1065,16 +1021,9 @@ static void BattleAICmd_if_not_status3(void)
static void BattleAICmd_if_side_affecting(void)
{
u16 battlerId;
u32 side, status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
side = GET_BATTLER_SIDE(battlerId);
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
u32 side = GET_BATTLER_SIDE(battlerId);
if (gSideStatuses[side] & status)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -1084,16 +1033,9 @@ static void BattleAICmd_if_side_affecting(void)
static void BattleAICmd_if_not_side_affecting(void)
{
u16 battlerId;
u32 side, status;
if (gAIScriptPtr[1] == AI_USER)
battlerId = sBattler_AI;
else
battlerId = gBattlerTarget;
side = GET_BATTLER_SIDE(battlerId);
status = T1_READ_32(gAIScriptPtr + 2);
u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u32 status = T1_READ_32(gAIScriptPtr + 2);
u32 side = GET_BATTLER_SIDE(battlerId);
if (!(gSideStatuses[side] & status))
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
@ -1322,22 +1264,6 @@ static void BattleAICmd_get_type(void)
gAIScriptPtr += 2;
}
static u8 BattleAI_GetWantedBattler(u8 wantedBattler)
{
switch (wantedBattler)
{
case AI_USER:
return sBattler_AI;
case AI_TARGET:
default:
return gBattlerTarget;
case AI_USER_PARTNER:
return sBattler_AI ^ BIT_FLANK;
case AI_TARGET_PARTNER:
return gBattlerTarget ^ BIT_FLANK;
}
}
static void BattleAICmd_is_of_type(void)
{
u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
@ -1765,17 +1691,7 @@ static void BattleAICmd_if_status_in_party(void)
struct Pokemon *party;
s32 i;
u32 statusToCompareTo;
u8 battlerId;
switch (gAIScriptPtr[1])
{
case AI_USER:
battlerId = sBattler_AI;
break;
default:
battlerId = gBattlerTarget;
break;
}
u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
party = (GetBattlerSide(battlerId) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
@ -1802,17 +1718,7 @@ static void BattleAICmd_if_status_not_in_party(void)
struct Pokemon *party;
s32 i;
u32 statusToCompareTo;
u8 battlerId;
switch (gAIScriptPtr[1])
{
case 1:
battlerId = sBattler_AI;
break;
default:
battlerId = gBattlerTarget;
break;
}
u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
party = (GetBattlerSide(battlerId) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
@ -1930,7 +1836,7 @@ static void BattleAICmd_if_can_faint(void)
{
s32 dmg;
if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power < 2)
if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power == 0)
{
gAIScriptPtr += 5;
return;
@ -2710,6 +2616,29 @@ static void BattleAICmd_if_has_move_with_type(void)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
}
static void BattleAICmd_if_has_move_with_flag(void)
{
u32 i, flag, battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
u16 *moves;
if (IsBattlerAIControlled(battler))
moves = gBattleMons[battler].moves;
else
moves = BATTLE_HISTORY->usedMoves[battler].moves;
flag = T1_READ_32(gAIScriptPtr + 2);
for (i = 0; i < 4; i++)
{
if (moves[i] != MOVE_NONE && gBattleMoves[moves[i]].flags & flag)
{
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
return;
}
}
gAIScriptPtr += 10;
}
static void BattleAICmd_if_no_move_used(void)
{
u32 i, battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);

6
src/battle_script_commands.c
View File

@ -7949,7 +7949,7 @@ static void atk84_jumpifcantmakeasleep(void)
static void atk85_stockpile(void)
{
if (gDisableStructs[gBattlerAttacker].stockpileCounter == 3)
if (gDisableStructs[gBattlerAttacker].stockpileCounter >= 3)
{
gMoveResultFlags |= MOVE_RESULT_MISSED;
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@ -7957,9 +7957,7 @@ static void atk85_stockpile(void)
else
{
gDisableStructs[gBattlerAttacker].stockpileCounter++;
PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattlerAttacker].stockpileCounter)
PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattlerAttacker].stockpileCounter);
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
}
gBattlescriptCurrInstr++;

2
src/data/battle_moves.h
View File

@ -3223,7 +3223,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SWEET_SCENT] =
{
.effect = EFFECT_EVASION_DOWN,
.effect = EFFECT_EVASION_DOWN_2,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,