From 73171bfff573fa8900563319c014f3e626db6b3e Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Tue, 21 Jul 2015 10:36:03 -0700
Subject: named most of the used events

---
 scripts/pokemontower2.asm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'scripts/pokemontower2.asm')

diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm
index a9619170..c7b94c4f 100755
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -17,7 +17,7 @@ PokemonTower2ScriptPointers: ; 60509 (18:4509)
 	dw PokemonTower2Script2
 
 PokemonTower2Script0: ; 6050f (18:450f)
-	CheckEvent EVENT_0EF
+	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	ret nz
 	ld hl, CoordsData_6055e
 	call ArePlayerCoordsInArray
@@ -28,13 +28,14 @@ PokemonTower2Script0: ; 6050f (18:450f)
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
-	ResetEvent EVENT_0EE
+	ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
 	ld a, [wCoordIndex]
 	cp $1
 	ld a, PLAYER_DIR_UP
 	ld b, SPRITE_FACING_DOWN
 	jr nz, .asm_60544
-	SetEvent EVENT_0EE
+; the rival is on the left side and the player is on the right side
+	SetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
 	ld a, PLAYER_DIR_LEFT
 	ld b, SPRITE_FACING_RIGHT
 .asm_60544
@@ -63,12 +64,12 @@ PokemonTower2Script1: ; 60563 (18:4563)
 	jp z, PokemonTower2Script_604fe
 	ld a, $f0
 	ld [wJoyIgnore], a
-	SetEvent EVENT_0EF
+	SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	ld a, $1
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld de, MovementData_605b2
-	CheckEvent EVENT_0EE
+	CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
 	jr nz, .asm_60589
 	ld de, MovementData_605a9
 .asm_60589
@@ -127,7 +128,7 @@ PokemonTower2TextPointers: ; 605db (18:45db)
 
 PokemonTower2Text1: ; 605df (18:45df)
 	TX_ASM
-	CheckEvent EVENT_0EF
+	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	jr z, .asm_16f24
 	ld hl, PokemonTower2Text_6063c
 	call PrintText
-- 
cgit v1.3.1-sl0p