From 1039cf3c224e3a41f78295704ba244a7cb921e5e Mon Sep 17 00:00:00 2001
From: JaceCear <11230293+JaceCear@users.noreply.github.com>
Date: Wed, 15 Jul 2026 00:05:05 +0200
Subject: [PATCH] Move music_player_table.inc into shared folder

---
 data/sa1/sound_data.s                        |  2 +-
 data/sa2/sound_data.s                        |  2 +-
 sound/sa2/music_player_table.inc             | 17 -----------------
 sound/{sa1 => shared}/music_player_table.inc |  0
 4 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 sound/sa2/music_player_table.inc
 rename sound/{sa1 => shared}/music_player_table.inc (100%)

diff --git a/data/sa1/sound_data.s b/data/sa1/sound_data.s
index b1f639577a..4555774003 100644
--- a/data/sa1/sound_data.s
+++ b/data/sa1/sound_data.s
@@ -9,6 +9,6 @@ mSectionRodata
 	.include "sound/sa1/voice_groups.inc"
 	.include "sound/sa1/keysplit_tables.inc"
 	.include "sound/sa1/programmable_wave_data.inc"
-	.include "sound/sa1/music_player_table.inc"
+	.include "sound/shared/music_player_table.inc"
 	.include "sound/sa1/song_table.inc"
 	.include "sound/sa1/direct_sound_data.inc"
diff --git a/data/sa2/sound_data.s b/data/sa2/sound_data.s
index 3868ba3262..6e49415d17 100644
--- a/data/sa2/sound_data.s
+++ b/data/sa2/sound_data.s
@@ -8,6 +8,6 @@ mSectionRodata
 	.include "sound/sa2/voice_groups.inc"
 	.include "sound/sa2/keysplit_tables.inc"
 	.include "sound/sa2/programmable_wave_data.inc"
-	.include "sound/sa2/music_player_table.inc"
+	.include "sound/shared/music_player_table.inc"
 	.include "sound/sa2/song_table.inc"
 	.include "sound/sa2/direct_sound_data.inc"
diff --git a/sound/sa2/music_player_table.inc b/sound/sa2/music_player_table.inc
deleted file mode 100644
index 25730fab14..0000000000
--- a/sound/sa2/music_player_table.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-.equiv NUM_TRACKS_BGM, 16
-.equiv NUM_TRACKS_SE1, 16
-.equiv NUM_TRACKS_SE2, 16
-.equiv NUM_TRACKS_SE3, 16
-
-	mSectionRodata
-
-	mAlignWord
-	.global C_DECL(gMPlayTable)
-C_DECL(gMPlayTable):
-	music_player C_DECL(gMPlayInfo_BGM), C_DECL(gMPlayTrack_BGM), NUM_TRACKS_BGM, 0
-mAlignWord
-	music_player C_DECL(gMPlayInfo_SE1), C_DECL(gMPlayTrack_SE1), NUM_TRACKS_SE1, 0
-mAlignWord
-	music_player C_DECL(gMPlayInfo_SE2), C_DECL(gMPlayTrack_SE2), NUM_TRACKS_SE2, 0
-mAlignWord
-	music_player C_DECL(gMPlayInfo_SE3), C_DECL(gMPlayTrack_SE3), NUM_TRACKS_SE3, 0
diff --git a/sound/sa1/music_player_table.inc b/sound/shared/music_player_table.inc
similarity index 100%
rename from sound/sa1/music_player_table.inc
rename to sound/shared/music_player_table.inc