mirror of
https://github.com/pret/pokeyellow.git
synced 2026-04-25 07:58:09 -05:00
Merge branch 'master' into codex/fix-game-crash-on-fainting-due-to-poison-8i57ah
This commit is contained in:
commit
3ecefa8ae5
|
|
@ -1288,17 +1288,11 @@ IsEnemyMonSpeciesInPlayerPCBox:
|
|||
ld a, [hl]
|
||||
ld c, a
|
||||
inc hl
|
||||
ld a, c
|
||||
cp MONS_PER_BOX + 1
|
||||
jr c, .scanSpeciesLoop
|
||||
ld c, MONS_PER_BOX
|
||||
.scanSpeciesLoop
|
||||
ld a, c
|
||||
and a
|
||||
jr z, .notInBox
|
||||
ld a, [hli]
|
||||
cp -1
|
||||
jr z, .notInBox
|
||||
ld b, a
|
||||
ld a, [wEnemyMonSpecies]
|
||||
cp b
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user