summaryrefslogtreecommitdiff
path: root/scripts/silphco11.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-21 10:36:03 -0700
committerYamaArashi <shadow962@live.com>2015-07-21 10:36:03 -0700
commit73171bfff573fa8900563319c014f3e626db6b3e (patch)
tree402ca266578eb759a30f52e05b031bad93d45ee6 /scripts/silphco11.asm
parentcbcdb2ec2a013beba4f321988e393419a8eed10e (diff)
named most of the used events
Diffstat (limited to 'scripts/silphco11.asm')
-rwxr-xr-xscripts/silphco11.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index b855e6d0..8f37b57f 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -16,7 +16,7 @@ SilphCo11Script_62110: ; 62110 (18:6110)
ld hl, DataTable_62134
call SilphCo11Script_62137
call SilphCo11Script_62163
- CheckEvent EVENT_788
+ CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
ret nz
ld a, $20
ld [wd09f], a
@@ -66,7 +66,7 @@ SilphCo11Script_62163: ; 62163 (18:6163)
ld a, [$ffe0]
and a
ret z
- SetEvent EVENT_788
+ SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
ret
SilphCo11Script_6216d: ; 6216d (18:616d)
@@ -162,7 +162,7 @@ SilphCo11ScriptPointers: ; 621cf (18:61cf)
dw SilphCo11Script5
SilphCo11Script0: ; 621db (18:61db)
- CheckEvent EVENT_78F
+ CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ret nz
ld hl, CoordsData_62211
call ArePlayerCoordsInArray
@@ -228,7 +228,7 @@ SilphCo11Script5: ; 62227 (18:6227)
call UpdateSprites
call Delay3
call GBFadeInFromBlack
- SetEvent EVENT_78F
+ SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI
xor a
ld [wJoyIgnore], a
jp SilphCo11Script_621c8
@@ -302,7 +302,7 @@ SilphCo11TrainerHeader1: ; 622cf (18:62cf)
SilphCo11Text1: ; 622dc (18:62dc)
TX_ASM
- CheckEvent EVENT_78D
+ CheckEvent EVENT_GOT_MASTER_BALL
jp nz, .asm_62308
ld hl, SilphCoPresidentText
call PrintText
@@ -311,7 +311,7 @@ SilphCo11Text1: ; 622dc (18:62dc)
jr nc, .BagFull
ld hl, ReceivedSilphCoMasterBallText
call PrintText
- SetEvent EVENT_78D
+ SetEvent EVENT_GOT_MASTER_BALL
jr .asm_6230e
.BagFull
ld hl, SilphCoMasterBallNoRoomText