diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:21 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:21 -0500 |
| commit | 599e6e8d16571235f2054aa38f39e66181da3796 (patch) | |
| tree | 9d3670e3329a17f076ea95fc721fd7501354a984 /battle/ai | |
| parent | e044b8ec08fee4a5d4f9cd942551ff94f2577b76 (diff) | |
Battle animation annotations
Diffstat (limited to 'battle/ai')
| -rw-r--r-- | battle/ai/items.asm | 8 | ||||
| -rwxr-xr-x | battle/ai/move.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index f5d22d786..c7c8f8201 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000 and a ret nz - callba CheckSubstatus_RechargeChargedRampageBideRollout + callba CheckEnemyLockedIn ret nz ld a, [PlayerSubStatus5] @@ -716,7 +716,7 @@ AI_Switch: ; 3846c ld d, h ld e, l ld hl, EnemyMonStatus - ld bc, $0004 + ld bc, MON_MAXHP - MON_STATUS call CopyBytes pop af @@ -726,7 +726,7 @@ AI_Switch: ; 3846c .skiptext ld a, 1 - ld [wd264], a + ld [wAISwitch], a callab NewEnemyMonStatus callab ResetEnemyStatLevels ld hl, PlayerSubStatus1 @@ -734,7 +734,7 @@ AI_Switch: ; 3846c callba EnemySwitch callba ResetBattleParticipants xor a - ld [wd264], a + ld [wAISwitch], a ld a, [wLinkMode] and a ret nz diff --git a/battle/ai/move.asm b/battle/ai/move.asm index 5f58bae3e..eb6a0536d 100755 --- a/battle/ai/move.asm +++ b/battle/ai/move.asm @@ -12,7 +12,7 @@ AIChooseMove: ; 440ce ret nz ; No use picking a move if there's no choice. - callba CheckSubstatus_RechargeChargedRampageBideRollout + callba CheckEnemyLockedIn ret nz |