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/silphco1.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/silphco1.asm')
| -rwxr-xr-x | scripts/silphco1.asm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm index 8a399a4c..71b59d72 100755 --- a/scripts/silphco1.asm +++ b/scripts/silphco1.asm @@ -1,13 +1,10 @@ SilphCo1Script: ; 5d44e (17:544e) call EnableAutoTextBoxDrawing - ld a, [wd838] - bit 7, a + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ret z - ld hl, wd7b9 - bit 7, [hl] - set 7, [hl] + CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK ret nz - ld a, HS_SILPH_CO_1F_1 + ld a, HS_SILPH_CO_1F_RECEPTIONIST ld [wcc4d], a predef_jump ShowObject |