aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lab3.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-22 10:24:00 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-22 10:24:00 -0500
commitc34156c5fb333864c1ae85036ea587c9f615a65a (patch)
tree70a98bceda2ec783da896bf3eb4efd1b0861c2a3 /scripts/lab3.asm
parentUnify audio bank references (diff)
parentnamed more constants (diff)
downloadpokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.tar.gz
pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.tar.xz
pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.zip
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/lab3.asm')
-rwxr-xr-xscripts/lab3.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/lab3.asm b/scripts/lab3.asm
index e91d36f3..59b04b8c 100755
--- a/scripts/lab3.asm
+++ b/scripts/lab3.asm
@@ -10,8 +10,7 @@ Lab3TextPointers: ; 75c8a (1d:5c8a)
Lab3Text1: ; 75c94 (1d:5c94)
TX_ASM
- ld a, [wd7a1]
- bit 7, a
+ CheckEvent EVENT_GOT_TM35
jr nz, .asm_e551a
ld hl, TM35PreReceiveText
call PrintText
@@ -20,8 +19,7 @@ Lab3Text1: ; 75c94 (1d:5c94)
jr nc, .BagFull
ld hl, ReceivedTM35Text
call PrintText
- ld hl, wd7a1
- set 7, [hl]
+ SetEvent EVENT_GOT_TM35
jr .asm_eb896
.BagFull
ld hl, TM35NoRoomText