Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Day-Care bit flags

Browse Source
This commit is contained in:
Rangi
2018-01-22 13:18:23 -05:00
parent 7cef012335
commit e135091f09
6 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/breeding.asm
View File

@@ -288,7 +288,7 @@ HatchEggs: ; 16f70 (5:6f70)
push hl
ld bc, MON_STAT_EXP - 1
add hl, bc
ld b, $0
ld b, FALSE
predef CalcPkmnStats
pop bc
ld hl, MON_MAXHP
@@ -705,7 +705,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
call DisableLCD
ld hl, EggHatchGFX
ld de, vTiles0 tile $00
ld bc, $20
ld bc, 2 tiles
ld a, BANK(EggHatchGFX)
call FarCopyBytes
farcall ClearSpriteAnims
@@ -893,7 +893,7 @@ Special_DayCareMon1: ; 17421
ld a, [wBreedMon1Species]
call PlayMonCry
ld a, [wDayCareLady]
bit 0, a
bit DAYCARELADY_HAS_MON_F, a
jr z, DayCareMonCursor
call ButtonSound
ld hl, wBreedMon2Nick
@@ -906,7 +906,7 @@ Special_DayCareMon2: ; 17440
ld a, [wBreedMon2Species]
call PlayMonCry
ld a, [wDayCareMan]
bit 0, a
bit DAYCAREMAN_HAS_MON_F, a
jr z, DayCareMonCursor
call ButtonSound
ld hl, wBreedMon1Nick

33
engine/events/daycare.asm
View File

@@ -23,7 +23,7 @@
Special_DayCareMan: ; 166d6
ld hl, wDayCareMan
bit 0, [hl]
bit DAYCAREMAN_HAS_MON_F, [hl]
jr nz, .AskWithdrawMon
ld hl, wDayCareMan
ld a, DAYCARETEXT_MAN_INTRO
@@ -33,7 +33,7 @@ Special_DayCareMan: ; 166d6
jr c, .print_text
farcall DepositMonWithDayCareMan
ld hl, wDayCareMan
set 0, [hl]
set DAYCAREMAN_HAS_MON_F, [hl]
call DayCare_DepositPokemonText
call DayCare_InitBreeding
ret
@@ -47,8 +47,8 @@ Special_DayCareMan: ; 166d6
farcall RetrievePokemonFromDayCareMan
call DayCare_GetBackMonForMoney
ld hl, wDayCareMan
res 0, [hl]
res 5, [hl]
res DAYCAREMAN_HAS_MON_F, [hl]
res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
jr .cancel
.print_text
@@ -62,7 +62,7 @@ Special_DayCareMan: ; 166d6
Special_DayCareLady: ; 1672a
ld hl, wDayCareLady
bit 0, [hl]
bit DAYCARELADY_HAS_MON_F, [hl]
jr nz, .AskWithdrawMon
ld hl, wDayCareLady
ld a, DAYCARETEXT_LADY_INTRO
@@ -72,7 +72,7 @@ Special_DayCareLady: ; 1672a
jr c, .print_text
farcall DepositMonWithDayCareLady
ld hl, wDayCareLady
set 0, [hl]
set DAYCARELADY_HAS_MON_F, [hl]
call DayCare_DepositPokemonText
call DayCare_InitBreeding
ret
@@ -86,9 +86,9 @@ Special_DayCareLady: ; 1672a
farcall RetrievePokemonFromDayCareLady
call DayCare_GetBackMonForMoney
ld hl, wDayCareLady
res 0, [hl]
res DAYCARELADY_HAS_MON_F, [hl]
ld hl, wDayCareMan
res 5, [hl]
res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
jr .cancel
.print_text
@@ -101,9 +101,9 @@ Special_DayCareLady: ; 1672a
; 16781
DayCareLadyIntroText: ; 16781
bit 7, [hl]
bit DAYCARELADY_ACTIVE_F, [hl]
jr nz, .okay
set 7, [hl]
set DAYCARELADY_ACTIVE_F, [hl]
inc a
.okay
call PrintDayCareText
@@ -112,7 +112,7 @@ DayCareLadyIntroText: ; 16781
; 1678f
DayCareManIntroText: ; 1678f
set 7, [hl]
set DAYCAREMAN_ACTIVE_F, [hl]
call PrintDayCareText
call YesNoBox
ret
@@ -429,7 +429,7 @@ PrintDayCareText: ; 1689b
Special_DayCareManOutside: ; 16936
ld hl, wDayCareMan
bit 6, [hl]
bit DAYCAREMAN_HAS_EGG_F, [hl]
jr nz, .AskGiveEgg
ld hl, .NotYet
call PrintText
@@ -451,7 +451,7 @@ Special_DayCareManOutside: ; 16936
jr nc, .PartyFull
call DayCare_GiveEgg
ld hl, wDayCareMan
res 6, [hl]
res DAYCAREMAN_HAS_EGG_F, [hl]
call DayCare_InitBreeding
ld hl, .GotEggText
call PrintText
@@ -593,10 +593,10 @@ DayCare_GetCurrentPartyMember: ; 16a31
DayCare_InitBreeding: ; 16a3b
ld a, [wDayCareLady]
bit 0, a
bit DAYCARELADY_HAS_MON_F, a
ret z
ld a, [wDayCareMan]
bit 0, a
bit DAYCAREMAN_HAS_MON_F, a
ret z
callfar CheckBreedmonCompatibility
ld a, [wd265]
@@ -605,7 +605,7 @@ DayCare_InitBreeding: ; 16a3b
inc a
ret z
ld hl, wDayCareMan
set 5, [hl]
set DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
.loop
call Random
cp 150
@@ -660,6 +660,7 @@ DayCare_InitBreeding: ; 16a3b
ld a, EGG_LEVEL
ld [CurPartyLevel], a
; Nidoran♀ can give birth to either gender of Nidoran
ld a, [CurPartySpecies]
cp NIDORAN_F
jr nz, .GotEggSpecies

10
engine/events/happiness_egg.asm
View File

@@ -146,7 +146,7 @@ DayCareStep:: ; 7282
; Raise the experience of Day-Care Pokémon every step cycle.
ld a, [wDayCareMan]
bit 0, a
bit DAYCAREMAN_HAS_MON_F, a
jr z, .day_care_lady
ld a, [wBreedMon1Level] ; level
@@ -168,7 +168,7 @@ DayCareStep:: ; 7282
.day_care_lady
ld a, [wDayCareLady]
bit 0, a
bit DAYCARELADY_HAS_MON_F, a
jr z, .check_egg
ld a, [wBreedMon2Level] ; level
@@ -190,7 +190,7 @@ DayCareStep:: ; 7282
.check_egg
ld hl, wDayCareMan
bit 5, [hl] ; egg
bit DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
ret z
ld hl, wStepsToEgg
dec [hl]
@@ -218,6 +218,6 @@ DayCareStep:: ; 7282
cp b
ret nc
ld hl, wDayCareMan
res 5, [hl]
set 6, [hl]
res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
set DAYCAREMAN_HAS_EGG_F, [hl]
ret