From afc8d3caf0eb1d204adc3cde6bfff3a78ba1df9c Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Thu, 20 Apr 2023 07:02:13 +0100 Subject: [PATCH] DIGDA This adds Digda01 and Field06 to the music repertoire, and has Digda01 be used in Diglett's Cave, as God intended. --- README.md | 3 ++- audio.asm | 3 ++- constants/music_constants.asm | 2 ++ {audio/music => crysaudio/music/RBY}/digda01.asm | 12 ++++++++---- .../field6.asm => crysaudio/music/RBY/field06.asm | 15 ++++++++++----- crysaudio/music_pointers_red.asm | 2 ++ data/maps/songs.asm | 6 +++--- 7 files changed, 29 insertions(+), 14 deletions(-) rename {audio/music => crysaudio/music/RBY}/digda01.asm (98%) rename audio/music/field6.asm => crysaudio/music/RBY/field06.asm (93%) diff --git a/README.md b/README.md index ad3e31b3..a1d9fada 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,8 @@ Credits * Paulluxx - Showdown Mod assistance * DuoM2 - Showdown Mod assistance * Albatross - Much of the new sprites used in the hack (Electivire, Magmortar, Rhyperior, Tangrowth, Glaceon, Sylveon...) -* Frrf - Assisting with the development of the Pikachu / Eevee Mode +* Frrf - Assisting with the development of the Pikachu / Eevee Mode, debugging +* dannye33 - Assisting with crysaudio implementation * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects. * Chatot4444 - Assisting with gym scaling code * ZumiIsawhat? - Restorations of beta OST diff --git a/audio.asm b/audio.asm index 02eee18b..e86836e1 100644 --- a/audio.asm +++ b/audio.asm @@ -371,7 +371,8 @@ INCLUDE "crysaudio/music/RBY/yellowintro.asm" INCLUDE "crysaudio/music/RBY/surfingpikachu.asm" INCLUDE "crysaudio/music/RBY/yellowunusedsong.asm" INCLUDE "crysaudio/music/RBY/meetjessiejames.asm" - +INCLUDE "crysaudio/music/RBY/digda01.asm" +INCLUDE "crysaudio/music/RBY/field06.asm" SECTION "TCG Songs 1", ROMX diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 2e663379..b5cc5f70 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -54,6 +54,8 @@ const MUSIC_MEET_EVIL_TRAINER const MUSIC_MEET_FEMALE_TRAINER const MUSIC_MEET_MALE_TRAINER + const MUSIC_DIGDA01 + const MUSIC_FIELD06 const NUM_SONGS diff --git a/audio/music/digda01.asm b/crysaudio/music/RBY/digda01.asm similarity index 98% rename from audio/music/digda01.asm rename to crysaudio/music/RBY/digda01.asm index c1bf9971..f53b093c 100644 --- a/audio/music/digda01.asm +++ b/crysaudio/music/RBY/digda01.asm @@ -9,10 +9,14 @@ - +Music_Digda01:: + channel_count 3 + channel 1, Music_Digda01_Ch1 + channel 2, Music_Digda01_Ch2 + channel 3, Music_Digda01_Ch3 ;;---------------------------------------- -Digda01_Ch1: +Music_Digda01_Ch1: ;;---------------------------------------- tempo 144 @@ -239,7 +243,7 @@ Digda01_Ch1: sound_loop 0, .loop ;;---------------------------------------- -Digda01_Ch2: +Music_Digda01_Ch2: ;;---------------------------------------- duty_cycle 1 note_type 12, 12, 3 @@ -477,7 +481,7 @@ Digda01_Ch2: sound_loop 0, .loop ;;---------------------------------------- -Digda01_Ch3: +Music_Digda01_Ch3: ;;---------------------------------------- ;; P3-1 diff --git a/audio/music/field6.asm b/crysaudio/music/RBY/field06.asm similarity index 93% rename from audio/music/field6.asm rename to crysaudio/music/RBY/field06.asm index c918f169..5473f0f1 100644 --- a/audio/music/field6.asm +++ b/crysaudio/music/RBY/field06.asm @@ -2,10 +2,15 @@ - +Music_Field06:: + channel_count 3 + channel 1, Music_Field06_Ch1 + channel 2, Music_Field06_Ch2 + channel 3, Music_Field06_Ch3 + channel 4, Music_Field06_Ch4 ;;---------------------------------------- -Field6_Ch1: +Music_Field06_Ch1: ;;---------------------------------------- tempo 128 @@ -23,7 +28,7 @@ Field6_Ch1: sound_loop 0, .loop10 ;;---------------------------------------- -Field6_Ch2: +Music_Field06_Ch2: ;;---------------------------------------- duty_cycle 1 @@ -123,7 +128,7 @@ Field6_Ch2: ;;---------------------------------------- -Field6_Ch3: +Music_Field06_Ch3: ;;---------------------------------------- note_type 12, 1, 1 @@ -178,7 +183,7 @@ Field6_Ch3: sound_ret ;;---------------------------------------- -Field6_Ch4: +Music_Field06_Ch4: ;;---------------------------------------- drum_speed 6 diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index f4e41ad9..7c97cc0c 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -48,3 +48,5 @@ Music: dba Music_MeetEvilTrainer dba Music_MeetFemaleTrainer dba Music_MeetMaleTrainer + dba Music_Digda01 + dba Music_Field06 diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 9b726fd8..ac8a8fc9 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -47,7 +47,7 @@ MapSongBanks:: db MUSIC_CITIES1, 0 ; VIRIDIAN_SCHOOL_HOUSE db MUSIC_CITIES1, 0 ; VIRIDIAN_NICKNAME_HOUSE db MUSIC_GYM, 0 ; VIRIDIAN_GYM - db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE_ROUTE_2 + db MUSIC_DIGDA01, 0 ; DIGLETTS_CAVE_ROUTE_2 db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_NORTH_GATE db MUSIC_CITIES1, 0 ; ROUTE_2_TRADE_HOUSE db MUSIC_CITIES1, 0 ; ROUTE_2_GATE @@ -86,7 +86,7 @@ MapSongBanks:: db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_1F db MUSIC_DUNGEON1, 0 ; POWER_PLANT db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_1F - db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE_ROUTE_11 + db MUSIC_DIGDA01, 0 ; DIGLETTS_CAVE_ROUTE_11 db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_2F db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_1F db MUSIC_CITIES2, 0 ; BILLS_HOUSE @@ -198,7 +198,7 @@ MapSongBanks:: db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_2F db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_2F db MUSIC_VERMILION, 0 ; VERMILION_TRADE_HOUSE - db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE + db MUSIC_DIGDA01, 0 ; DIGLETTS_CAVE db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_3F db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B1F db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B2F