diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-07 09:48:32 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-07 09:48:32 -0500 |
| commit | 2cbb1acc6e3bc5fe30d1be8f665d2252703518ac (patch) | |
| tree | 57908e1a0387e0d7a2ef88935aa1be36e3cacf71 /battle/ai | |
| parent | e0445806694a80a98e4d803478a2675ec8803ba6 (diff) | |
Pokemon animations
Diffstat (limited to 'battle/ai')
| -rw-r--r-- | battle/ai/scoring.asm | 6 | ||||
| -rwxr-xr-x | battle/ai/switch.asm | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 52c71d624..39d2a8eca 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -576,7 +576,7 @@ AI_Smart_Explosion: ; 388a6 ; Unless this is the enemy's last Pokemon... push hl - callba CountEnemyAliveMons + callba CheckEnemyHasMonToSwitchTo pop hl jr nc, .asm_388b7 @@ -2028,7 +2028,7 @@ endr jp nz, AIDiscourageMove push hl - callba CountEnemyAliveMons + callba CheckEnemyHasMonToSwitchTo pop hl jr nc, .asm_38eb0 @@ -2160,7 +2160,7 @@ endr AI_Smart_PerishSong: ; 38f4a push hl - callab CountEnemyAliveMons + callab CheckEnemyHasMonToSwitchTo pop hl jr c, .no diff --git a/battle/ai/switch.asm b/battle/ai/switch.asm index 3d65b187a..c7fd696e1 100755 --- a/battle/ai/switch.asm +++ b/battle/ai/switch.asm @@ -184,7 +184,7 @@ endr CheckAbleToSwitch: ; 34941 xor a ld [wc717], a - call CountEnemyAliveMons + call CheckEnemyHasMonToSwitchTo ret c ld a, [EnemySubStatus1] @@ -197,7 +197,7 @@ CheckAbleToSwitch: ; 34941 ; Perish count is 1 - call CountEnemyAliveMons + call CheckEnemyHasMonToSwitchTo call Function34b77 call Function34b20 call Function34a85 @@ -212,7 +212,7 @@ CheckAbleToSwitch: ; 34941 ret .not_2 - call CountEnemyAliveMons + call CheckEnemyHasMonToSwitchTo sla c sla c ld b, $ff @@ -284,7 +284,7 @@ CheckAbleToSwitch: ; 34941 cp 10 ret nc - call CountEnemyAliveMons + call CheckEnemyHasMonToSwitchTo call Function34b77 call Function34b20 call Function34a85 @@ -300,7 +300,7 @@ CheckAbleToSwitch: ; 34941 ; 349f4 -CountEnemyAliveMons: ; 349f4 +CheckEnemyHasMonToSwitchTo: ; 349f4 ld a, [OTPartyCount] cp 2 jr c, .only_one |