Sync record_mix.inc

7 files changed, 30 insertions, 49 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 6d4122e84..5adda680a 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -802,27 +802,7 @@ EventScript_SetBrineyLocation_Route109:: @ 819FD55
 
 	.include "data/scripts/pkmn_center_nurse.inc"
 	.include "data/scripts/obtain_item.inc"
-
-UnusedMixRecordsScript: @ 819FFD5
-	lock
-	faceplayer
-	msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq UnusedMixRecordsScript_Yes
-	compare VAR_RESULT, NO
-	goto_if_eq UnusedMixRecordsScript_Done
-	goto UnusedMixRecordsScript_Done
-UnusedMixRecordsScript_Yes: @ 819FFFA
-	special sub_80B929C
-	waitstate
-	lock
-	faceplayer
-UnusedMixRecordsScript_Done: @ 81A0000
-	message UnusedMixRecordsSeeYouAgainText
-	waitmessage
-	waitbuttonpress
-	release
-	end
+	.include "data/scripts/record_mix.inc"
 
 gUnknown_081A0009:: @ 81A0009
 	lockall
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1c48b8501..65c1679b1 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -801,27 +801,7 @@ EventScript_SetBrineyLocation_Route109:: @ 819FD55
 
 	.include "data/scripts/pkmn_center_nurse.inc"
 	.include "data/scripts/obtain_item.inc"
-
-UnusedMixRecordsScript: @ 819FFD5
-	lock
-	faceplayer
-	msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq UnusedMixRecordsScript_Yes
-	compare VAR_RESULT, NO
-	goto_if_eq UnusedMixRecordsScript_Done
-	goto UnusedMixRecordsScript_Done
-UnusedMixRecordsScript_Yes: @ 819FFFA
-	special sub_80B929C
-	waitstate
-	lock
-	faceplayer
-UnusedMixRecordsScript_Done: @ 81A0000
-	message UnusedMixRecordsSeeYouAgainText
-	waitmessage
-	waitbuttonpress
-	release
-	end
+	.include "data/scripts/record_mix.inc"
 
 gUnknown_081A0009:: @ 81A0009
 	lockall
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 036324abb..e700547da 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -685,7 +685,7 @@ TradeCenter_EventScript_1A43FA:: @ 81A43FA
 
 RecordCorner_EventScript_1A4418:: @ 81A4418
 	setvar VAR_0x8005, 0
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -693,7 +693,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418
 
 RecordCorner_EventScript_1A442D:: @ 81A442D
 	setvar VAR_0x8005, 1
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -701,7 +701,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D
 
 RecordCorner_EventScript_1A4442:: @ 81A4442
 	setvar VAR_0x8005, 2
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -709,7 +709,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442
 
 RecordCorner_EventScript_1A4457:: @ 81A4457
 	setvar VAR_0x8005, 3
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
new file mode 100644
index 000000000..6415f9ceb
--- /dev/null
+++ b/data/scripts/record_mix.inc
@@ -0,0 +1,22 @@
+@ Seems this was superseded by the Record Center, and the below scripts are now unused
+EventScript_MixRecordsPrompt: @ 819FFD5
+	lock
+	faceplayer
+	msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq EventScript_MixRecords
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_EndMixRecords
+	goto EventScript_EndMixRecords
+	
+EventScript_MixRecords: @ 819FFFA
+	special RecordMixingPlayerSpotTriggered
+	waitstate
+	lock
+	faceplayer
+EventScript_EndMixRecords: @ 81A0000
+	message UnusedMixRecordsSeeYouAgainText
+	waitmessage
+	waitbuttonpress
+	release
+	end
diff --git a/data/specials.inc b/data/specials.inc
index 71e39c654..0360cf8dd 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -35,7 +35,7 @@ gSpecials::
 	def_special sub_80BBC78
 	def_special sub_80BCE4C
 	def_special DoSecretBasePCTurnOffEffect
-	def_special sub_80B929C
+	def_special RecordMixingPlayerSpotTriggered
 	def_special sub_808347C
 	def_special sub_80834E4
 	def_special sub_808350C
diff --git a/include/record_mixing.h b/include/record_mixing.h
index 2e6b048a6..089a7337f 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -3,7 +3,6 @@
 
 #include <stddef.h>
 
-void sub_80B929C(void);
 void RecordMixing_PrepareExchangePacket(void);
 void RecordMixing_ReceiveExchangePacket(u32 a);
 void Task_RecordMixing_SoundEffect(u8 taskId);
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 8588bf637..9a2d32837 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -44,7 +44,7 @@ struct BattleTowerRecord *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.pl
 
 #define BUFFER_CHUNK_SIZE 200
 
-void sub_80B929C(void)
+void RecordMixingPlayerSpotTriggered(void)
 {
     sub_8083A84(Task_RecordMixing_Main);
 }