summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/song_table.inc2
-rw-r--r--sound/songs/midi/mus_me_rg_photo.midbin0 -> 841 bytes
-rw-r--r--sound/songs/mus_me_rg_photo.s258
5 files changed, 5 insertions, 260 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 19bc3bb01..7775643f1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1015,7 +1015,7 @@ SECTIONS {
sound/songs/mus_rg_fan2.o(.rodata);
sound/songs/mus_rg_fan5.o(.rodata);
sound/songs/mus_rg_fan6.o(.rodata);
- sound/songs/mus_me_rg_photo.o(.rodata);
+ sound/songs/midi/mus_me_rg_photo.o(.rodata);
sound/songs/mus_rg_titlerog.o(.rodata);
sound/songs/mus_rg_get_yasei.o(.rodata);
sound/songs/mus_rg_sousa.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c67aa6392..7968f4e08 100644
--- a/songs.mk
+++ b/songs.mk
@@ -267,6 +267,9 @@ $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid
$(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G103 -V090 -P5
+$(MID_SUBDIR)/mus_me_rg_photo.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5
+
$(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 8ea7eebe0..41a935369 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -537,7 +537,7 @@ gSongTable:: @ 86B49F0
song mus_rg_fan2, 2, 2 @ Fanfare 2
song mus_rg_fan5, 2, 2 @ Obtained a Starter!
song mus_rg_fan6, 2, 2 @ Pokémon Caught! (Used in Emerald)
- song mus_me_rg_photo, 2, 2 @ Trainer Photo
+ song mus_me_rg_photo, 2, 2 @ Pokémon Printer (FRLG)
song mus_rg_titlerog, 0, 0 @ Game Freak
song mus_rg_get_yasei, 0, 0 @ Pokémon Caught Victory Theme
song mus_rg_sousa, 0, 0 @ Starting Tutorial
diff --git a/sound/songs/midi/mus_me_rg_photo.mid b/sound/songs/midi/mus_me_rg_photo.mid
new file mode 100644
index 000000000..76fce4af3
--- /dev/null
+++ b/sound/songs/midi/mus_me_rg_photo.mid
Binary files differ
diff --git a/sound/songs/mus_me_rg_photo.s b/sound/songs/mus_me_rg_photo.s
deleted file mode 100644
index fb7682273..000000000
--- a/sound/songs/mus_me_rg_photo.s
+++ /dev/null
@@ -1,258 +0,0 @@
- .include "MPlayDef.s"
-
- .equ mus_me_rg_photo_grp, voicegroup180
- .equ mus_me_rg_photo_pri, 5
- .equ mus_me_rg_photo_rev, reverb_set+50
- .equ mus_me_rg_photo_mvl, 127
- .equ mus_me_rg_photo_key, 0
- .equ mus_me_rg_photo_tbs, 1
- .equ mus_me_rg_photo_exg, 0
- .equ mus_me_rg_photo_cmp, 1
-
- .section .rodata
- .global mus_me_rg_photo
- .align 2
-
-@********************** Track 1 **********************@
-
-mus_me_rg_photo_1:
- .byte KEYSH , mus_me_rg_photo_key+0
- .byte TEMPO , 192*mus_me_rg_photo_tbs/2
- .byte VOICE , 1
- .byte XCMD , xIECV , 8
- .byte xIECL , 8
- .byte PAN , c_v+0
- .byte VOL , 81*mus_me_rg_photo_mvl/mxv
- .byte BEND , c_v+2
- .byte N03 , Ds4 , v068
- .byte W03
- .byte Dn4 , v032
- .byte W03
- .byte Fn4 , v068
- .byte W03
- .byte Ds4 , v032
- .byte W03
- .byte Gn4 , v068
- .byte W03
- .byte Fn4 , v032
- .byte W03
- .byte As4 , v068
- .byte W03
- .byte Gn4 , v032
- .byte W03
- .byte Ds5 , v068
- .byte W03
- .byte As4 , v032
- .byte W03
- .byte Fn5 , v068
- .byte W03
- .byte Dn5 , v032
- .byte W03
- .byte Gn5 , v068
- .byte W03
- .byte Ds5 , v032
- .byte W03
- .byte As5 , v068
- .byte W03
- .byte Gn5 , v032
- .byte W03
- .byte Ds6 , v068
- .byte W03
- .byte As5 , v056
- .byte W03
- .byte Ds6 , v048
- .byte W03
- .byte As5 , v040
- .byte W03
- .byte Ds6 , v028
- .byte W03
- .byte As5 , v024
- .byte W03
- .byte Ds6 , v016
- .byte W03
- .byte As5 , v008
- .byte W03
- .byte VOL , 0*mus_me_rg_photo_mvl/mxv
- .byte W24
- .byte 0*mus_me_rg_photo_mvl/mxv
- .byte FINE
-
-@********************** Track 2 **********************@
-
-mus_me_rg_photo_2:
- .byte KEYSH , mus_me_rg_photo_key+0
- .byte VOICE , 5
- .byte XCMD , xIECV , 8
- .byte xIECL , 8
- .byte PAN , c_v-32
- .byte VOL , 67*mus_me_rg_photo_mvl/mxv
- .byte BEND , c_v+0
- .byte N03 , Gn4 , v068
- .byte W03
- .byte Dn4 , v032
- .byte W03
- .byte Gn4 , v068
- .byte W03
- .byte Ds4 , v032
- .byte W03
- .byte Gn4 , v068
- .byte W03
- .byte Fn4 , v032
- .byte W03
- .byte As4 , v068
- .byte W03
- .byte Gn4 , v032
- .byte W03
- .byte Ds5 , v068
- .byte W03
- .byte As4 , v032
- .byte W03
- .byte Fn5 , v068
- .byte W03
- .byte Dn5 , v032
- .byte W03
- .byte Gn5 , v068
- .byte W03
- .byte Ds5 , v032
- .byte W03
- .byte As5 , v068
- .byte W03
- .byte Gn5 , v032
- .byte W03
- .byte Ds6 , v068
- .byte W03
- .byte As5 , v056
- .byte W03
- .byte Ds6 , v048
- .byte W03
- .byte As5 , v040
- .byte W03
- .byte Ds6 , v028
- .byte W03
- .byte As5 , v024
- .byte W03
- .byte Ds6 , v016
- .byte W03
- .byte As5 , v008
- .byte W03
- .byte VOL , 1*mus_me_rg_photo_mvl/mxv
- .byte W24
- .byte FINE
-
-@********************** Track 3 **********************@
-
-mus_me_rg_photo_3:
- .byte KEYSH , mus_me_rg_photo_key+0
- .byte VOICE , 4
- .byte XCMD , xIECV , 8
- .byte xIECL , 8
- .byte PAN , c_v+32
- .byte VOL , 59*mus_me_rg_photo_mvl/mxv
- .byte N03 , Ds3 , v068
- .byte W03
- .byte Dn3 , v032
- .byte W03
- .byte Fn3 , v068
- .byte W03
- .byte Ds3 , v032
- .byte W03
- .byte Gn3 , v068
- .byte W03
- .byte Fn3 , v032
- .byte W03
- .byte As3 , v068
- .byte W03
- .byte Gn3 , v032
- .byte W03
- .byte Ds4 , v068
- .byte W03
- .byte As3 , v032
- .byte W03
- .byte Fn4 , v068
- .byte W03
- .byte Dn4 , v032
- .byte W03
- .byte Gn4 , v068
- .byte W03
- .byte Ds4 , v032
- .byte W03
- .byte As4 , v068
- .byte W03
- .byte Gn4 , v032
- .byte W03
- .byte Ds5 , v068
- .byte W03
- .byte As4 , v056
- .byte W03
- .byte Ds5 , v048
- .byte W03
- .byte As4 , v040
- .byte W03
- .byte Ds5 , v028
- .byte W03
- .byte As4 , v024
- .byte W03
- .byte Ds5 , v016
- .byte W03
- .byte As4 , v008
- .byte W03
- .byte VOL , 1*mus_me_rg_photo_mvl/mxv
- .byte W24
- .byte 0*mus_me_rg_photo_mvl/mxv
- .byte FINE
-
-@********************** Track 4 **********************@
-
-mus_me_rg_photo_4:
- .byte KEYSH , mus_me_rg_photo_key+0
- .byte VOICE , 127
- .byte PAN , c_v+0
- .byte VOL , 63*mus_me_rg_photo_mvl/mxv
- .byte BEND , c_v+0
- .byte N01 , Cn5 , v112
- .byte W02
- .byte An5
- .byte W14
- .byte N03 , Gs5 , v120
- .byte W08
- .byte W24
- .byte W24
- .byte W24
- .byte FINE
-
-@********************** Track 5 **********************@
-
-mus_me_rg_photo_5:
- .byte KEYSH , mus_me_rg_photo_key+0
- .byte VOICE , 126
- .byte PAN , c_v+0
- .byte VOL , 100*mus_me_rg_photo_mvl/mxv
- .byte N02 , Cs3 , v127
- .byte W10
- .byte N01 , Bn3 , v116
- .byte W06
- .byte N02 , En4 , v127
- .byte W08
- .byte W24
- .byte W24
- .byte W24
- .byte FINE
-
-@******************************************************@
- .align 2
-
-mus_me_rg_photo:
- .byte 5 @ NumTrks
- .byte 0 @ NumBlks
- .byte mus_me_rg_photo_pri @ Priority
- .byte mus_me_rg_photo_rev @ Reverb.
-
- .word mus_me_rg_photo_grp
-
- .word mus_me_rg_photo_1
- .word mus_me_rg_photo_2
- .word mus_me_rg_photo_3
- .word mus_me_rg_photo_4
- .word mus_me_rg_photo_5
-
- .end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 01:20:22 +0000