From d819fd13081321336a7567df7f34df1c491b3d0a Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Mon, 21 Oct 2024 19:32:59 -0400 Subject: [PATCH] Initial unoptimized version of Silent Hills theme. May redo this for better fade effects, needs some minor tweaks. --- audio.asm | 1 + audio/music/nihontest.asm | 82 +++++++++++++++++++--------------- audio/music_pointers.asm | 1 + constants/music_constants.asm | 1 + data/maps/maps.asm | 8 ++-- gfx/trainers/painter.png | Bin 430 -> 440 bytes 6 files changed, 53 insertions(+), 40 deletions(-) diff --git a/audio.asm b/audio.asm index 0486719..adb3236 100644 --- a/audio.asm +++ b/audio.asm @@ -164,6 +164,7 @@ INCLUDE "audio/music/route30.asm" ; u broke the bamk INCLUDE "audio/music/NihonTrainerBattle.asm" INCLUDE "audio/music/NorthCity.asm" INCLUDE "audio/music/Tanoby01.asm" +INCLUDE "audio/music/silenthills.asm" SECTION "Sound Effects", ROMX diff --git a/audio/music/nihontest.asm b/audio/music/nihontest.asm index 806afad..f230104 100644 --- a/audio/music/nihontest.asm +++ b/audio/music/nihontest.asm @@ -14,84 +14,94 @@ Music_NihonTown01_Ch1: duty_cycle 0 octave 3 transpose 0, 0 - tempo 113 - volume_envelope 15, 8 + tempo 97 + volume_envelope 14, 8 note E_, 4 - rest 4 + octave 4 + note C_, 4 + octave 3 note G_, 4 rest 4 note E_, 4 - rest 4 + note A_, 4 note D_, 4 rest 4 note E_, 4 - rest 4 + octave 4 + note D_, 4 + octave 3 note G_, 4 rest 4 note D_, 4 - rest 4 + note G_, 4 octave 2 note B_, 4 octave 3 rest 4 note D_, 4 - rest 4 + note A_, 4 note F#, 4 rest 4 note E_, 4 - rest 4 + octave 4 + note C_, 4 + octave 3 note A_, 4 rest 4 note C_, 4 - rest 4 + note G_, 4 note E_, 4 rest 4 note D_, 4 - rest 4 + note E_, 4 note C_, 4 octave 2 rest 4 .loop1: octave 2 note B_, 4 - rest 4 + octave 3 + note G_, 4 + note C_, 4 + octave 2 + note B_, 4 + octave 3 + note D_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note B_, 4 + note A_, 4 + note G_, 4 + note E_, 4 + note F#, 4 + note D_, 4 + note C_, 4 + note E_, 4 + note C_, 4 + octave 2 + note A_, 4 octave 3 note C_, 4 - rest 4 - note D_, 4 - rest 4 note E_, 4 - rest 4 - note E_, 4 - rest 4 - note A_, 4 - rest 4 - note G_, 4 - rest 4 note D_, 4 - rest 4 - note E_, 4 - rest 4 - octave 2 - note A_, 4 - octave 3 - rest 4 - note D_, 4 - rest 4 octave 2 note B_, 4 octave 3 - rest 4 note D_, 4 - rest 4 note E_, 4 - rest 4 octave 2 note B_, 4 octave 3 - rest 4 + note E_, 4 note D_, 4 - rest 4 + octave 2 + note B_, 4 + octave 3 + note E_, 4 + note D_, 4 + note E_, 4 octave 8 sound_loop 2, .loop1 sound_loop 0, .mainLoop @@ -189,7 +199,7 @@ Music_NihonTown01_Ch2: Music_NihonTown01_Ch3: note_type 12, 1, 0 .mainLoop: - note_type 12, 1, 2 + note_type 12, 1, 6 vibrato 7, 1, 9 octave 4 note A_, 2 diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 380ef03..622cc5b 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -119,4 +119,5 @@ Music: dba Music_NihonTrainerBattle dba Music_NorthCity dba Music_Tanoby01 + dba Music_SilentHills assert_table_length NUM_MUSIC_SONGS diff --git a/constants/music_constants.asm b/constants/music_constants.asm index bfb8682..7ca047c 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -117,6 +117,7 @@ const MUSIC_NIHONTRAINERBATTLE ; 70 const MUSIC_NORTHCITY ; 71 const MUSIC_TANOBY01 ; 72 + const MUSIC_SILENTHILLS ; 73 DEF NUM_MUSIC_SONGS EQU const_value ; GetMapMusic picks music for this value (see home/map.asm) diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 95ec5a5..09dfefb 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -692,15 +692,15 @@ MapGroup_SilentHills: map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_NIHONTIME, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE + map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, TRUE, PALETTE_AUTO, FISHGROUP_NONE map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND map QuietCave, TILESET_LUSHCAVE, FOREST, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_NITE, FISHGROUP_POND map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE - map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE - map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE - map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE + map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE + map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE + map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE diff --git a/gfx/trainers/painter.png b/gfx/trainers/painter.png index 76a1e81afa9f6dce97c717b48ef8607c003d380b..7f029e809558ba74cac57ad573dc8e6aaaefad4c 100644 GIT binary patch delta 406 zcmV;H0crlO1Goc_EPwB%a{!EU0000lvOUNE00C!7L_t(|+O3w`j>IqsL&5(4f8KCO z+kM&Mbfb}GG|H(77*ezUUSKS&ZxsWA6*()eR5dQNic?4yx);U=j1L~vLopkkftYC8s1@;9h7$bIiuW6i>hG!IF4rk(=B*Bglca3_ZWN}i#X`XzmxL=HarH7Qx9|iO8@`>07*qoM6N<$f AcK`qY delta 396 zcmV;70dxMi1Fi#*EPwyTLSsst0002BD@W!4000DZQchF<|NsAOC`Nez00B)&L_t(| z+O?L+ZUZq4LnZP5|GC;co#ax|K#c^x_zktti`hR6Tte^*vLHl*$RUA<1W}U<(y5kQ zQ8h>o6=lq?G4N`OXq^3Og)I3+vM4&s51gwj43p@xU|R_bYkv%fq}`V7_mUad=?u|e zhU<+xn_<E=fLMD=Od#RaV?h;-x5E#_c^<%