summaryrefslogtreecommitdiff
path: root/scripts/ssanne7.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-20 18:32:02 -0700
committerYamaArashi <shadow962@live.com>2015-07-20 18:32:26 -0700
commitfcab935a0f449246380480613ac0896e0b90a0d8 (patch)
tree60391cf3fa91cc8173d13cc9fd75c050d9898e0c /scripts/ssanne7.asm
parent13e28b0ece7c7888cba792cc6f7219b384213427 (diff)
enumerate events
Diffstat (limited to 'scripts/ssanne7.asm')
-rwxr-xr-xscripts/ssanne7.asm12
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm
index a1fd791a..a47cc069 100755
--- a/scripts/ssanne7.asm
+++ b/scripts/ssanne7.asm
@@ -3,8 +3,7 @@ SSAnne7Script: ; 61895 (18:5895)
jp EnableAutoTextBoxDrawing
SSAnne7Script_6189b: ; 6189b (18:589b)
- ld a, [wd803]
- bit 1, a
+ CheckEvent EVENT_5E1
ret nz
ld hl, wd72d
set 5, [hl]
@@ -17,8 +16,7 @@ SSAnne7TextPointers: ; 618a7 (18:58a7)
SSAnne7Text1: ; 618ad (18:58ad)
TX_ASM
- ld a, [wd803]
- bit 0, a
+ CheckEvent EVENT_5E0
jr nz, .asm_797c4
ld hl, SSAnne7RubText
call PrintText
@@ -29,8 +27,7 @@ SSAnne7Text1: ; 618ad (18:58ad)
jr nc, .BagFull
ld hl, ReceivedHM01Text
call PrintText
- ld hl, wd803
- set 0, [hl]
+ SetEvent EVENT_5E0
jr .asm_0faf5
.BagFull
ld hl, HM01NoRoomText
@@ -65,8 +62,7 @@ SSAnne7RubText: ; 618ec (18:58ec)
cp MUSIC_PKMN_HEALED
jr z, .asm_61910
call PlayDefaultMusic
- ld hl, wd803
- set 1, [hl]
+ SetEvent EVENT_5E1
ld hl, wd72d
res 5, [hl]
jp TextScriptEnd