diff options
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/home/trainers.asm b/home/trainers.asm index 4dc63fef..f407652a 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -127,10 +127,6 @@ TalkToTrainer:: ; checks if any trainers are seeing the player and wanting to fight CheckFightingMapTrainers:: -IF DEF(_DEBUG) - call DebugPressedOrHeldB - jr nz, .trainerNotEngaging -ENDC call CheckForEngagingTrainers ld a, [wSpriteIndex] cp $ff @@ -383,17 +379,6 @@ TrainerEndBattleText:: call TextCommandProcessor jp TextScriptEnd -; only engage with the trainer if the player is not already -; engaged with another trainer -; XXX unused? -CheckIfAlreadyEngaged:: - ld a, [wFlags_0xcd60] - bit 0, a - ret nz - call EngageMapTrainer - xor a - ret - PlayTrainerMusic:: ld a, [wEngagedTrainerClass] cp OPP_RIVAL1 @@ -407,8 +392,7 @@ PlayTrainerMusic:: ret nz xor a ld [wAudioFadeOutControl], a - ld a, SFX_STOP_ALL_MUSIC - call PlaySound + call StopAllMusic ld a, BANK(Music_MeetEvilTrainer) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a |