diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 01:05:34 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 01:05:34 -0400 |
| commit | 19656f9dee2671838983ab407e901bd6bb49006a (patch) | |
| tree | 2bdaaa8a7093eb4216de9d7b157477003ed6375d /home | |
| parent | Merge branch 'master' of github.com:pret/pokeyellow (diff) | |
| download | pokeyellow-19656f9dee2671838983ab407e901bd6bb49006a.tar.gz pokeyellow-19656f9dee2671838983ab407e901bd6bb49006a.tar.xz pokeyellow-19656f9dee2671838983ab407e901bd6bb49006a.zip | |
No more standalone WRAM addresses in the Event Flags array
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index e1312df1..f29cfd51 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -255,8 +255,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) jp nz, CheckMapConnections ; it seems like this check will never succeed (the other place where CheckMapConnections is run works) ; walking animation finished call StepCountCheck - ld a, [wd790] - bit 7, a ; in the safari zone? + CheckEvent EVENT_IN_SAFARI_ZONE ; in the safari zone? jr z, .notSafariZone callba SafariZoneCheckSteps ld a, [wSafariZoneGameOver] @@ -288,8 +287,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) ld a, [wCurMap] cp CINNABAR_GYM jr nz, .notCinnabarGym - ld hl, wd79b - set 7, [hl] + SetEvent EVENT_2A7 .notCinnabarGym ld hl, wd72e set 5, [hl] |