2 files changed, 18 insertions, 29 deletions
diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s
index a6cad8f50..a32f3151b 100644
--- a/data/battle_frontier_1.s
+++ b/data/battle_frontier_1.s
@@ -1,3 +1,5 @@
+#include "constants/flags.h"
+
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -1391,10 +1393,14 @@ gUnknown_0860EFF4:: @ 860EFF4
 	.4byte gText_BattlePyramid
 
 gUnknown_0860F010:: @ 860F010
-	.4byte gUnknown_08680867
-	.4byte gUnknown_086A0869
-	.4byte gUnknown_086C086B
-	.4byte gUnknown_086E086D
+	.2byte FLAG_BADGE01_GET
+	.2byte FLAG_BADGE02_GET
+	.2byte FLAG_BADGE03_GET
+	.2byte FLAG_BADGE04_GET
+	.2byte FLAG_BADGE05_GET
+	.2byte FLAG_BADGE06_GET
+	.2byte FLAG_BADGE07_GET
+	.2byte FLAG_BADGE08_GET
 
 gUnknown_0860F020:: @ 860F020
 	.4byte gUnknown_082A5D6C
diff --git a/data/sound_data.s b/data/sound_data.s
index e2d4467de..f5470dda5 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,31 +1,14 @@
 	.section .rodata
 
-voicegroup_pokemon_cry:: @ 8675D04
-	.incbin "baserom.gba", 0x675D04, 0xAB63
-	
-gUnknown_08680867:: @ 8680867
-	.incbin "baserom.gba", 0x680867, 0x1D48D
+	.include "asm/macros/m4a.inc"
 
-gCryTable:: @ 869DCF4
-	.incbin "baserom.gba", 0x69dcf4, 0x1230
+	.include "sound/voice_groups.inc"
 
-gCryTable2:: @ 869EF24
-	.incbin "baserom.gba", 0x69ef24, 0x1200
+	@ keysplit tables, programmable wave data
+	.incbin "baserom.gba", 0x6b4698, 0x328
 
-gUnknown_086A0124:: @ 86A0124
-	.incbin "baserom.gba", 0x6a0124, 0x745
-	
-gUnknown_086A0869:: @ 86A0869
-	.incbin "baserom.gba", 0x6a0869, 0x14157
+	.include "sound/music_player_table.inc"
+	.include "sound/song_table.inc"
 
-gMPlayTable:: @ 86B49C0
-	.incbin "baserom.gba", 0x6b49c0, 0x30
-
-gSongTable:: @ 86B49F0
-	.incbin "baserom.gba", 0x6b49f0, 0xbe7b
-	
-gUnknown_086C086B:: @ 86C086B
-	.incbin "baserom.gba", 0x6c086b, 0x20002
-
-gUnknown_086E086D:: @ 86E086D
-	.incbin "baserom.gba", 0x6e086d, 0x2c27e3
+	@ direct sound data
+	.incbin "baserom.gba", 0x6b5d04, 0x246338