diff options
author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-22 10:24:00 -0500 |
---|---|---|
committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-22 10:24:00 -0500 |
commit | c34156c5fb333864c1ae85036ea587c9f615a65a (patch) | |
tree | 70a98bceda2ec783da896bf3eb4efd1b0861c2a3 /scripts/route12gateupstairs.asm | |
parent | a6f04b434980f2176cb275a7c3ba50d5cbcd6ace (diff) | |
parent | dcc7f3bc9f41f2d5e0f7448b4688c1058da0040b (diff) |
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/route12gateupstairs.asm')
-rwxr-xr-x | scripts/route12gateupstairs.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index d4e8e983..f651d373 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -8,8 +8,7 @@ Route12GateUpstairsTextPointers: ; 49563 (12:5563) Route12GateUpstairsText1: ; 49569 (12:5569) TX_ASM - ld a, [wd7d7] - rrca + CheckEvent EVENT_GOT_TM39, 1 jr c, .asm_0ad3c ld hl, TM39PreReceiveText call PrintText @@ -18,8 +17,7 @@ Route12GateUpstairsText1: ; 49569 (12:5569) jr nc, .BagFull ld hl, ReceivedTM39Text call PrintText - ld hl, wd7d7 - set 0, [hl] + SetEvent EVENT_GOT_TM39 jr .asm_4ba56 .BagFull ld hl, TM39NoRoomText |