diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /audio | |
| parent | Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related fu... (diff) | |
| download | pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.gz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.xz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.zip | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine_1.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 39035834..9a83e563 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1556,7 +1556,7 @@ Audio1_HWChannelDisableMasks: ; 996a (2:596a) Audio1_9972: ; 9972 (2:5972) push af push bc - ld a, [W_OPTIONS] + ld a, [wOptions] and %110000 ; channel options srl a ld c, a |