mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
wMonStatusFlags -> wDebugFlags
This commit is contained in:
parent
387107b29e
commit
3540b2a2d6
@ -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
|
||||
|
@ -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
|
||||
|
@ -60,7 +60,7 @@ OptionsMenu:
|
||||
|
||||
NewGame:
|
||||
xor a
|
||||
ld [wMonStatusFlags], a
|
||||
ld [wDebugFlags], a
|
||||
call ResetWRAM
|
||||
call NewGame_ClearTileMapEtc
|
||||
call AreYouABoyOrAreYouAGirl
|
||||
|
@ -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]
|
||||
|
14
home.asm
14
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user