Merge branch 'master' of https://github.com/pret/pokecrystal

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

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

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

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]

engine/tilesets/tileset_palettes.asm

@@ -123,12 +123,12 @@ LoadMansionPalette:
 	call FarCopyWRAM
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1 palette PAL_BG_WATER
-	ld hl, MansionPalette1 + 6 palettes
+	ld hl, MansionPalette1 palette 6
 	ld bc, 1 palettes
 	call FarCopyWRAM
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1 palette PAL_BG_ROOF
-	ld hl, MansionPalette1 + 8 palettes
+	ld hl, MansionPalette1 palette 8
 	ld bc, 1 palettes
 	call FarCopyWRAM
 	ret

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
 

wram.asm

@@ -141,7 +141,7 @@ wAutoInputAddress:: dw ; c2c8
 wAutoInputBank::    db ; c2ca
 wAutoInputLength::  db ; c2cb
 
-wMonStatusFlags:: db
+wDebugFlags:: db
 wGameLogicPaused:: db ; c2cd
 wSpriteUpdatesEnabled:: db