pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Create a fourth time of day (#2)

Browse Source
This commit is contained in:
xCrystal
2023-07-31 12:27:53 +02:00
parent 05448d7a7e
commit 9df4cf6946
30 changed files with 270 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/pokemon/caught_data.asm
View File

@@ -166,6 +166,7 @@ SetBoxmonOrEggmonCaughtData:
inc a
rrca
rrca
and CAUGHT_TIME_MASK ; caught in eve becomes $0
ld b, a
ld a, [wCurPartyLevel]
or b

6
engine/pokemon/evolve.asm
View File

@@ -129,16 +129,16 @@ EvolveAfterBattle_MasterLoop:
cp TR_MORNDAY
jr z, .happiness_daylight
; TR_NITE
; TR_EVENITE
ld a, [wTimeOfDay]
cp NITE_F
jp nz, .dont_evolve_3
jp c, .dont_evolve_3 ; MORN_F or DAY_F
jr .proceed
.happiness_daylight
ld a, [wTimeOfDay]
cp NITE_F
jp z, .dont_evolve_3
jp nc, .dont_evolve_3 ; NITE_F or EVE_F
jr .proceed
.trade