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

5
engine/battle/battle_transition.asm
View File

@@ -637,9 +637,8 @@ StartTrainerBattle_LoadPokeBallGraphics:
jr nz, .tile_loop
ld hl, .pals
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
cp DARKNESS_F
ld a, [wTimeOfDayPalset]
cp DARKNESS_PALSET
jr nz, .not_dark
ld hl, .darkpals
.not_dark

2
engine/battle/start_battle.asm
View File

@@ -73,7 +73,7 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [wTimeOfDay]
cp NITE_F
jr nz, .done
jr c, .done ; not NITE_F or EVE_F
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done