Merge branch 'master' into codex/fix-game-crash-on-fainting-due-to-poison-8i57ah

This commit is contained in:
robjlyons 2026-02-11 12:19:03 +00:00 committed by GitHub
commit 3ecefa8ae5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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