summaryrefslogtreecommitdiff
path: root/scripts/celadongym.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-20 19:41:23 -0700
committerYamaArashi <shadow962@live.com>2015-07-20 19:41:23 -0700
commitfd2b4b6c74e324f423cd3a5aac0428eae12b7620 (patch)
tree3ab359d55a9327c4649bcc96e9fd42c5994fe088 /scripts/celadongym.asm
parentfcab935a0f449246380480613ac0896e0b90a0d8 (diff)
gym leader events
Diffstat (limited to 'scripts/celadongym.asm')
-rwxr-xr-xscripts/celadongym.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index 1e2959dd..9d761a31 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -46,14 +46,14 @@ CeladonGymText_48963: ; 48963 (12:4963)
ld a, $9
ld [hSpriteIndexOrTextID], a
call DisplayTextID
- SetEvent EVENT_1A9
+ SetEvent EVENT_BEAT_ERIKA
ld bc, (TM_21 << 8) | 1
call GiveItem
jr nc, .BagFull
ld a, $a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
- SetEvent EVENT_1A8
+ SetEvent EVENT_GOT_TM21
jr .asm_4898c
.BagFull
ld a, $b
@@ -151,9 +151,9 @@ CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
CeladonGymText1: ; 48a11 (12:4a11)
TX_ASM
- CheckEvent EVENT_1A9
+ CheckEvent EVENT_BEAT_ERIKA
jr z, .asm_48a2d
- CheckEventReuseA EVENT_1A8
+ CheckEventReuseA EVENT_GOT_TM21
jr nz, .asm_48a25
call z, CeladonGymText_48963
call DisableWaitingAfterTextDisplay