summaryrefslogtreecommitdiff
path: root/audio.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
commitdfc152d667e3695f83eb0fbabb839b0fad275ceb (patch)
tree37255b78ab19c520a651ec68ca10a9f43ebe07d7 /audio.asm
parent31d267d4ad87042dbdd30be645ad4b43e4e3ceb1 (diff)
No more $C8
Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/audio.asm b/audio.asm
index 037145d8..55bf4a1b 100644
--- a/audio.asm
+++ b/audio.asm
@@ -378,11 +378,11 @@ PlayBattleMusic:: ; 0x90c6
jr .playSong
.notGymLeaderBattle
ld a, [W_CUROPPONENT]
- cp $c8
+ cp 200
jr c, .wildBattle
- cp SONY3 + $c8
+ cp OPP_SONY3
jr z, .finalBattle
- cp LANCE + $c8
+ cp OPP_LANCE
jr nz, .normalTrainerBattle
ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme
jr .playSong