diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /home/audio.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'home/audio.asm')
| -rw-r--r-- | home/audio.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home/audio.asm b/home/audio.asm index 21e4f81f9..35f98af4d 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -461,7 +461,7 @@ SpecialMapMusic:: ; 3d62 cp PLAYER_SURF_PIKA jr z, .surf - ld a, [StatusFlags2] + ld a, [wStatusFlags2] bit 2, a jr nz, .contest |