Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-04-26 01:31:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
robjlyons 2026-02-11 13:19:26 +00:00 committed by GitHub
commit 6d81b0180c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine/battle/core.asm
View File

@ -1197,12 +1197,19 @@ EnsureEncounterCatchFlagsInitialized:
ret
EnableEncounterCatchSRAM_Battle:
ld a, BMODE_ADVANCED
ld [rBMODE], a
ld a, RAMG_SRAM_ENABLE
ld [rRAMG], a
ld a, BANK(sMapEncounterCatchFlags)
call OpenSRAM
ld [rRAMB], a
ret
DisableEncounterCatchSRAM_Battle:
call CloseSRAM
ld a, BMODE_SIMPLE ; preserve flags
ld [rBMODE], a
ASSERT RAMG_SRAM_DISABLE == BMODE_SIMPLE
ld [rRAMG], a
ret
; Returns non-zero if the current wild enemy species is in the player's party or PC boxes.
@ -1277,8 +1284,9 @@ IsEnemyMonSpeciesInPlayerPCBox:
ld a, [hli]
ld h, [hl]
ld l, a
call EnableEncounterCatchSRAM_Battle
ld a, b
call OpenSRAM
ld [rRAMB], a
ld a, [hl]
ld c, a
inc hl
@ -1300,11 +1308,11 @@ IsEnemyMonSpeciesInPlayerPCBox:
dec c
jr .scanSpeciesLoop
.inBox
call CloseSRAM
call DisableEncounterCatchSRAM_Battle
ld a, 1
ret
.notInBox
call CloseSRAM
call DisableEncounterCatchSRAM_Battle
xor a
ret