diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 19:34:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 19:34:43 -0500 |
| commit | 82a05a1752b476caab8951fe03f539dcc1a63669 (patch) | |
| tree | 972f867159ded40695e868338bb697a303335b62 /engine/wildmons.asm | |
| parent | e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff) | |
| parent | 50fc9c3389ae8130d3670683f22f3e49555c57a3 (diff) | |
Merge pull request #443 from xCrystal/master
Misc style cleanup and documentation
Diffstat (limited to 'engine/wildmons.asm')
| -rwxr-xr-x | engine/wildmons.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 9aed7017a..dc62093b8 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -336,7 +336,7 @@ ChooseWildEncounter: ; 2a14f cp UNOWN jr nz, .done - ld a, [UnlockedUnowns] + ld a, [wUnlockedUnowns] and a jr z, .nowildbattle @@ -428,7 +428,7 @@ _JohtoWildmonCheck _SwarmWildmonCheck call CopyCurrMapDE push hl - ld hl, SwarmFlags + ld hl, wSwarmFlags bit 2, [hl] pop hl jr z, .CheckYanma @@ -445,7 +445,7 @@ _SwarmWildmonCheck .CheckYanma: push hl - ld hl, SwarmFlags + ld hl, wSwarmFlags bit 3, [hl] pop hl jr z, _NoSwarmWildmon |