diff options
Diffstat (limited to 'battle/ai')
| -rw-r--r-- | battle/ai/items.asm | 3 | ||||
| -rw-r--r-- | battle/ai/scoring.asm | 22 |
2 files changed, 13 insertions, 12 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 95997a67e..547d213df 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000 and a ret nz - callba Function3e8d1 + callba CheckSubstatus_RechargeChargedRampageBideRollout ret nz ld a, [PlayerSubStatus5] @@ -24,6 +24,7 @@ AI_SwitchOrTryItem: ; 38000 ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers and a jr nz, .ok + ld a, [TrainerClass] dec a ld bc, 7 diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 101d4e188..258ee2e16 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -176,7 +176,7 @@ AI_Types: ; 38635 push de ld a, 1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop de pop bc pop hl @@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7 push hl ld a, 1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop hl ; 60% chance to discourage this move if not very effective. @@ -512,7 +512,7 @@ AI_Smart_LockOn: ; 3881d push hl push bc - callba Function347c8 + callba HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp $a pop bc @@ -1384,7 +1384,7 @@ AI_Smart_Mimic: ; 38ba8 ld a, $1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp $a @@ -1783,8 +1783,8 @@ AI_Smart_PriorityHit: ; 38d5a ld [hBattleTurn], a push hl callab EnemyAttackDamage - callab BattleCommand62 - callab BattleCommand07 + callab BattleCommand_DamageCalcWithStats + callab BattleCommand_CalcDamageTypeMultiplier pop hl ld a, [CurDamage + 1] ld c, a @@ -1830,7 +1830,7 @@ AI_Smart_Conversion2: ; 38d98 xor a ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn ld a, [wd265] cp $a @@ -2496,7 +2496,7 @@ AI_Smart_HiddenPower: ; 3909e ; Calculate Hidden Power's type and base power based on enemy's DVs. callab HiddenPowerDamage - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop hl ; Discourage Hidden Power if not very effective. @@ -3380,8 +3380,8 @@ AIDamageCalc: ; 393e7 .asm_39400 callab EnemyAttackDamage - callab BattleCommand62 - callab BattleCommand07 + callab BattleCommand_DamageCalcWithStats + callab BattleCommand_CalcDamageTypeMultiplier ret .ConstantDamageEffects @@ -3498,7 +3498,7 @@ AI_Status: ; 39453 push de ld a, 1 ld [hBattleTurn], a - callab Function347c8 + callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn pop de pop bc pop hl |