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.asm | |
| parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) | |
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.asm')
| -rw-r--r-- | audio.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -361,13 +361,13 @@ PlayBattleMusic:: ; 9064 (2:5064) call StopAllMusic call DelayFrame ld c, $8 ; BANK(Music_GymLeaderBattle) - ld a, [W_GYMLEADERNO] + ld a, [wGymLeaderNo] and a jr z, .notGymLeaderBattle ld a, $ea ; MUSIC_GYM_LEADER_BATTLE jr .playSong .notGymLeaderBattle - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] cp 200 jr c, .wildBattle cp OPP_SONY3 |