diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /battle/ai/scoring.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'battle/ai/scoring.asm')
| -rw-r--r-- | battle/ai/scoring.asm | 22 |
1 files changed, 11 insertions, 11 deletions
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 |