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/celadonmart3.asm | |
| parent | Unify audio bank references (diff) | |
| parent | named more constants (diff) | |
| download | pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.tar.gz pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.tar.xz pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.zip | |
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/celadonmart3.asm')
| -rwxr-xr-x | scripts/celadonmart3.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 46e58d8c..f525d0af 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -22,16 +22,14 @@ CeladonMart3TextPointers: ; 48228 (12:4228) CeladonMart3Text1: ; 4824a (12:424a) TX_ASM - ld a, [wd778] - bit 7, a + CheckEvent EVENT_GOT_TM18 jr nz, .asm_a5463 ld hl, TM18PreReceiveText call PrintText ld bc, (TM_18 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, wd778 - set 7, [hl] + SetEvent EVENT_GOT_TM18 ld hl, ReceivedTM18Text jr .asm_81359 .BagFull |