From f6d618090aa689540056a13fb74125d83879347f Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Thu, 13 Aug 2015 19:13:47 -0700
Subject: Named a test battle variable

---
 engine/battle/core.asm                  | 8 ++++----
 engine/battle/init_battle_variables.asm | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engine/battle')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index e2a9e5a7..97ca5ab1 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2634,7 +2634,7 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 	cp LINK_STATE_BATTLING
 	jr z, .matchedkeyspicked
 	ld a, [W_FLAGS_D733]
-	bit 0, a
+	bit BIT_TEST_BATTLE, a
 	ld b, D_UP | D_DOWN | A_BUTTON | B_BUTTON | SELECT
 	jr z, .matchedkeyspicked
 	ld b, $ff
@@ -2662,7 +2662,7 @@ SelectMenuItem: ; 3d2fe (f:52fe)
 	jr .select
 .battleselect
 	ld a, [W_FLAGS_D733]
-	bit 0, a
+	bit BIT_TEST_BATTLE, a
 	jr nz, .select
 	call PrintMenuItem
 	ld a, [wMenuItemToSwap]
@@ -6170,8 +6170,8 @@ GetCurrentMove: ; 3eabe (f:6abe)
 .player
 	ld de, W_PLAYERMOVENUM
 	ld a, [W_FLAGS_D733]
-	bit 0, a
-	ld a, [wccd9]
+	bit BIT_TEST_BATTLE, a
+	ld a, [wTestBattlePlayerSelectedMove]
 	jr nz, .selected
 	ld a, [wPlayerSelectedMove]
 .selected
diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm
index 071e5c67..6a4cd771 100644
--- a/engine/battle/init_battle_variables.asm
+++ b/engine/battle/init_battle_variables.asm
@@ -25,8 +25,8 @@ InitBattleVariables: ; 525af (14:65af)
 	ld [hli], a
 	dec b
 	jr nz, .loop
-	inc a
-	ld [wccd9], a
+	inc a ; POUND
+	ld [wTestBattlePlayerSelectedMove], a
 	ld a, [W_CURMAP]
 	cp SAFARI_ZONE_EAST
 	jr c, .notSafariBattle
-- 
cgit v1.2.3