thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nihon Music Attempt

Browse source
This commit is contained in:
Zeta_Null 2023-10-26 15:26:03 -04:00
parent 05e2cdc3d2
commit 7f7ff6dc0b
7 changed files with 203 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

5
audio.asm
View file

@ -150,6 +150,11 @@ SECTION "Extra Songs 2", ROMX
INCLUDE "audio/music/postcredits.asm" INCLUDE "audio/music/postcredits.asm"
SECTION "New Songs", ROMX
INCLUDE "audio/music/nihontest.asm"
SECTION "Sound Effects", ROMX SECTION "Sound Effects", ROMX
INCLUDE "audio/sfx.asm" INCLUDE "audio/sfx.asm"

379
audio/music/nihontest.asm
View file

@ -1,265 +1,267 @@
Music_NihonTest: Music_NihonTown01:
channel_count 4 channel_count 4
channel 1, Music_NihonTest_Ch1 channel 1, Music_NihonTown01_Ch1
channel 2, Music_NihonTest_Ch2 channel 2, Music_NihonTown01_Ch2
channel 3, Music_NihonTest_Ch3 channel 3, Music_NihonTown01_Ch3
channel 4, Music_NihonTest_Ch4 channel 4, Music_NihonTown01_Ch4
Music_NihonTest_Ch1: Music_NihonTown01_Ch1:
tempo 256 tempo 256
volume 7, 7 volume 7, 7
note_type 12, 15, 8 note_type 12, 15, 8
stereo_panning TRUE, FALSE
.mainLoop: .mainLoop:
duty_cycle 0 duty_cycle 0
volume_envelope 15, 8
transpose 2, 0
octave 3
tempo 107 tempo 107
note A_, 4
rest 4
octave 4
note C_, 4
rest 4
octave 3 octave 3
note A_, 4 volume_envelope 13, 8
transpose 0, 0
note D#, 4
rest 4 rest 4
note G_, 4 note F#, 4
rest 4 rest 4
note A_, 4 note D#, 4
rest 4 rest 4
octave 4 note C#, 4
note C_, 4
rest 4 rest 4
note D#, 4
rest 4
note F#, 4
rest 4
note C#, 4
rest 4
octave 2
note A#, 4
octave 3 octave 3
note G_, 4
rest 4 rest 4
note E_, 4 note C#, 4
rest 4 rest 4
note G_, 4 note F_, 4
rest 4 rest 4
note D#, 4
rest 4
note G#, 4
rest 4
octave 2
note B_, 4
octave 3
rest 4
note D#, 4
rest 4
note C#, 4
rest 4
octave 2
note B_, 4 note B_, 4
rest 4 rest 4
note A_, 4 .loop1:
rest 4 octave 2
octave 4 note A#, 4
note D_, 4
rest 4 rest 4
note B_, 4
octave 3 octave 3
note F_, 4
rest 4 rest 4
note A_, 4 note C#, 4
rest 4 rest 4
note G_, 4 note D#, 4
rest 4 rest 4
note F_, 4 note D#, 4
rest 4 rest 4
note E_, 4 note G#, 4
rest 4 rest 4
note F_, 4 note F#, 4
rest 4 rest 4
note G_, 4 note C#, 4
rest 4 rest 4
note A_, 4 note D#, 4
rest 4
note A_, 4
rest 4
octave 4
note D_, 4
rest 4
note C_, 4
rest 4 rest 4
octave 2
note G#, 4
octave 3 octave 3
note G_, 4
rest 4 rest 4
note A_, 4 note C#, 4
rest 4 rest 4
note D_, 4 octave 2
note A#, 4
octave 3
rest 4 rest 4
note G_, 4 note C#, 4
rest 4 rest 4
note E_, 4 note D#, 4
rest 4 rest 4
note G_, 4 octave 2
note A#, 4
octave 3
rest 4 rest 4
note A_, 4 note C#, 4
rest 4
note E_, 4
rest 4
note G_, 4
rest 4 rest 4
octave 8 octave 8
sound_loop 2, .loop1
sound_loop 0, .mainLoop sound_loop 0, .mainLoop
Music_NihonTest_Ch2: Music_NihonTown01_Ch2:
note_type 12, 15, 8 note_type 12, 15, 8
stereo_panning FALSE, TRUE
.mainLoop: .mainLoop:
duty_cycle 2
octave 4
transpose 1, 0 transpose 1, 0
note B_, 4 duty_cycle 2
note C_, 4 octave 5
note C_, 4 volume_envelope 10, 8
note C_, 4 note F_, 4
note G_, 4
octave 3
note G_, 4
note G_, 4
note G_, 4
octave 4 octave 4
note A_, 4 note F#, 4
octave 3 note F#, 4
note A_, 4 note F#, 4
note A_, 4 octave 5
note A_, 4 note C#, 4
octave 4 octave 4
note E_, 4 note C#, 4
octave 3 note C#, 4
note E_, 4 note C#, 4
note E_, 4 octave 5
note E_, 4 note D#, 4
octave 4 octave 4
note E_, 4 note D#, 4
note D#, 4
note D#, 4
note A#, 4
octave 3 octave 3
note G_, 4 note A#, 4
note G_, 4 note A#, 4
note G_, 4 note A#, 4
octave 4 octave 4
note D_, 4 note A#, 4
note C#, 4
note C#, 4
note C#, 4
note G#, 4
octave 3 octave 3
note D_, 4 note G#, 4
note D_, 4 note G#, 4
note D_, 4 note G#, 4
octave 4 octave 4
note D_, 4 note G#, 4
note D#, 4
note D#, 4
note D#, 4
note F#, 4
octave 3 octave 3
note A_, 4 note F#, 4
note A_, 4 note F#, 4
note A_, 4 note F#, 4
octave 4 .loop1:
note C_, 4
octave 3
note C_, 4
note C_, 4
note C_, 4
rest 4 rest 4
octave 4 octave 4
note E_, 4 note A#, 4
note E_, 4 note A#, 4
note E_, 4 note A#, 4
rest 4 rest 4
note D_, 4 note G#, 4
note D_, 4 note G#, 4
note D_, 4 note G#, 4
rest 4 rest 4
note D_, 4 note G#, 4
note D_, 4 note G#, 4
note D_, 4 note G#, 4
rest 4
note F_, 4
note F_, 4
note F_, 4
rest 4
note D#, 4
note D#, 4
note D#, 4
rest 4
note F_, 4
note F_, 4
note F_, 4
rest 4
note A#, 4
note A#, 4
note A#, 4
rest 4 rest 4
octave 3 octave 3
note B_, 4 note A#, 4
note B_, 4 note A#, 4
note B_, 4 note A#, 4
rest 4
note A_, 4
note A_, 4
note A_, 4
rest 4
note B_, 4
note B_, 4
note B_, 4
rest 4
octave 4
note E_, 4
note E_, 4
note E_, 4
rest 4
octave 3
note E_, 4
note E_, 4
note E_, 4
octave 8 octave 8
sound_loop 2, .loop1
sound_loop 0, .mainLoop sound_loop 0, .mainLoop
Music_NihonTest_Ch3: Music_NihonTown01_Ch3:
note_type 12, 1, 0 note_type 12, 1, 0
.mainLoop: .mainLoop:
note_type 12, 1, 0 note_type 12, 1, 0
volume_envelope 1, 3
octave 5 octave 5
vibrato 4, 2, 5 vibrato 7, 1, 9
volume_envelope 1, 6 note G#, 2
note D_, 2 note A#, 2
note E_, 2 note A#, 1
note E_, 1 note B_, 7
note F_, 7 note G#, 8
note D_, 8 note F_, 12
octave 4 note F#, 2
note B_, 12 note G#, 2
octave 5 note G#, 1
note C_, 2 note A#, 1
note D_, 2
note D_, 1
note E_, 1
rest 2 rest 2
note E_, 2 note A#, 2
rest 2 rest 2
note C_, 2 note F#, 2
rest 2 rest 2
note C_, 2 note F#, 2
rest 2 rest 2
octave 4 note C#, 12
note G_, 12 note D#, 2
note A_, 2 note F#, 2
octave 5 note F#, 1
note C_, 2 note G#, 7
note C_, 1 note F_, 8
note D_, 7 note C#, 4
octave 4 note F#, 1
note B_, 8 note G#, 7
note G_, 4
octave 5
note C_, 1
note D_, 7
octave 4
note B_, 4
octave 5
vibrato 5, 2, 5
note C_, 14
vibrato 0, 2, 5
note C_, 14
vibrato 4, 2, 5
octave 4
note A_, 4
note B_, 1
octave 5
note C_, 11
octave 4
note B_, 4
note G_, 12
note F_, 4 note F_, 4
note A_, 1 vibrato 5, 1, 9
note B_, 3 note F#, 14
note A_, 4 vibrato 0, 1, 9
note F#, 14
.loop1:
octave 5 octave 5
note C_, 4 vibrato 7, 1, 9
octave 4 note D#, 4
note E_, 4
note F_, 1 note F_, 1
note G_, 11 note F#, 11
note D_, 4 note F_, 4
note E_, 1 note C#, 12
note F_, 11 octave 4
note A_, 4
note G_, 12
note B_, 4 note B_, 4
octave 5
note D#, 1
note F_, 3
note D#, 4
note F#, 4
octave 4
note A#, 4
note B_, 1 note B_, 1
octave 5 octave 5
note C_, 11 note C#, 11
vibrato 0, 2, 5 octave 4
note C_, 16 note G#, 4
note A#, 1
note B_, 11
octave 5
note D#, 4
note C#, 12
note F_, 4
note F_, 1
note F#, 11
vibrato 0, 1, 9
note F#, 16
octave 8 octave 8
sound_loop 2, .loop1
sound_loop 0, .mainLoop sound_loop 0, .mainLoop
Music_NihonTest_Ch4: Music_NihonTown01_Ch4:
toggle_noise 0 toggle_noise 0
drum_speed 12 drum_speed 12
.mainLoop: .mainLoop:
@ -293,8 +295,12 @@ Music_NihonTest_Ch4:
rest 15 rest 15
drum_note 1, 1 drum_note 1, 1
rest 3 rest 3
.loop1:
drum_speed 12
drum_note 1, 1 drum_note 1, 1
rest 1 drum_speed 1
rest 12
drum_speed 12
drum_note 1, 1 drum_note 1, 1
rest 9 rest 9
drum_note 1, 1 drum_note 1, 1
@ -326,4 +332,5 @@ Music_NihonTest_Ch4:
drum_note 1, 1 drum_note 1, 1
octave 8 octave 8
rest 3 rest 3
sound_loop 0, .loop1
sound_loop 0, .mainLoop sound_loop 0, .mainLoop

