From 453107ab8ac6a7b76d21c466e32aa7290643724d Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 7 Nov 2020 14:35:40 -0600
Subject: More debug yellow only debug menu left

---
 engine/battle/core.asm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'engine/battle')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 01074b74..3957795b 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2710,6 +2710,14 @@ SelectMenuItem:
 	jp nz, SelectMenuItem_CursorDown ; down
 	bit 2, a
 	jp nz, SwapMovesInMenu ; select
+IF DEF(_DEBUG)
+	bit BIT_START, a
+	jp nz, Func_3d4f5
+	bit BIT_D_RIGHT, a
+	jp nz, Func_3d529
+	bit BIT_D_LEFT, a
+	jp nz, Func_3d523
+ENDC
 	bit 1, a ; B, but was it reset above?
 	push af
 	xor a
@@ -2904,6 +2912,11 @@ NoMovesLeftText:
 	text_end
 
 SwapMovesInMenu:
+IF DEF(_DEBUG)
+	ld a, [wFlags_D733]
+	bit BIT_TEST_BATTLE, a
+	jp nz, Func_3d4f5
+ENDC
 	ld a, [wPlayerBattleStatus3]
 	bit TRANSFORMED, a
 	jp nz, MoveSelectionMenu
-- 
cgit v1.3.1-sl0p


From 70ec5344670558f6678c7f5e13e4f906e81f55e8 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 7 Nov 2020 21:07:31 -0600
Subject: Use more joypad constants

---
 engine/battle/core.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engine/battle')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 3957795b..415b287c 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2704,12 +2704,12 @@ SelectMenuItem:
 	call HandleMenuInput
 	ld hl, hFlagsFFFA
 	res 1, [hl]
-	bit 6, a
-	jp nz, SelectMenuItem_CursorUp ; up
-	bit 7, a
-	jp nz, SelectMenuItem_CursorDown ; down
-	bit 2, a
-	jp nz, SwapMovesInMenu ; select
+	bit BIT_D_UP, a
+	jp nz, SelectMenuItem_CursorUp
+	bit BIT_D_DOWN, a
+	jp nz, SelectMenuItem_CursorDown
+	bit BIT_SELECT, a
+	jp nz, SwapMovesInMenu
 IF DEF(_DEBUG)
 	bit BIT_START, a
 	jp nz, Func_3d4f5
@@ -2718,7 +2718,7 @@ IF DEF(_DEBUG)
 	bit BIT_D_LEFT, a
 	jp nz, Func_3d523
 ENDC
-	bit 1, a ; B, but was it reset above?
+	bit BIT_B_BUTTON, a
 	push af
 	xor a
 	ld [wMenuItemToSwap], a
-- 
cgit v1.3.1-sl0p