From 19656f9dee2671838983ab407e901bd6bb49006a Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 8 Jun 2016 01:05:34 -0400 Subject: No more standalone WRAM addresses in the Event Flags array --- home/overworld.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'home') 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] -- cgit v1.3.1-sl0p