diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-04 10:57:46 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-04 10:57:46 -0400 |
| commit | 39a7f59931e03e4ebd155e061ac6e71a6d6bd97a (patch) | |
| tree | 2601e63dcfc316ed96c20887897b2d244782d354 /engine/overworld | |
| parent | 3d651a7c49317e9c2b55bffcb589bf2e1e2b4ccd (diff) | |
Clean up specials and swarms.
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/time.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/wildmons.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index 17ddbd6a..d5c45cc4 100755 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -177,13 +177,13 @@ CheckUnusedTwoDayTimer: ; unused ld hl, wDailyFlags1 - set DAILYFLAGS1_FISH_SWARM_F, [hl] + set DAILYFLAGS1_SWARM_F, [hl] ret ; unused and a ld hl, wDailyFlags1 - bit DAILYFLAGS1_FISH_SWARM_F, [hl] + bit DAILYFLAGS1_SWARM_F, [hl] ret nz scf ret diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index bd839dae..c06020e1 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -430,10 +430,10 @@ _JohtoWildmonCheck: _SwarmWildmonCheck: call CopyCurrMapDE - ld a, [wDunsparceMapGroup] + ld a, [wSwarmMapGroup] cp d jr nz, _NoSwarmWildmon - ld a, [wDunsparceMapNumber] + ld a, [wSwarmMapNumber] cp e jr nz, _NoSwarmWildmon call LookUpWildmonsForMapDE |