ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Ai tweaks

Browse Source
This commit is contained in:
DizzyEggg 2020-04-20 14:47:00 +02:00
parent 260cbe6b65
commit 5d412d37d8
3 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_ai_script.inc
View File

@ -664,6 +664,10 @@
.byte 0x74
.endm
.macro get_considered_move_split
.byte 0x75
.endm
@ useful script macros
.macro if_has_physical_move battler:req, ptr:req
if_has_move_with_split \battler, SPLIT_PHYSICAL, \ptr

47
data/battle_ai_scripts.s
View File

@ -2214,8 +2214,8 @@ AI_CV_Counter3:
AI_CV_Counter4:
get_last_used_bank_move AI_TARGET
get_move_type_from_result
if_not_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_ScoreDown1
get_move_split_from_result
if_not_equal SPLIT_PHYSICAL, AI_CV_Counter_ScoreDown1
if_random_less_than 100, AI_CV_Counter_End
score +1
goto AI_CV_Counter_End
@ -2226,10 +2226,7 @@ AI_CV_Counter5:
score +1
AI_CV_Counter6:
get_target_type1
if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End
get_target_type2
if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End
if_has_no_physical_move AI_TARGET, AI_CV_Counter_ScoreDown1
if_random_less_than 50, AI_CV_Counter_End
AI_CV_Counter7:
@ -2245,18 +2242,6 @@ AI_CV_Counter_ScoreDown1:
AI_CV_Counter_End:
end
AI_CV_Counter_PhysicalTypeList:
.byte TYPE_NORMAL
.byte TYPE_FIGHTING
.byte TYPE_FLYING
.byte TYPE_POISON
.byte TYPE_GROUND
.byte TYPE_ROCK
.byte TYPE_BUG
.byte TYPE_GHOST
.byte TYPE_STEEL
.byte -1
AI_CV_Encore:
if_any_move_disabled AI_TARGET, AI_CV_Encore2
if_target_faster AI_CV_Encore_ScoreDown2
@ -2643,6 +2628,8 @@ AI_CV_Pursuit_End:
end
AI_CV_RainDance:
get_weather
if_equal AI_WEATHER_RAIN, AI_CV_RainDance_End
if_user_faster AI_CV_RainDance2
get_ability AI_USER
if_equal ABILITY_SWIFT_SWIM, AI_CV_RainDance3
@ -2673,13 +2660,15 @@ AI_CV_RainDance_Rock:
score +2
AI_CV_RainDance_Opponent:
if_has_move_with_type AI_TARGET, TYPE_FIRE, AI_CV_RainDance_OpponentPlus
if_no_type AI_TARGET, TYPE_FIRE, AI_CV_SunnyDay_End
if_no_type AI_TARGET, TYPE_FIRE, AI_CV_RainDance_End
AI_CV_RainDance_OpponentPlus:
score +1
AI_CV_RainDance_End:
end
AI_CV_SunnyDay:
get_weather
if_equal AI_WEATHER_SUN, AI_CV_SunnyDay_End
if_hp_less_than AI_USER, 40, AI_CV_SunnyDay_ScoreDown1
get_weather
if_equal AI_WEATHER_HAIL, AI_CV_SunnyDay2
@ -2796,8 +2785,8 @@ AI_CV_MirrorCoat3:
AI_CV_MirrorCoat4:
get_last_used_bank_move AI_TARGET
get_move_type_from_result
if_not_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_ScoreDown1
get_move_split_from_result
if_not_equal SPLIT_SPECIAL, AI_CV_MirrorCoat_ScoreDown1
if_random_less_than 100, AI_CV_MirrorCoat_End
score +1
goto AI_CV_MirrorCoat_End
@ -2808,10 +2797,7 @@ AI_CV_MirrorCoat5:
score +1
AI_CV_MirrorCoat6:
get_target_type1
if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End
get_target_type2
if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End
if_has_no_special_move AI_TARGET, AI_CV_MirrorCoat_ScoreDown1
if_random_less_than 50, AI_CV_MirrorCoat_End
AI_CV_MirrorCoat_ScoreUp4:
@ -2827,17 +2813,6 @@ AI_CV_MirrorCoat_ScoreDown1:
AI_CV_MirrorCoat_End:
end
AI_CV_MirrorCoat_SpecialTypeList:
.byte TYPE_FIRE
.byte TYPE_WATER
.byte TYPE_GRASS
.byte TYPE_ELECTRIC
.byte TYPE_PSYCHIC
.byte TYPE_ICE
.byte TYPE_DRAGON
.byte TYPE_DARK
.byte -1
AI_CV_ChargeUpMove:
if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_ChargeUpMove_ScoreDown2
if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_ChargeUpMove_ScoreDown2

17
src/battle_ai_script_commands.c
View File

@ -175,6 +175,7 @@ static void Cmd_is_grounded(void);
static void Cmd_get_best_dmg_hp_percent(void);
static void Cmd_get_curr_dmg_hp_percent(void);
static void Cmd_get_move_split_from_result(void);
static void Cmd_get_considered_move_split(void);
// ewram
EWRAM_DATA const u8 *gAIScriptPtr = NULL;
@ -302,6 +303,7 @@ static const BattleAICmdFunc sBattleAICmdTable[] =
Cmd_get_best_dmg_hp_percent, // 0x72
Cmd_get_curr_dmg_hp_percent, // 0x73
Cmd_get_move_split_from_result, // 0x74
Cmd_get_considered_move_split, // 0x75
};
static const u16 sDiscouragedPowerfulMoveEffects[] =
@ -1517,11 +1519,7 @@ static void Cmd_get_how_powerful_move_is(void)
static void Cmd_get_last_used_battler_move(void)
{
if (gAIScriptPtr[1] == AI_USER)
AI_THINKING_STRUCT->funcResult = gLastMoves[sBattler_AI];
else
AI_THINKING_STRUCT->funcResult = gLastMoves[gBattlerTarget];
AI_THINKING_STRUCT->funcResult = gLastMoves[BattleAI_GetWantedBattler(gAIScriptPtr[1])];
gAIScriptPtr += 2;
}
@ -2799,7 +2797,12 @@ static void Cmd_get_curr_dmg_hp_percent(void)
static void Cmd_get_move_split_from_result(void)
{
AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].type;
AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].split;
gAIScriptPtr += 1;
}
static void Cmd_get_considered_move_split(void)
{
AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].split;
gAIScriptPtr += 1;
}