github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

collect_rings: match more songs

Browse Source
This commit is contained in:
Oliver Bell committed 2025-06-18 01:04:21 +01:00
1 parent 2d06e1eec7
commit affabe4250
5 files changed
+18 -130
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

multi_boot/roms/collect_rings/Makefile
+2 -5
View File
@@ -155,11 +155,8 @@ SA2_MID_FILES := \
sa2/mus_vs_lobby.mid \
sa2/mus_fanfare.mid \
sa2/se_spin_dash_release.mid \
# sa2/se_brake.mid \
# sa2/se_jump.mid \
# sa2/se_rings_lost.mid \
# sa2/se_life_lost.mid \
# sa2/se_item_box_2.mid \
sa2/se_life_lost.mid \
sa2/se_item_box_2.mid \
# sa2/se_spring.mid \
# sa2/se_spikes.mid \
# sa2/se_216.mid \
multi_boot/roms/collect_rings/ldscript.txt
+13 -2
View File
@@ -114,15 +114,26 @@ SECTIONS {
build/collect_rings/sound/songs/midi/mus_fanfare.o(.rodata);
build/collect_rings/sound/songs/song005.o(.rodata);
build/collect_rings/sound/songs/song010.o(.rodata);
/* This is completely different to the main game */
build/collect_rings/sound/songs/se_spin_attack.o(.rodata);
build/collect_rings/sound/songs/midi/se_spin_dash_release.o(.rodata);
/* These use different voice (12 instead of 2) */
build/collect_rings/sound/songs/se_brake.o(.rodata);
build/collect_rings/sound/songs/se_jump.o(.rodata);
build/collect_rings/sound/songs/midi/se_ring_copy.o(.rodata);
/* Added BNDR instruction? */
build/collect_rings/sound/songs/se_rings_lost.o(.rodata);
build/collect_rings/sound/songs/se_life_lost.o(.rodata);
build/collect_rings/sound/songs/midi/se_life_lost.o(.rodata);
build/collect_rings/sound/songs/song018.o(.rodata);
build/collect_rings/sound/songs/se_item_box_2.o(.rodata);
build/collect_rings/sound/songs/midi/se_item_box_2.o(.rodata);
build/collect_rings/sound/songs/se_spring.o(.rodata);
build/collect_rings/sound/songs/se_spikes.o(.rodata);
build/collect_rings/sound/songs/song022.o(.rodata);
multi_boot/roms/collect_rings/songs.mk
+3 -3
View File
@@ -206,7 +206,7 @@ $(MID_SUBDIR)/se_grinding.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G3 -P20 -V100
$(MID_SUBDIR)/se_brake.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P15 -V75
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V75
$(MID_SUBDIR)/se_jump.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V75
@@ -218,7 +218,7 @@ $(MID_SUBDIR)/se_rings_lost.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G3 -P20 -V127
$(MID_SUBDIR)/se_life_lost.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P40 -V127
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V127
$(MID_SUBDIR)/se_tails_propeller_flying.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G3 -P20 -V127
@@ -284,7 +284,7 @@ $(MID_SUBDIR)/se_time_up.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G3 -P20 -V89
$(MID_SUBDIR)/se_item_box_2.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P50 -V127
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V127
$(MID_SUBDIR)/se_151.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V100
multi_boot/roms/collect_rings/sound/songs/se_item_box_2.s
-88
View File
@@ -1,88 +0,0 @@
.include "sound/MPlayDef.s"
.section .rodata
@********************** Track 1 **********************@
.align 2
.global se_item_box_2_1
se_item_box_2_1: @ 0x0201C870
.byte KEYSH , 0
.byte TEMPO , 75
.byte VOICE , 52
.byte VOL , v070
.byte PAN , c_v
.byte BENDR , 6
.byte BEND , c_v-1
.byte N60 , Cn4, v124
.byte W01
.byte BEND , c_v+20
.byte W01
.byte c_v+41
.byte W01
.byte c_v+58
.byte W01
.byte c_v+45
.byte W01
.byte c_v+31
.byte W01
.byte c_v+18
.byte W01
.byte c_v+4
.byte W01
.byte c_v-9
.byte W01
.byte c_v-23
.byte W01
.byte c_v-36
.byte W01
.byte c_v-50
.byte W01
.byte c_v-64
.byte W01
.byte c_v-50
.byte W01
.byte c_v-36
.byte W01
.byte c_v-22
.byte W01
.byte c_v-8
.byte W01
.byte c_v+6
.byte W01
.byte c_v+20
.byte W01
.byte c_v+34
.byte W01
.byte c_v+48
.byte W01
.byte c_v+63
.byte W36
.byte W03
.byte FINE
@********************** Track 2 **********************@
.global se_item_box_2_2
se_item_box_2_2: @ 0x0201C8AF
.byte KEYSH , 0
.byte VOICE , 50
.byte VOL , v127
.byte PAN , c_v
.byte BENDR , 15
.byte N02 , Fn3, v124
.byte W02
.byte FINE
.align 2
.global se_item_box_2
se_item_box_2: @ 0x0201C8C0
.byte 2 @ trackCount
.byte 0 @ blockCount
.byte 20 @ priority
.byte 128 @ reverb
.word voicegroup000 @ voicegroup/tone
.word se_item_box_2_1 @ track
.word se_item_box_2_2 @ track
multi_boot/roms/collect_rings/sound/songs/se_life_lost.s
-32
View File
@@ -1,32 +0,0 @@
.include "sound/MPlayDef.s"
.section .rodata
@********************** Track 1 **********************@
.align 2
.global se_life_lost_1
se_life_lost_1: @ 0x0201C7EC
.byte KEYSH , 0
.byte TEMPO , 60
.byte VOICE , 52
.byte VOL , v127
.byte PAN , c_v
.byte BENDR , 15
.byte N06 , Cs1, v127
.byte W07
.byte N32 , Cn1, v112
.byte W32
.byte FINE
.align 2
.global se_life_lost
se_life_lost: @ 0x0201C804
.byte 1 @ trackCount
.byte 0 @ blockCount
.byte 20 @ priority
.byte 128 @ reverb
.word voicegroup000 @ voicegroup/tone
.word se_life_lost_1 @ track