This commit is contained in:
Henny022p 2021-03-28 13:03:37 +02:00
parent 6e7674e865
commit abfcc50245
6 changed files with 4198 additions and 1529 deletions

15
asm/macros/sounds.inc Normal file
View File

@ -0,0 +1,15 @@
.macro sound_header track_count:req block_count:req priority:req reverb:req tone:req part:req parts:vararg
.byte \track_count
.byte \block_count
.byte \priority
.byte \reverb
.4byte \tone
sound_header_recurse \part \parts
.endm
.macro sound_header_recurse part:req parts:vararg
.4byte \part
.ifnb \parts
sound_header_recurse \parts
.endif
.endm

View File

@ -3090,7 +3090,3 @@ gUnk_08DCC1C9:: @ 08DCC1C9
gUnk_08DCC3F5:: @ 08DCC3F5 gUnk_08DCC3F5:: @ 08DCC3F5
.incbin "baserom.gba", 0xDCC3F5, 0x0000087 .incbin "baserom.gba", 0xDCC3F5, 0x0000087
gUnk_08DCC47C:: @ 08DCC47C
.incbin "baserom.gba", 0xDCC47C, 0x0000010

File diff suppressed because it is too large Load Diff

4180
data/sounds.s Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1038,7 +1038,7 @@ SECTIONS {
data/data_089FC6C4.o(.rodata); data/data_089FC6C4.o(.rodata);
src/audio.o(.rodata); src/audio.o(.rodata);
data/data_08A127A1.o(.rodata); data/data_08A127A1.o(.rodata);
data/songs.o(.rodata); data/sounds.o(.rodata);
src/eeprom.o(.rodata); src/eeprom.o(.rodata);
} >rom } >rom

View File

@ -270,7 +270,7 @@ extern const SongHeader bgmRoyalValley;
extern const SongHeader bgmCloudTops; extern const SongHeader bgmCloudTops;
extern const SongHeader bgmDarkHyruleCastle; extern const SongHeader bgmDarkHyruleCastle;
extern const SongHeader bgmSecretCastleEntrance; extern const SongHeader bgmSecretCastleEntrance;
extern const SongHeader bmgDeepwoodShrine; extern const SongHeader bgmDeepwoodShrine;
extern const SongHeader bgmCaveOfFlames; extern const SongHeader bgmCaveOfFlames;
extern const SongHeader bgmFortressOfWinds; extern const SongHeader bgmFortressOfWinds;
extern const SongHeader bgmTempleOfDroplets; extern const SongHeader bgmTempleOfDroplets;
@ -856,7 +856,7 @@ const Song gSongTable[] = {
[BGM_CLOUD_TOPS] = { &bgmCloudTops, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_CLOUD_TOPS] = { &bgmCloudTops, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
[BGM_DARK_HYRULE_CASTLE] = { &bgmDarkHyruleCastle, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_DARK_HYRULE_CASTLE] = { &bgmDarkHyruleCastle, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
[BGM_SECRET_CASTLE_ENTRANCE] = { &bgmSecretCastleEntrance, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_SECRET_CASTLE_ENTRANCE] = { &bgmSecretCastleEntrance, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
[BGM_DEEPWOOD_SHRINE] = { &bmgDeepwoodShrine, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_DEEPWOOD_SHRINE] = { &bgmDeepwoodShrine, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
[BGM_CAVE_OF_FLAMES] = { &bgmCaveOfFlames, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_CAVE_OF_FLAMES] = { &bgmCaveOfFlames, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
[BGM_FORTRESS_OF_WINDS] = { &bgmFortressOfWinds, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_FORTRESS_OF_WINDS] = { &bgmFortressOfWinds, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
[BGM_TEMPLE_OF_DROPLETS] = { &bgmTempleOfDroplets, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM }, [BGM_TEMPLE_OF_DROPLETS] = { &bgmTempleOfDroplets, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },