From 06b606a4c71b090de425fcaeeec7a481af7a2124 Mon Sep 17 00:00:00 2001 From: Bender Date: Thu, 15 Oct 2020 20:58:34 +0200 Subject: music constant was inconsistent and night music table had an entry twice --- Add-more-music-that-changes-at-night.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Add-more-music-that-changes-at-night.md b/Add-more-music-that-changes-at-night.md index 55ea65e..e989ee5 100644 --- a/Add-more-music-that-changes-at-night.md +++ b/Add-more-music-that-changes-at-night.md @@ -28,7 +28,7 @@ Apart from these changes, we're also going to make a small change to the Noise c As an example, we'll add the Night version of New Bark Town into the game. [Here's a link to the file containing the original song, plus the night version at the bottom](https://pastebin.com/vhA3P0Xy), with the transformations we have covered earlier. Note that this file uses the depreciated music commands, but the file should still work fine in more recent versions of pokecrystal. -Adding a new night version music to the game works exactly the same way as adding any other new song; [there's already a tutorial for that](https://github.com/pret/pokecrystal/wiki/Add-a-new-music-song), and the process here is mostly the same. Add the music pointer `Music_NewBarkTownNight` to the `music_pointers.asm` file and the new music constant `NEW_BARK_TOWN_NIGHT`. +Adding a new night version music to the game works exactly the same way as adding any other new song; [there's already a tutorial for that](https://github.com/pret/pokecrystal/wiki/Add-a-new-music-song), and the process here is mostly the same. Add the music pointer `Music_NewBarkTownNight` to the `music_pointers.asm` file and the new music constant `MUSIC_NEW_BARK_TOWN_NIGHT`. There's a slight caveat though: Instead of adding the Night version in a separate file like explained in sections 2 and 4 of the other tutorial, **you need to replace the entire original song with this new file**. There are two reasons for this: first, since the Night version reutilizes much of the same code as the Day version, both separate files would need to be in the same section; otherwise, the game wouldn't compile (if you noticed, both versions of the Johto Wild Battle are in the same section in the `audio.asm` file, although they are in separate files); second, the code of the original song was altered, essentially creating more subroutines that can be called as needed by the new Night version and thus reducing the need for redundant code. But don't worry, the original song will play in exactly the same way as before. @@ -165,7 +165,6 @@ night_music: MACRO ;\2 - night song ENDM night_music MUSIC_NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN_NIGHT - night_music MUSIC_NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN_NIGHT + night_music MUSIC_ROUTE_29, MUSIC_ROUTE_29_NIGHT + night_music MUSIC_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY_NIGHT + night_music MUSIC_ROUTE_30, MUSIC_ROUTE_30_NIGHT -- cgit v1.2.3