From dfc152d667e3695f83eb0fbabb839b0fad275ceb Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 10 Aug 2015 11:09:16 -0500 Subject: No more $C8 Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers --- audio.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'audio.asm') 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 -- cgit v1.3.1-sl0p