summaryrefslogtreecommitdiff
path: root/scripts/saffronhouse2.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/saffronhouse2.asm
parent13e28b0ece7c7888cba792cc6f7219b384213427 (diff)
enumerate events
Diffstat (limited to 'scripts/saffronhouse2.asm')
-rwxr-xr-xscripts/saffronhouse2.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm
index b7d8ed26..68300183 100755
--- a/scripts/saffronhouse2.asm
+++ b/scripts/saffronhouse2.asm
@@ -6,8 +6,7 @@ SaffronHouse2TextPointers: ; 1de3f (7:5e3f)
SaffronHouse2Text1: ; 1de41 (7:5e41)
TX_ASM
- ld a, [wd7bd]
- bit 0, a
+ CheckEvent EVENT_3B0
jr nz, .asm_9e72b
ld hl, TM29PreReceiveText
call PrintText
@@ -16,8 +15,7 @@ SaffronHouse2Text1: ; 1de41 (7:5e41)
jr nc, .BagFull
ld hl, ReceivedTM29Text
call PrintText
- ld hl, wd7bd
- set 0, [hl]
+ SetEvent EVENT_3B0
jr .asm_fe4e1
.BagFull
ld hl, TM29NoRoomText