diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-28 14:22:43 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-28 14:24:46 -0400 |
| commit | 9604fa3936bc1144d4f5abd8312ec71abb538bc9 (patch) | |
| tree | c1dffc9dbf8d26d85818fbcde11a976b21001583 /data | |
| parent | d1d59596f10f97acc58a523d3d99e3ba570b2536 (diff) | |
Sync record_mix.inc
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 22 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 8 | ||||
| -rw-r--r-- | data/scripts/record_mix.inc | 22 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
4 files changed, 28 insertions, 26 deletions
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 |