summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/direct_sound_data.inc (renamed from sound/direct_sound_data.s)0
-rw-r--r--sound/keysplit_tables.inc (renamed from sound/keysplit_tables.s)0
-rw-r--r--sound/music_player_table.inc (renamed from sound/music_player_table.s)0
-rw-r--r--sound/programmable_wave_data.inc (renamed from sound/programmable_wave_data.s)0
-rw-r--r--sound/song_table.inc (renamed from sound/song_table.s)2
-rw-r--r--sound/songs/bgm_field13.s2
-rw-r--r--sound/songs/bgm_nibi.s2
-rw-r--r--sound/songs/bgm_pcc.s2
-rw-r--r--sound/songs/bgm_radio_tower_occupied.s (renamed from sound/songs/song_467.s)238
-rw-r--r--sound/songs/bgm_suikun.s2
-rw-r--r--sound/songs/se_stop.s2
-rw-r--r--sound/voice_groups.inc (renamed from sound/voice_groups.s)2
12 files changed, 126 insertions, 126 deletions
diff --git a/sound/direct_sound_data.s b/sound/direct_sound_data.inc
index 71e92f9ee..71e92f9ee 100644
--- a/sound/direct_sound_data.s
+++ b/sound/direct_sound_data.inc
diff --git a/sound/keysplit_tables.s b/sound/keysplit_tables.inc
index 1dabf3c55..1dabf3c55 100644
--- a/sound/keysplit_tables.s
+++ b/sound/keysplit_tables.inc
diff --git a/sound/music_player_table.s b/sound/music_player_table.inc
index eadcfc90a..eadcfc90a 100644
--- a/sound/music_player_table.s
+++ b/sound/music_player_table.inc
diff --git a/sound/programmable_wave_data.s b/sound/programmable_wave_data.inc
index 7a60ed5a7..7a60ed5a7 100644
--- a/sound/programmable_wave_data.s
+++ b/sound/programmable_wave_data.inc
diff --git a/sound/song_table.s b/sound/song_table.inc
index 14f811b08..ac2e3b494 100644
--- a/sound/song_table.s
+++ b/sound/song_table.inc
@@ -467,7 +467,7 @@ gSongTable:: @ 845548C
song bgm_battle35, 0, 0
song bgm_battle38, 0, 0
song bgm_battle30, 0, 0
- song song_467, 0, 0
+ song bgm_radio_tower_occupied, 0, 0
.align 2
dummy_song_header: @ 845632C
diff --git a/sound/songs/bgm_field13.s b/sound/songs/bgm_field13.s
index 6afab36e3..2b6b8383a 100644
--- a/sound/songs/bgm_field13.s
+++ b/sound/songs/bgm_field13.s
@@ -1,6 +1,6 @@
.include "MPlayDef.s"
- .equ bgm_field13_grp, voicegroup_842FC88
+ .equ bgm_field13_grp, voicegroup_pokemon_cry
.equ bgm_field13_pri, 0
.equ bgm_field13_rev, reverb_set+50
.equ bgm_field13_mvl, 127
diff --git a/sound/songs/bgm_nibi.s b/sound/songs/bgm_nibi.s
index af7b666fe..9520d02a6 100644
--- a/sound/songs/bgm_nibi.s
+++ b/sound/songs/bgm_nibi.s
@@ -1,6 +1,6 @@
.include "MPlayDef.s"
- .equ bgm_nibi_grp, voicegroup_842FC88
+ .equ bgm_nibi_grp, voicegroup_pokemon_cry
.equ bgm_nibi_pri, 0
.equ bgm_nibi_rev, reverb_set+50
.equ bgm_nibi_mvl, 127
diff --git a/sound/songs/bgm_pcc.s b/sound/songs/bgm_pcc.s
index c9c8a96fd..a6e76660f 100644
--- a/sound/songs/bgm_pcc.s
+++ b/sound/songs/bgm_pcc.s
@@ -1,6 +1,6 @@
.include "MPlayDef.s"
- .equ bgm_pcc_grp, voicegroup_842FC88
+ .equ bgm_pcc_grp, voicegroup_pokemon_cry
.equ bgm_pcc_pri, 0
.equ bgm_pcc_rev, reverb_set+50
.equ bgm_pcc_mvl, 127
diff --git a/sound/songs/song_467.s b/sound/songs/bgm_radio_tower_occupied.s
index bab764a8a..29ea26185 100644
--- a/sound/songs/song_467.s
+++ b/sound/songs/bgm_radio_tower_occupied.s
@@ -1,31 +1,31 @@
.include "MPlayDef.s"
- .equ song_467_grp, voicegroup_8454C54
- .equ song_467_pri, 0
- .equ song_467_rev, reverb_set+50
- .equ song_467_mvl, 127
- .equ song_467_key, 0
- .equ song_467_tbs, 1
- .equ song_467_exg, 0
- .equ song_467_cmp, 1
+ .equ bgm_radio_tower_occupied_grp, voicegroup_8454C54
+ .equ bgm_radio_tower_occupied_pri, 0
+ .equ bgm_radio_tower_occupied_rev, reverb_set+50
+ .equ bgm_radio_tower_occupied_mvl, 127
+ .equ bgm_radio_tower_occupied_key, 0
+ .equ bgm_radio_tower_occupied_tbs, 1
+ .equ bgm_radio_tower_occupied_exg, 0
+ .equ bgm_radio_tower_occupied_cmp, 1
.section .rodata
- .global song_467
+ .global bgm_radio_tower_occupied
.align 2
@********************** Track 1 **********************@
-song_467_1:
- .byte KEYSH , song_467_key+0
- .byte TEMPO , 152*song_467_tbs/2
+bgm_radio_tower_occupied_1:
+ .byte KEYSH , bgm_radio_tower_occupied_key+0
+ .byte TEMPO , 152*bgm_radio_tower_occupied_tbs/2
.byte VOICE , 21
- .byte VOL , 79*song_467_mvl/mxv
+ .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv
.byte PAN , c_v+0
.byte N06 , Cn4 , v112
.byte W06
.byte Dn4
.byte W06
-song_467_1_B1:
+bgm_radio_tower_occupied_1_B1:
.byte N06 , Ds4 , v112
.byte W12
.byte Dn4
@@ -82,7 +82,7 @@ song_467_1_B1:
.byte W12
.byte Fs4
.byte W12
-song_467_1_000:
+bgm_radio_tower_occupied_1_000:
.byte W12
.byte N06 , Bn2 , v112
.byte W48
@@ -90,11 +90,11 @@ song_467_1_000:
.byte W36
.byte PEND
.byte PATT
- .word song_467_1_000
+ .word bgm_radio_tower_occupied_1_000
.byte PATT
- .word song_467_1_000
+ .word bgm_radio_tower_occupied_1_000
.byte W96
-song_467_1_001:
+bgm_radio_tower_occupied_1_001:
.byte W21
.byte N03 , Bn3 , v112
.byte W03
@@ -107,7 +107,7 @@ song_467_1_001:
.byte N36 , Ds4
.byte W12
.byte PEND
-song_467_1_002:
+bgm_radio_tower_occupied_1_002:
.byte W24
.byte N24 , Dn4 , v112
.byte W24
@@ -153,9 +153,9 @@ song_467_1_002:
.byte Fs4
.byte W06
.byte PATT
- .word song_467_1_001
+ .word bgm_radio_tower_occupied_1_001
.byte PATT
- .word song_467_1_002
+ .word bgm_radio_tower_occupied_1_002
.byte N06 , As3 , v112
.byte W36
.byte N03 , Fs3
@@ -194,7 +194,7 @@ song_467_1_002:
.byte W06
.byte Dn3
.byte W06
-song_467_1_003:
+bgm_radio_tower_occupied_1_003:
.byte W12
.byte N06 , Fn3 , v112
.byte W48
@@ -202,9 +202,9 @@ song_467_1_003:
.byte W36
.byte PEND
.byte PATT
- .word song_467_1_003
+ .word bgm_radio_tower_occupied_1_003
.byte PATT
- .word song_467_1_003
+ .word bgm_radio_tower_occupied_1_003
.byte W12
.byte N06 , Fn3 , v112
.byte W48
@@ -289,21 +289,21 @@ song_467_1_003:
.byte Dn4
.byte W06
.byte GOTO
- .word song_467_1_B1
+ .word bgm_radio_tower_occupied_1_B1
.byte FINE
@********************** Track 2 **********************@
-song_467_2:
- .byte KEYSH , song_467_key+0
+bgm_radio_tower_occupied_2:
+ .byte KEYSH , bgm_radio_tower_occupied_key+0
.byte VOICE , 21
- .byte VOL , 79*song_467_mvl/mxv
+ .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv
.byte PAN , c_v+0
.byte N06 , Cn5 , v112
.byte W06
.byte Dn5
.byte W06
-song_467_2_B1:
+bgm_radio_tower_occupied_2_B1:
.byte N06 , Ds5 , v112
.byte W12
.byte Dn5
@@ -352,7 +352,7 @@ song_467_2_B1:
.byte W12
.byte Ds5
.byte W12
-song_467_2_000:
+bgm_radio_tower_occupied_2_000:
.byte W12
.byte N06 , Fn3 , v112
.byte W48
@@ -360,9 +360,9 @@ song_467_2_000:
.byte W36
.byte PEND
.byte PATT
- .word song_467_2_000
+ .word bgm_radio_tower_occupied_2_000
.byte PATT
- .word song_467_2_000
+ .word bgm_radio_tower_occupied_2_000
.byte N06 , Gs3 , v112
.byte W06
.byte Fn3
@@ -395,7 +395,7 @@ song_467_2_000:
.byte W06
.byte Dn3
.byte W06
-song_467_2_001:
+bgm_radio_tower_occupied_2_001:
.byte W21
.byte N03 , Dn4 , v112
.byte W03
@@ -408,7 +408,7 @@ song_467_2_001:
.byte N36 , Fs4
.byte W12
.byte PEND
-song_467_2_002:
+bgm_radio_tower_occupied_2_002:
.byte W24
.byte N24 , Fn4 , v112
.byte W24
@@ -438,9 +438,9 @@ song_467_2_002:
.byte Dn5
.byte W06
.byte PATT
- .word song_467_2_001
+ .word bgm_radio_tower_occupied_2_001
.byte PATT
- .word song_467_2_002
+ .word bgm_radio_tower_occupied_2_002
.byte N06 , Ds4 , v112
.byte W12
.byte Ds3
@@ -591,18 +591,18 @@ song_467_2_002:
.byte Dn5
.byte W06
.byte GOTO
- .word song_467_2_B1
+ .word bgm_radio_tower_occupied_2_B1
.byte FINE
@********************** Track 3 **********************@
-song_467_3:
- .byte KEYSH , song_467_key+0
+bgm_radio_tower_occupied_3:
+ .byte KEYSH , bgm_radio_tower_occupied_key+0
.byte VOICE , 21
- .byte VOL , 79*song_467_mvl/mxv
+ .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv
.byte PAN , c_v+0
.byte W12
-song_467_3_B1:
+bgm_radio_tower_occupied_3_B1:
.byte N06 , Fn2 , v112
.byte W12
.byte Gs2
@@ -613,7 +613,7 @@ song_467_3_B1:
.byte W24
.byte N36 , Dn2
.byte W36
-song_467_3_000:
+bgm_radio_tower_occupied_3_000:
.byte N06 , Cn2 , v112
.byte W12
.byte Cn3
@@ -631,7 +631,7 @@ song_467_3_000:
.byte Gn2
.byte W12
.byte PEND
-song_467_3_001:
+bgm_radio_tower_occupied_3_001:
.byte N06 , Cn2 , v112
.byte W12
.byte N06
@@ -650,10 +650,10 @@ song_467_3_001:
.byte W12
.byte PEND
.byte PATT
- .word song_467_3_000
+ .word bgm_radio_tower_occupied_3_000
.byte PATT
- .word song_467_3_001
-song_467_3_002:
+ .word bgm_radio_tower_occupied_3_001
+bgm_radio_tower_occupied_3_002:
.byte N06 , Gs1 , v112
.byte W12
.byte Gs2
@@ -675,7 +675,7 @@ song_467_3_002:
.byte Cn2
.byte W06
.byte PEND
-song_467_3_003:
+bgm_radio_tower_occupied_3_003:
.byte N06 , Gs1 , v112
.byte W12
.byte Gs2
@@ -694,7 +694,7 @@ song_467_3_003:
.byte W12
.byte PEND
.byte PATT
- .word song_467_3_002
+ .word bgm_radio_tower_occupied_3_002
.byte N06 , Gs1 , v112
.byte W12
.byte Fn2
@@ -712,19 +712,19 @@ song_467_3_003:
.byte Gs2
.byte W12
.byte PATT
- .word song_467_3_000
+ .word bgm_radio_tower_occupied_3_000
.byte PATT
- .word song_467_3_001
+ .word bgm_radio_tower_occupied_3_001
.byte PATT
- .word song_467_3_000
+ .word bgm_radio_tower_occupied_3_000
.byte PATT
- .word song_467_3_001
+ .word bgm_radio_tower_occupied_3_001
.byte PATT
- .word song_467_3_000
+ .word bgm_radio_tower_occupied_3_000
.byte PATT
- .word song_467_3_001
+ .word bgm_radio_tower_occupied_3_001
.byte PATT
- .word song_467_3_000
+ .word bgm_radio_tower_occupied_3_000
.byte N06 , Cn2 , v112
.byte W12
.byte N06
@@ -746,13 +746,13 @@ song_467_3_003:
.byte Fn2
.byte W06
.byte PATT
- .word song_467_3_002
+ .word bgm_radio_tower_occupied_3_002
.byte PATT
- .word song_467_3_003
+ .word bgm_radio_tower_occupied_3_003
.byte PATT
- .word song_467_3_002
+ .word bgm_radio_tower_occupied_3_002
.byte PATT
- .word song_467_3_003
+ .word bgm_radio_tower_occupied_3_003
.byte N06 , Cn2 , v112
.byte W12
.byte Cn3
@@ -826,20 +826,20 @@ song_467_3_003:
.byte N06 , Gs3
.byte W12
.byte GOTO
- .word song_467_3_B1
+ .word bgm_radio_tower_occupied_3_B1
.byte FINE
@********************** Track 4 **********************@
-song_467_4:
- .byte KEYSH , song_467_key+0
+bgm_radio_tower_occupied_4:
+ .byte KEYSH , bgm_radio_tower_occupied_key+0
.byte VOICE , 126
.byte PAN , c_v+0
- .byte VOL , 41*song_467_mvl/mxv
+ .byte VOL , 41*bgm_radio_tower_occupied_mvl/mxv
.byte W12
-song_467_4_B1:
+bgm_radio_tower_occupied_4_B1:
.byte W96
-song_467_4_000:
+bgm_radio_tower_occupied_4_000:
.byte W12
.byte N12 , Gn5 , v032
.byte W24
@@ -851,40 +851,40 @@ song_467_4_000:
.byte W12
.byte PEND
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte W96
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte W12
.byte N12 , Gn5 , v032
.byte W24
@@ -893,24 +893,24 @@ song_467_4_000:
.byte Gn5 , v036
.byte W36
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte PATT
- .word song_467_4_000
+ .word bgm_radio_tower_occupied_4_000
.byte W96
.byte W96
.byte GOTO
- .word song_467_4_B1
+ .word bgm_radio_tower_occupied_4_B1
.byte FINE
@********************** Track 5 **********************@
-song_467_5:
- .byte KEYSH , song_467_key+0
+bgm_radio_tower_occupied_5:
+ .byte KEYSH , bgm_radio_tower_occupied_key+0
.byte VOICE , 0
- .byte VOL , 79*song_467_mvl/mxv
+ .byte VOL , 79*bgm_radio_tower_occupied_mvl/mxv
.byte PAN , c_v+4
.byte W12
-song_467_5_B1:
+bgm_radio_tower_occupied_5_B1:
.byte N48 , An2 , v112
.byte W48
.byte N12 , En1
@@ -925,7 +925,7 @@ song_467_5_B1:
.byte W06
.byte N06
.byte W06
-song_467_5_000:
+bgm_radio_tower_occupied_5_000:
.byte N12 , Cn1 , v112
.byte W24
.byte En1
@@ -936,17 +936,17 @@ song_467_5_000:
.byte W24
.byte PEND
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte N48 , An2 , v112
.byte W48
.byte N12 , En1
@@ -962,27 +962,27 @@ song_467_5_000:
.byte N06
.byte W06
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte N12 , Cn1 , v112
.byte W24
.byte En1
@@ -996,9 +996,9 @@ song_467_5_000:
.byte N06
.byte W06
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte PATT
- .word song_467_5_000
+ .word bgm_radio_tower_occupied_5_000
.byte N48 , An2 , v112
.byte W48
.byte N12 , En1
@@ -1026,24 +1026,24 @@ song_467_5_000:
.byte N06
.byte W06
.byte GOTO
- .word song_467_5_B1
+ .word bgm_radio_tower_occupied_5_B1
.byte FINE
@******************************************************@
.align 2
-song_467:
+bgm_radio_tower_occupied:
.byte 5 @ NumTrks
.byte 0 @ NumBlks
- .byte song_467_pri @ Priority
- .byte song_467_rev @ Reverb.
+ .byte bgm_radio_tower_occupied_pri @ Priority
+ .byte bgm_radio_tower_occupied_rev @ Reverb.
- .word song_467_grp
+ .word bgm_radio_tower_occupied_grp
- .word song_467_1
- .word song_467_2
- .word song_467_3
- .word song_467_4
- .word song_467_5
+ .word bgm_radio_tower_occupied_1
+ .word bgm_radio_tower_occupied_2
+ .word bgm_radio_tower_occupied_3
+ .word bgm_radio_tower_occupied_4
+ .word bgm_radio_tower_occupied_5
.end
diff --git a/sound/songs/bgm_suikun.s b/sound/songs/bgm_suikun.s
index 25e5b550f..738e574f1 100644
--- a/sound/songs/bgm_suikun.s
+++ b/sound/songs/bgm_suikun.s
@@ -1,6 +1,6 @@
.include "MPlayDef.s"
- .equ bgm_suikun_grp, voicegroup_842FC88
+ .equ bgm_suikun_grp, voicegroup_pokemon_cry
.equ bgm_suikun_pri, 0
.equ bgm_suikun_rev, reverb_set+50
.equ bgm_suikun_mvl, 127
diff --git a/sound/songs/se_stop.s b/sound/songs/se_stop.s
index c2bae91cd..6e540d2b9 100644
--- a/sound/songs/se_stop.s
+++ b/sound/songs/se_stop.s
@@ -1,6 +1,6 @@
.include "MPlayDef.s"
- .equ se_stop_grp, voicegroup_842FC88
+ .equ se_stop_grp, voicegroup_pokemon_cry
.equ se_stop_pri, 0
.equ se_stop_rev, reverb_set+40
.equ se_stop_mvl, 127
diff --git a/sound/voice_groups.s b/sound/voice_groups.inc
index f250a394c..3ce443a5c 100644
--- a/sound/voice_groups.s
+++ b/sound/voice_groups.inc
@@ -1,5 +1,5 @@
.align 2
-voicegroup_842FC88:: @ 842FC8
+voicegroup_pokemon_cry:: @ 842FC8
voice_keysplit_all voicegroup_842FEF8 @ 842FC88
voice_keysplit voicegroup_8430204, KeySplitTable_8455224 @ 842FC94
voice_square_1 0, 2, 0, 0, 15, 0 @ 842FCA0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 07:15:54 +0000