diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 08:19:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 08:19:11 -0400 |
| commit | d3a01f777d2bbb3bc5ec6822af893d16fda19936 (patch) | |
| tree | 20c078b267b5b35055f30e64e726931e63031166 /home/trainers.asm | |
| parent | Merge pull request #274 from Rangi42/master (diff) | |
| parent | Disassemble the BLUEMONS.GB debug ROM (diff) | |
| download | pokeyellow-d3a01f777d2bbb3bc5ec6822af893d16fda19936.tar.gz pokeyellow-d3a01f777d2bbb3bc5ec6822af893d16fda19936.tar.xz pokeyellow-d3a01f777d2bbb3bc5ec6822af893d16fda19936.zip | |
Merge pull request #275 from Rangi42/master
Disassemble the BLUEMONS.GB debug ROM
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/home/trainers.asm b/home/trainers.asm index 37e36c2f..fae3dde1 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -126,10 +126,15 @@ 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 jr nz, .trainerEngaging +.trainerNotEngaging xor a ld [wSpriteIndex], a ld [wTrainerHeaderFlagBit], a |