Merge branch 'master' of https://github.com/pret/pokecrystal.wiki

1 files changed, 31 insertions, 1 deletions

diff --git a/Add-more-music-that-changes-at-night.md b/Add-more-music-that-changes-at-night.md
index 7f994d1..2583866 100644
--- a/Add-more-music-that-changes-at-night.md
+++ b/Add-more-music-that-changes-at-night.md
@@ -9,6 +9,7 @@ In DPPt and SuMo/USUM, the music for most areas of the overworld changes during
 5. [Adding softer drumkits](#5-Adding-softer-drumkits)
 6. [Adding a custom wave](#6-Adding-a-custom-wave)
 7. [Adding the Kanto Wild Battle Night theme](#7-Adding-the-kanto-wild-battle-night-theme)
+8. [Extra: Support for evening](#8-Support-for-evening)
 
 ## 1. Understanding how the Johto Wild Battle Night version is programmed
 You can skip this section, since knowing about how the original night song is programmed isn't necessary to the rest of the tutorial. But if you're curious about how the original night music is programmed or the music engine in general, this is a good way to get started.
@@ -413,4 +414,33 @@ Edit **start_battle.asm:**
 
 And with this final edit, we have all our night versions in and a system to switch any overworld music at night. 
 
-One final note: you might have noticed there's no file for Route 2, the remixed version of the theme for Viridian Forest in the original RBY. This is because I figured most people would prefer restoring the Viridian Forest map and use that song there, which would turn it into a dungeon and therefore would be no need to switch the song at night. I'll leave the conversion to a night version of this song as an exercise to the reader if you really need it ;)
\ No newline at end of file
+One final note: you might have noticed there's no file for Route 2, the remixed version of the theme for Viridian Forest in the original RBY. This is because I figured most people would prefer restoring the Viridian Forest map and use that song there, which would turn it into a dungeon and therefore would be no need to switch the song at night. I'll leave the conversion to a night version of this song as an exercise to the reader if you really need it ;)
+
+## 8. Support for evening
+
+If you followed Rangi's tutorial for [adding evening as the fourth time of day](https://github.com/pret/pokecrystal/wiki/Make-evening-the-fourth-time-of-day), you might want the night versions to play in the new evening period. This is very easy to do.
+
+Edit **home/map.asm**:
+```diff
+ChangeMusicIfNight::
+	ld a, [wTimeOfDay]
+  	cp NITE_F
+-	ret nz
++       ret c
+...
+```
+And edit **start_battle.asm**:
+
+```diff
+.kantowild
+	;same comparison for Kanto - integrate in the other comparison?
+	ld de, MUSIC_KANTO_WILD_BATTLE
+	ld a, [wTimeOfDay]
+	cp NITE_F
+-       jr nz
++       jr c, .done ; not NITE_F or EVE_F
+	ld de, MUSIC_KANTO_WILD_BATTLE_NIGHT
+	jr .done
+```
+
+Here we are simply changing the checks for when to use the night music to include every time of day over `NITE_F`, which includes `EVE_F`.
\ No newline at end of file