ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match ph_choice_blend.mid

Browse Source
This commit is contained in:
Kermalis 2018-10-03 17:20:10 -04:00
parent 01242d642c
commit b32e85ac90
5 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ld_script.txt
View File

@ -1072,7 +1072,7 @@ SECTIONS {
sound/songs/ph_thought_blend.o(.rodata); sound/songs/ph_thought_blend.o(.rodata);
sound/songs/ph_thought_held.o(.rodata); sound/songs/ph_thought_held.o(.rodata);
sound/songs/ph_thought_solo.o(.rodata); sound/songs/ph_thought_solo.o(.rodata);
sound/songs/ph_choice_blend.o(.rodata); sound/songs/midi/ph_choice_blend.o(.rodata);
sound/songs/ph_choice_held.o(.rodata); sound/songs/ph_choice_held.o(.rodata);
sound/songs/ph_choice_solo.o(.rodata); sound/songs/ph_choice_solo.o(.rodata);
sound/songs/ph_mouth_blend.o(.rodata); sound/songs/ph_mouth_blend.o(.rodata);

3
songs.mk
View File

@ -633,5 +633,8 @@ $(MID_SUBDIR)/mus_vs_rekku.s: %.s: %.mid
$(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid $(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G097 -V076 $(MID) $< $@ -E -R$(STD_REVERB) -G097 -V076
$(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid
$(MID) $< $@ -E -G130 -P4
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5

27
sound/song_table.inc
View File

@ -249,23 +249,21 @@ gSongTable:: @ 86B49F0
song se_w287b, 1, 1 @ Stat Decreased song se_w287b, 1, 1 @ Stat Decreased
song se_w114, 1, 1 @ Haze song se_w114, 1, 1 @ Haze
song se_w063b, 1, 1 @ Hyper Beam 2 song se_w063b, 1, 1 @ Hyper Beam 2
@ FRLG SFX below song se_rg_w_door, 1, 1 @ Door (FRLG)
song se_rg_w_door, 1, 1 @ Door song se_rg_card1, 1, 1 @ Trainer Card 1 (FRLG)
song se_rg_card1, 1, 1 @ Trainer Card 1 song se_rg_card2, 1, 1 @ Trainer Card 2 (FRLG)
song se_rg_card2, 1, 1 @ Trainer Card 2 song se_rg_card3, 1, 1 @ Trainer Card 3 (FRLG)
song se_rg_card3, 1, 1 @ Trainer Card 3 song se_rg_bag1, 1, 1 @ Bag Scroll (FRLG)
song se_rg_bag1, 1, 1 @ Bag Scroll song se_rg_bag2, 1, 1 @ Bag Pocket Change (FRLG)
song se_rg_bag2, 1, 1 @ Bag Pocket Change
song se_rg_getting, 1, 1 song se_rg_getting, 1, 1
song se_rg_shop, 1, 1 @ Cash Register song se_rg_shop, 1, 1 @ Cash Register (FRLG)
song se_rg_kiteki, 1, 1 @ S.S. Anne Horn song se_rg_kiteki, 1, 1 @ S.S. Anne Horn (FRLG)
song se_rg_help_op, 1, 1 @ Help Menu Open song se_rg_help_op, 1, 1 @ Help Menu Open (FRLG)
song se_rg_help_cl, 1, 1 @ Help Menu Close song se_rg_help_cl, 1, 1 @ Help Menu Close (FRLG)
song se_rg_help_ng, 1, 1 @ Help Menu Error song se_rg_help_ng, 1, 1 @ Help Menu Error (FRLG)
song se_rg_deomov, 1, 1 @ Deoxys Moves song se_rg_deomov, 1, 1 @ Deoxys Moves
song se_rg_excellent, 1, 1 song se_rg_excellent, 1, 1
song se_rg_nawamiss, 1, 1 song se_rg_nawamiss, 1, 1
@ end FRLG SFX
song se_toreeye, 1, 1 @ Trainer's Eye Call song se_toreeye, 1, 1 @ Trainer's Eye Call
song se_toreoff, 1, 1 @ Trainer's Eye Hang Up song se_toreoff, 1, 1 @ Trainer's Eye Hang Up
song se_hantei1, 1, 1 @ Battle Arena Time's Up 1 song se_hantei1, 1, 1 @ Battle Arena Time's Up 1
@ -273,7 +271,6 @@ gSongTable:: @ 86B49F0
song se_curtain, 1, 1 @ Battle Pike Curtain Open song se_curtain, 1, 1 @ Battle Pike Curtain Open
song se_curtain1, 1, 1 @ Battle Pike Curtain Close song se_curtain1, 1, 1 @ Battle Pike Curtain Close
song se_ussoki, 1, 1 @ Sudowoodo song se_ussoki, 1, 1 @ Sudowoodo
song dummy_song_header, 0, 0 song dummy_song_header, 0, 0
song dummy_song_header, 0, 0 song dummy_song_header, 0, 0
song dummy_song_header, 0, 0 song dummy_song_header, 0, 0
@ -547,7 +544,7 @@ gSongTable:: @ 86B49F0
song mus_rg_network, 0, 0 @ Pokémon Net Center (FRLG) song mus_rg_network, 0, 0 @ Pokémon Net Center (FRLG)
song mus_rg_okurimono, 0, 0 @ Mystery Gift (FRLG) song mus_rg_okurimono, 0, 0 @ Mystery Gift (FRLG)
song mus_rg_kinomikui, 0, 0 @ Dodrio Berry Picking (FRLG) song mus_rg_kinomikui, 0, 0 @ Dodrio Berry Picking (FRLG)
song mus_rg_nanadungeon, 0, 0 @ Mount Ember (FRLG) song mus_rg_nanadungeon, 0, 0 @ Mt. Ember (FRLG)
song mus_rg_oshie_tv, 0, 0 @ Teachy TV Lesson (FRLG) song mus_rg_oshie_tv, 0, 0 @ Teachy TV Lesson (FRLG)
song mus_rg_nanashima, 0, 0 @ Sevii Islands (FRLG) song mus_rg_nanashima, 0, 0 @ Sevii Islands (FRLG)
song mus_rg_nanaiseki, 0, 0 @ Tanoby Chambers (FRLG) song mus_rg_nanaiseki, 0, 0 @ Tanoby Chambers (FRLG)

BIN
sound/songs/midi/ph_choice_blend.mid Normal file
View File

Binary file not shown.

40
sound/songs/ph_choice_blend.s
View File

@ -1,40 +0,0 @@
.include "MPlayDef.s"
.equ ph_choice_blend_grp, voicegroup130
.equ ph_choice_blend_pri, 4
.equ ph_choice_blend_rev, 0
.equ ph_choice_blend_mvl, 127
.equ ph_choice_blend_key, 0
.equ ph_choice_blend_tbs, 1
.equ ph_choice_blend_exg, 0
.equ ph_choice_blend_cmp, 1
.section .rodata
.global ph_choice_blend
.align 2
@********************** Track 1 **********************@
ph_choice_blend_1:
.byte KEYSH , ph_choice_blend_key+0
.byte TEMPO , 120*ph_choice_blend_tbs/2
.byte VOICE , 30
.byte VOL , 127*ph_choice_blend_mvl/mxv
.byte N54 , Cn3 , v127
.byte W54
.byte FINE
@******************************************************@
.align 2
ph_choice_blend:
.byte 1 @ NumTrks
.byte 0 @ NumBlks
.byte ph_choice_blend_pri @ Priority
.byte ph_choice_blend_rev @ Reverb.
.word ph_choice_blend_grp
.word ph_choice_blend_1
.end