summaryrefslogtreecommitdiff
path: root/data/scripts/record_mix.inc
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-05-23 10:51:26 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-05-23 10:51:26 -0400
commitc723d980e772f7e7ab82dbcb7ad07132c09ab5b4 (patch)
tree0bed002b2990b9e837220618a321f3b6517a1099 /data/scripts/record_mix.inc
parentc50a21fba07db80ac44c6f09fd202ba4b2e2c7d3 (diff)
parentffbbc88801de3fc56d0bf5f0af1418ca7cfcfa4f (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data/scripts/record_mix.inc')
-rw-r--r--data/scripts/record_mix.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
index 23f224ae4..e058816ab 100644
--- a/data/scripts/record_mix.inc
+++ b/data/scripts/record_mix.inc
@@ -6,16 +6,15 @@ EventScript_MixRecordsPrompt:: @ 8271D5E
compare VAR_RESULT, YES
goto_if_eq EventScript_MixRecords
compare VAR_RESULT, NO
- goto_if_eq EventScript_DeclineMixRecords
- goto EventScript_DeclineMixRecords
+ goto_if_eq EventScript_EndMixRecords
+ goto EventScript_EndMixRecords
EventScript_MixRecords:: @ 8271D83
special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer
-
-EventScript_DeclineMixRecords:: @ 8271D89
+EventScript_EndMixRecords:: @ 8271D89
message Text_WeHopeToSeeYouAgain
waitmessage
waitbuttonpress