From 3540b2a2d646c1a9768a37a235b20adaa651c07a Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sun, 16 Sep 2018 02:15:55 +0200
Subject: [PATCH] wMonStatusFlags -> wDebugFlags

---
 constants/wram_constants.asm |  5 +++++
 engine/battle/core.asm       |  8 ++++----
 engine/menus/intro_menu.asm  |  2 +-
 engine/pokemon/move_mon.asm  |  4 ++--
 home.asm                     | 14 ++++++++------
 wram.asm                     |  2 +-
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 4d60f6f8d..f49f8fa90 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -1,6 +1,11 @@
 ; wInputType:: ; c2c7
 AUTO_INPUT EQU $ff
 
+; wDebugFlags:: ; c2cc
+	const_def
+	const DEBUG_BATTLE_F
+	const DEBUG_FIELD_F
+
 ; wCurDexMode:: ; c7d4
 	const_def
 	const DEXMODE_NEW
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 9ac99c587..6f76b6c5c 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2371,8 +2371,8 @@ WinTrainerBattle:
 	jr nz, .skip_heal
 	predef HealParty
 .skip_heal
-	ld a, [wMonStatusFlags]
-	bit 0, a
+	ld a, [wDebugFlags]
+	bit DEBUG_BATTLE_F, a
 	jr nz, .skip_win_loss_text
 	call PrintWinLossText
 
@@ -2921,8 +2921,8 @@ LostBattle:
 	ld c, 40
 	call DelayFrames
 
-	ld a, [wMonStatusFlags]
-	bit 0, a
+	ld a, [wDebugFlags]
+	bit DEBUG_BATTLE_F, a
 	jr nz, .skip_win_loss_text
 	call PrintWinLossText
 .skip_win_loss_text
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 3068269d1..df0cc4edc 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -60,7 +60,7 @@ OptionsMenu:
 
 NewGame:
 	xor a
-	ld [wMonStatusFlags], a
+	ld [wDebugFlags], a
 	call ResetWRAM
 	call NewGame_ClearTileMapEtc
 	call AreYouABoyOrAreYouAGirl
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 6e9d90d36..c67d210b9 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1194,8 +1194,8 @@ GiveEgg::
 	ld hl, wPartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
-	ld a, [wMonStatusFlags]
-	bit 1, a
+	ld a, [wDebugFlags]
+	bit DEBUG_FIELD_F, a
 	ld a, 1
 	jr nz, .got_init_happiness
 	ld a, [wBaseEggSteps]
diff --git a/home.asm b/home.asm
index 78315b0bf..f9f3575ec 100644
--- a/home.asm
+++ b/home.asm
@@ -56,9 +56,11 @@ INCLUDE "home/predef.asm"
 INCLUDE "home/window.asm"
 INCLUDE "home/flag.asm"
 
-Unreferenced_Function2ebb::
-	ld a, [wMonStatusFlags]
-	bit 1, a
+Unreferenced_CheckBPressedDebug::
+; Used in debug ROMs to walk through walls and avoid encounters.
+
+	ld a, [wDebugFlags]
+	bit DEBUG_FIELD_F, a
 	ret z
 
 	ldh a, [hJoyDown]
@@ -74,10 +76,10 @@ xor_a_dec_a::
 	dec a
 	ret
 
-Unreferenced_Function2ecb::
+Unreferenced_CheckFieldDebug::
 	push hl
-	ld hl, wMonStatusFlags
-	bit 1, [hl]
+	ld hl, wDebugFlags
+	bit DEBUG_FIELD_F, [hl]
 	pop hl
 	ret
 
diff --git a/wram.asm b/wram.asm
index 12c515e57..a50023705 100644
--- a/wram.asm
+++ b/wram.asm
@@ -141,7 +141,7 @@ wAutoInputAddress:: dw ; c2c8
 wAutoInputBank::    db ; c2ca
 wAutoInputLength::  db ; c2cb
 
-wMonStatusFlags:: db
+wDebugFlags:: db
 wGameLogicPaused:: db ; c2cd
 wSpriteUpdatesEnabled:: db