1
audio/music_pointers.asm
View file

@ -107,4 +107,5 @@ Music:
dba Music_SuicuneBattle dba Music_SuicuneBattle
dba Music_BattleTowerLobby dba Music_BattleTowerLobby
dba Music_MobileCenter dba Music_MobileCenter
dba Music_NihonTown01
assert_table_length NUM_MUSIC_SONGS assert_table_length NUM_MUSIC_SONGS

1
constants/music_constants.asm
View file

@ -105,6 +105,7 @@
const MUSIC_SUICUNE_BATTLE ; 64 const MUSIC_SUICUNE_BATTLE ; 64
const MUSIC_BATTLE_TOWER_LOBBY ; 65 const MUSIC_BATTLE_TOWER_LOBBY ; 65
const MUSIC_MOBILE_CENTER ; 66 const MUSIC_MOBILE_CENTER ; 66
const MUSIC_NIHON_TOWN_01 ; 67
DEF NUM_MUSIC_SONGS EQU const_value DEF NUM_MUSIC_SONGS EQU const_value
; GetMapMusic picks music for this value (see home/map.asm) ; GetMapMusic picks music for this value (see home/map.asm)

2
data/maps/maps.asm
View file

@ -549,5 +549,5 @@ MapGroup_Cherrygrove:
MapGroup_SilentHills: MapGroup_SilentHills:
table_width MAP_LENGTH, MapGroup_SilentHills table_width MAP_LENGTH, MapGroup_SilentHills
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_SILENT_HILLS_MAPS assert_table_length NUM_SILENT_HILLS_MAPS

2
data/tilesets/nihon01_collision.asm
View file

@ -123,6 +123,6 @@
tilecoll WATER, WATER, WATER, WATER ; 7a tilecoll WATER, WATER, WATER, WATER ; 7a
tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7b
tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7c
tilecoll WALL, WALL, FLOOR, FLOOR ; 7d tilecoll WALL, WALL, WALL, WALL ; 7d
tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
tilecoll WALL, WALL, FLOOR, FLOOR ; 7f tilecoll WALL, WALL, FLOOR, FLOOR ; 7f

2
maps/PlayersHouse2F.asm
View file

@ -145,7 +145,7 @@ PlayersHouse2F_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 7, 0, SILENT_HILLS, 1 warp_event 7, 0, PLAYERS_HOUSE_1F, 3
def_coord_events def_coord_events