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

---
 scripts/blueshouse.asm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'scripts/blueshouse.asm')

diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm
index 5d6f1f83..17b182f5 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -9,8 +9,7 @@ BluesHouseScriptPointers: ; 19b47 (6:5b47)
 	dw BluesHouseScript1
 
 BluesHouseScript0: ; 19b4b (6:5b4b)
-	ld hl,wd74a
-	set 1,[hl]
+	SetEvent EVENT_019
 
 	; trigger the next script
 	ld a,1
@@ -27,11 +26,9 @@ BluesHouseTextPointers: ; 19b57 (6:5b57)
 
 BluesHouseText1: ; 19b5d (6:5b5d)
 	TX_ASM
-	ld a,[wd74a]
-	bit 0,a
+	CheckEvent EVENT_018
 	jr nz,.GotMap
-	ld a,[wd74b]
-	bit 5,a
+	CheckEvent EVENT_GOT_POKEDEX
 	jr nz,.GiveMap
 	ld hl,DaisyInitialText
 	call PrintText
@@ -47,8 +44,7 @@ BluesHouseText1: ; 19b5d (6:5b5d)
 	predef HideObject ; hide table map object
 	ld hl,GotMapText
 	call PrintText
-	ld hl,wd74a
-	set 0,[hl]
+	SetEvent EVENT_018
 	jr .done
 .GotMap
 	ld hl,DaisyUseMapText
-- 
cgit v1.3.1-sl0p