From fcab935a0f449246380480613ac0896e0b90a0d8 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Mon, 20 Jul 2015 18:32:02 -0700
Subject: enumerate events

---
 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 cc5e9f5e..9b60d7e9 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -287,8 +287,7 @@ OverworldLoopLessDelay::
 	ld hl,wd72c
 	res 0,[hl] ; indicate that the player has stepped thrice since the last battle
 .doneStepCounting
-	ld a,[wd790]
-	bit 7,a ; in the safari zone?
+	CheckEvent EVENT_IN_SAFARI_ZONE
 	jr z,.notSafariZone
 	callba SafariZoneCheckSteps
 	ld a,[wSafariZoneGameOver]
@@ -320,8 +319,7 @@ OverworldLoopLessDelay::
 	ld a,[W_CURMAP]
 	cp a,CINNABAR_GYM
 	jr nz,.notCinnabarGym
-	ld hl,wd79b
-	set 7,[hl]
+	SetEvent EVENT_2A7
 .notCinnabarGym
 	ld hl,wd72e
 	set 5,[hl]
-- 
cgit v1.2.3