Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-23 02:30:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526

Browse Source 
# Conflicts:
#	src/battle_anim_poison.c
#	src/pokemon.c
#	src/pokemon_icon.c
This commit is contained in:
Eduardo Quezada
2024-05-26 18:34:26 -04:00
parent c279aa23c6 18f84b78f2
commit 9e72271c8e
11 changed files with 105 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/scripts/safari_zone.inc
View File

@@ -53,6 +53,9 @@ SafariZone_EventScript_ChoosePokeblock::
special OpenPokeblockCaseOnFeeder
waitstate
goto_if_ne VAR_RESULT, 0xFFFF, SafariZone_EventScript_PokeblockPlaced
#ifdef BUGFIX
releaseall @ Only gets called from EventScript_PokeBlockFeeder which uses lockall.
#endif
end
SafariZone_EventScript_PokeblockPlaced::