From 989545f0e03b7e32d8ea80d8ab4455576dbd7116 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Fri, 6 Nov 2020 23:11:17 -0600
Subject: Start disassembling debug yellow non matching

---
 home/npc_movement.asm | 8 ++++++++
 home/trainers.asm     | 4 ++++
 2 files changed, 12 insertions(+)

(limited to 'home')

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
-- 
cgit v1.3.1-sl0p