diff options
| author | dannye <33dannye@gmail.com> | 2020-11-06 23:11:17 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-06 23:11:17 -0600 |
| commit | 989545f0e03b7e32d8ea80d8ab4455576dbd7116 (patch) | |
| tree | b12573ca87d345ede7d40f7cf991032ee4b2650e /home | |
| parent | Ignore tools/pcm (diff) | |
| download | pokeyellow-989545f0e03b7e32d8ea80d8ab4455576dbd7116.tar.gz pokeyellow-989545f0e03b7e32d8ea80d8ab4455576dbd7116.tar.xz pokeyellow-989545f0e03b7e32d8ea80d8ab4455576dbd7116.zip | |
Start disassembling debug yellow
non matching
Diffstat (limited to 'home')
| -rw-r--r-- | home/npc_movement.asm | 8 | ||||
| -rw-r--r-- | home/trainers.asm | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/home/npc_movement.asm b/home/npc_movement.asm index 200d3983..40942bf3 100644 --- a/home/npc_movement.asm +++ b/home/npc_movement.asm @@ -49,4 +49,12 @@ EndNPCMovementScript:: farjp _EndNPCMovementScript DebugPressedOrHeldB:: +IF DEF(_DEBUG) + ldh a, [hJoyHeld] + bit BIT_B_BUTTON, a + ret nz + ldh a, [hJoyPressed] + bit BIT_B_BUTTON, a + ret +ENDC ret diff --git a/home/trainers.asm b/home/trainers.asm index f407652a..468b63f8 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -127,6 +127,10 @@ 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 |