Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-09-14 13:35:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update item_effects.asm

Browse Source
This commit is contained in:
robjlyons
2026-02-11 08:57:03 +00:00
committed by GitHub
parent e587a236cf
commit 97b5eaec3a
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
engine/items/item_effects.asm
View File

@@ -2642,25 +2642,31 @@ ThrowBallAtUsedEncounterText:
text_end
MarkWildEncounterCatchUsedItem:
ld a, [wBattleType]
and a
ret nz
ld a, [wIsInBattle]
dec a
ret nz
ld a, [wWildEncounterCanCatch]
and a
ret z
call EnableEncounterCatchSRAM_Item
ld a, [wCurMap]
ld c, a
ld b, FLAG_RESET
ld hl, sMapEncounterCatchFlags
predef FlagActionPredef
call DisableEncounterCatchSRAM_Item
xor a
ld [wWildEncounterCanCatch], a
ret
push af
ld a, [wBattleType]
and a
jr nz, .done
ld a, [wIsInBattle]
dec a
jr nz, .done
ld a, [wWildEncounterCanCatch]
and a
jr z, .done
call EnableEncounterCatchSRAM_Item
ld a, [wCurMap]
ld c, a
ld b, FLAG_RESET
ld hl, sMapEncounterCatchFlags
predef FlagActionPredef
call DisableEncounterCatchSRAM_Item
xor a
ld [wWildEncounterCanCatch], a
.done
pop af
ret
EnableEncounterCatchSRAM_Item:
ld a, $0A