Some battle labels

This commit is contained in:
PikalaxALT
2015-11-05 19:13:09 -05:00
parent 1205fe5100
commit 5eed48f05d
7 changed files with 59 additions and 58 deletions

View File

@@ -163,9 +163,9 @@ AI_TryItem: ; 38105
and a
ret nz
ld a, [wc650]
ld a, [wEnemyTrainerItem1]
ld b, a
ld a, [wc651]
ld a, [wEnemyTrainerItem2]
or b
ret z
@@ -180,7 +180,7 @@ AI_TryItem: ; 38105
ld b, h
ld c, l
ld hl, AI_Items
ld de, wc650
ld de, wEnemyTrainerItem1
.loop
ld a, [hl]
and a
@@ -233,7 +233,7 @@ endr
xor a
ld [EnemyFuryCutterCount], a
ld [EnemyProtectCount], a
ld [wc72c], a
ld [wEnemyRageCounter], a
ld hl, EnemySubStatus4
res SUBSTATUS_RAGE, [hl]
@@ -706,7 +706,7 @@ AI_Switch: ; 3846c
res SUBSTATUS_RAGE, [hl]
xor a
ld [hBattleTurn], a
callab Function3dc5b
callab PursuitSwitch
push af
ld a, [CurOTMon]
ld hl, OTPartyMon1Status

View File

@@ -1343,11 +1343,11 @@ AI_Smart_Rage: ; 38b7f
; Encourage this move based on Rage's counter.
.asm_38b8c
ld a, [wc72c]
ld a, [wEnemyRageCounter]
cp $2
ret c
dec [hl]
ld a, [wc72c]
ld a, [wEnemyRageCounter]
cp $3
ret c
dec [hl]