diff options
author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
---|---|---|
committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/specials.asm | |
parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/specials.asm')
-rw-r--r-- | engine/specials.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/specials.asm b/engine/specials.asm index 2548cf076..e88112286 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -2,9 +2,9 @@ Special:: ; c01b ; Run script special de. ld hl, SpecialsPointers - add hl,de - add hl,de - add hl,de + add hl, de + add hl, de + add hl, de ld b, [hl] inc hl ld a, [hli] @@ -618,9 +618,9 @@ SpecialGameboyCheck: ; c478 Special_FadeOutMusic: ; c48f ld a, MUSIC_NONE % $100 - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, MUSIC_NONE / $100 - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a ld a, $2 ld [MusicFade], a ret |