mirror of https://github.com/pret/pokecrystal.git
wMonStatusFlags -> wDebugFlags
This commit is contained in:
parent
387107b29e
commit
3540b2a2d6
|
@ -1,6 +1,11 @@
|
||||||
; wInputType:: ; c2c7
|
; wInputType:: ; c2c7
|
||||||
AUTO_INPUT EQU $ff
|
AUTO_INPUT EQU $ff
|
||||||
|
|
||||||
|
; wDebugFlags:: ; c2cc
|
||||||
|
const_def
|
||||||
|
const DEBUG_BATTLE_F
|
||||||
|
const DEBUG_FIELD_F
|
||||||
|
|
||||||
; wCurDexMode:: ; c7d4
|
; wCurDexMode:: ; c7d4
|
||||||
const_def
|
const_def
|
||||||
const DEXMODE_NEW
|
const DEXMODE_NEW
|
||||||
|
|
|
@ -2371,8 +2371,8 @@ WinTrainerBattle:
|
||||||
jr nz, .skip_heal
|
jr nz, .skip_heal
|
||||||
predef HealParty
|
predef HealParty
|
||||||
.skip_heal
|
.skip_heal
|
||||||
ld a, [wMonStatusFlags]
|
ld a, [wDebugFlags]
|
||||||
bit 0, a
|
bit DEBUG_BATTLE_F, a
|
||||||
jr nz, .skip_win_loss_text
|
jr nz, .skip_win_loss_text
|
||||||
call PrintWinLossText
|
call PrintWinLossText
|
||||||
|
|
||||||
|
@ -2921,8 +2921,8 @@ LostBattle:
|
||||||
ld c, 40
|
ld c, 40
|
||||||
call DelayFrames
|
call DelayFrames
|
||||||
|
|
||||||
ld a, [wMonStatusFlags]
|
ld a, [wDebugFlags]
|
||||||
bit 0, a
|
bit DEBUG_BATTLE_F, a
|
||||||
jr nz, .skip_win_loss_text
|
jr nz, .skip_win_loss_text
|
||||||
call PrintWinLossText
|
call PrintWinLossText
|
||||||
.skip_win_loss_text
|
.skip_win_loss_text
|
||||||
|
|
|
@ -60,7 +60,7 @@ OptionsMenu:
|
||||||
|
|
||||||
NewGame:
|
NewGame:
|
||||||
xor a
|
xor a
|
||||||
ld [wMonStatusFlags], a
|
ld [wDebugFlags], a
|
||||||
call ResetWRAM
|
call ResetWRAM
|
||||||
call NewGame_ClearTileMapEtc
|
call NewGame_ClearTileMapEtc
|
||||||
call AreYouABoyOrAreYouAGirl
|
call AreYouABoyOrAreYouAGirl
|
||||||
|
|
|
@ -1194,8 +1194,8 @@ GiveEgg::
|
||||||
ld hl, wPartyMon1Happiness
|
ld hl, wPartyMon1Happiness
|
||||||
ld bc, PARTYMON_STRUCT_LENGTH
|
ld bc, PARTYMON_STRUCT_LENGTH
|
||||||
call AddNTimes
|
call AddNTimes
|
||||||
ld a, [wMonStatusFlags]
|
ld a, [wDebugFlags]
|
||||||
bit 1, a
|
bit DEBUG_FIELD_F, a
|
||||||
ld a, 1
|
ld a, 1
|
||||||
jr nz, .got_init_happiness
|
jr nz, .got_init_happiness
|
||||||
ld a, [wBaseEggSteps]
|
ld a, [wBaseEggSteps]
|
||||||
|
|
14
home.asm
14
home.asm
|
@ -56,9 +56,11 @@ INCLUDE "home/predef.asm"
|
||||||
INCLUDE "home/window.asm"
|
INCLUDE "home/window.asm"
|
||||||
INCLUDE "home/flag.asm"
|
INCLUDE "home/flag.asm"
|
||||||
|
|
||||||
Unreferenced_Function2ebb::
|
Unreferenced_CheckBPressedDebug::
|
||||||
ld a, [wMonStatusFlags]
|
; Used in debug ROMs to walk through walls and avoid encounters.
|
||||||
bit 1, a
|
|
||||||
|
ld a, [wDebugFlags]
|
||||||
|
bit DEBUG_FIELD_F, a
|
||||||
ret z
|
ret z
|
||||||
|
|
||||||
ldh a, [hJoyDown]
|
ldh a, [hJoyDown]
|
||||||
|
@ -74,10 +76,10 @@ xor_a_dec_a::
|
||||||
dec a
|
dec a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Unreferenced_Function2ecb::
|
Unreferenced_CheckFieldDebug::
|
||||||
push hl
|
push hl
|
||||||
ld hl, wMonStatusFlags
|
ld hl, wDebugFlags
|
||||||
bit 1, [hl]
|
bit DEBUG_FIELD_F, [hl]
|
||||||
pop hl
|
pop hl
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
|
2
wram.asm
2
wram.asm
|
@ -141,7 +141,7 @@ wAutoInputAddress:: dw ; c2c8
|
||||||
wAutoInputBank:: db ; c2ca
|
wAutoInputBank:: db ; c2ca
|
||||||
wAutoInputLength:: db ; c2cb
|
wAutoInputLength:: db ; c2cb
|
||||||
|
|
||||||
wMonStatusFlags:: db
|
wDebugFlags:: db
|
||||||
wGameLogicPaused:: db ; c2cd
|
wGameLogicPaused:: db ; c2cd
|
||||||
wSpriteUpdatesEnabled:: db
|
wSpriteUpdatesEnabled:: db
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue