Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline NoSwarmWildmon label (#1199)

Browse Source
This commit is contained in:
Linus Unnebäck
2025-08-15 22:08:52 +02:00
committed by GitHub
parent 9e7a4f91dd
commit b1f8d423a2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/overworld/wildmons.asm
View File

@@ -425,7 +425,7 @@ _SwarmWildmonCheck:
cp e cp e
jr nz, .CheckYanma jr nz, .CheckYanma
call LookUpWildmonsForMapDE call LookUpWildmonsForMapDE
jr nc, _NoSwarmWildmon jr nc, .noSwarm
scf scf
ret ret
@@ -434,19 +434,19 @@ _SwarmWildmonCheck:
ld hl, wSwarmFlags ld hl, wSwarmFlags
bit SWARMFLAGS_YANMA_SWARM_F, [hl] bit SWARMFLAGS_YANMA_SWARM_F, [hl]
pop hl pop hl
jr z, _NoSwarmWildmon jr z, .noSwarm
ld a, [wYanmaMapGroup] ld a, [wYanmaMapGroup]
cp d cp d
jr nz, _NoSwarmWildmon jr nz, .noSwarm
ld a, [wYanmaMapNumber] ld a, [wYanmaMapNumber]
cp e cp e
jr nz, _NoSwarmWildmon jr nz, .noSwarm
call LookUpWildmonsForMapDE call LookUpWildmonsForMapDE
jr nc, _NoSwarmWildmon jr nc, .noSwarm
scf scf
ret ret
_NoSwarmWildmon: .noSwarm:
and a and a
ret ret