wMonStatusFlags -> wDebugFlags

This commit is contained in:
mid-kid
2018-09-16 02:15:55 +02:00
parent 387107b29e
commit 3540b2a2d6
6 changed files with 21 additions and 14 deletions

View File

@@ -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

View File

@@ -60,7 +60,7 @@ OptionsMenu:
NewGame:
xor a
ld [wMonStatusFlags], a
ld [wDebugFlags], a
call ResetWRAM
call NewGame_ClearTileMapEtc
call AreYouABoyOrAreYouAGirl

View File

@@ -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]