diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/ai/scoring.asm | 23 | ||||
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 10 |
3 files changed, 16 insertions, 19 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 7ea1ec8fe..e7498886f 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -1523,13 +1523,13 @@ AIScoring_HealBell: ; 38d1f ld b, a ld c, 0 ld hl, OTPartyMon1HP - ld de, $0030 + ld de, OTPartyMon2 - OTPartyMon1 -.asm_38d2c +.loop push hl ld a, [hli] or [hl] - jr z, .asm_38d37 + jr z, .next dec hl dec hl @@ -1538,34 +1538,31 @@ AIScoring_HealBell: ; 38d1f or c ld c, a -.asm_38d37 +.next pop hl add hl, de dec b - jr nz, .asm_38d2c + jr nz, .loop pop hl ld a, c and a - jr z, .asm_38d52 + jr z, .no_status ld a, [EnemyMonStatus] and a - jr z, .asm_38d48 - + jr z, .ok dec [hl] - -.asm_38d48 - and $27 +.ok + and 1 << FRZ | SLP ret z call Function39527 - ret c dec [hl] dec [hl] ret -.asm_38d52 +.no_status ld a, [EnemyMonStatus] and a ret nz diff --git a/battle/core.asm b/battle/core.asm index 5503d307d..4586d2c9c 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2395,7 +2395,7 @@ Function3cf35: ; 3cf35 Function3cf4a: ; 3cf4a ld hl, EnemyHPPal - ld e, $30 + ld e, HP_BAR_LENGTH_PX call Function3e12e call WaitBGMap callba Function2c012 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index dc82b4500..ab1113237 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -5092,7 +5092,7 @@ BattleCommand4a: ; 35c0f ld a, [AttackMissed] and a jp nz, .asm_35c91 - ld bc, $0030 + ld bc, PartyMon2 - PartyMon1 ; ???? ld hl, EnemyMonMoves ld a, [hBattleTurn] and a @@ -5106,7 +5106,7 @@ BattleCommand4a: ; 35c0f cp STRUGGLE jr z, .asm_35c91 ld b, a - ld c, $ff + ld c, -1 .asm_35c33 inc c ld a, [hli] @@ -5114,9 +5114,9 @@ BattleCommand4a: ; 35c0f jr nz, .asm_35c33 ld [$d265], a dec hl - ld b, $0 + ld b, 0 push bc - ld c, $6 + ld c, BattleMonPP - BattleMonMoves add hl, bc pop bc ld a, [hl] @@ -7380,7 +7380,7 @@ Function36994: ; 36994 ld a, [PartyCount] ld d, a ld e, 0 - ld bc, $30 + ld bc, PartyMon2 - PartyMon1 .asm_3699d ld a, [CurBattleMon] cp e |