thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 10:23:34 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIGDA

Browse source 
This adds Digda01 and Field06 to the music repertoire, and has Digda01 be used in Diglett's Cave, as God intended.
This commit is contained in:
Llinos Evans 2023-04-20 07:02:13 +01:00
parent f09b69e70d
commit afc8d3caf0
7 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -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

3
audio.asm
View file

@ -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

2
constants/music_constants.asm
View file

@ -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

12
audio/music/digda01.asm → crysaudio/music/RBY/digda01.asm
View file

@ -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

15
audio/music/field6.asm → crysaudio/music/RBY/field06.asm
View file

@ -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

2
crysaudio/music_pointers_red.asm
View file

@ -48,3 +48,5 @@ Music:
dba Music_MeetEvilTrainer
dba Music_MeetFemaleTrainer
dba Music_MeetMaleTrainer
dba Music_Digda01
dba Music_Field06

6
data/maps/songs.asm
View file

@ -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