From 7d24f2d62c307a1d72b6bb766258fc91d6e79a85 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 18:15:13 -0400 Subject: [PATCH] Document record_mix.inc and clean surf.inc --- data/scripts/record_mix.inc | 15 ++++++++------- data/scripts/surf.inc | 12 +++++------- data/text/record_mix.inc | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc index 7e9a2de7e6..f70b7f83e8 100644 --- a/data/scripts/record_mix.inc +++ b/data/scripts/record_mix.inc @@ -1,21 +1,22 @@ -EventScript_271D5E:: @ 8271D5E +@ Seems this was superseded by the Record Center, and the below scripts are now unused +EventScript_MixRecordsPrompt:: @ 8271D5E lock faceplayer msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq EventScript_271D83 + goto_if_eq EventScript_MixRecords compare VAR_RESULT, 0 - goto_if_eq EventScript_271D89 - goto EventScript_271D89 + goto_if_eq EventScript_DeclineMixRecords + goto EventScript_DeclineMixRecords -EventScript_271D83:: @ 8271D83 +EventScript_MixRecords:: @ 8271D83 special RecordMixingPlayerSpotTriggered waitstate lock faceplayer -EventScript_271D89:: @ 8271D89 - message Text_WouldNotLikeToMixRecords +EventScript_DeclineMixRecords:: @ 8271D89 + message Text_WeHopeToSeeYouAgain waitmessage waitbuttonpress release diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index d89aa98c11..154cc53c23 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -1,18 +1,16 @@ EventScript_UseSurf:: @ 8271EA0 checkpartymove MOVE_SURF - compare VAR_RESULT, 6 - goto_if_eq EventScript_CantSurf + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_EndUseSurf bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall msgbox gText_WantToUseSurf, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_CancelSurf + goto_if_eq EventScript_ReleaseUseSurf msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF - -EventScript_CancelSurf:: @ 8271ED5 +EventScript_ReleaseUseSurf:: @ 8271ED5 releaseall - -EventScript_CantSurf:: @ 8271ED6 +EventScript_EndUseSurf:: @ 8271ED6 end diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc index 8f995af1d9..1270c0c0a7 100644 --- a/data/text/record_mix.inc +++ b/data/text/record_mix.inc @@ -2,5 +2,5 @@ Text_WouldYouLikeToMixRecords: @ 827260D .string "Would you like to mix records with\n" .string "other TRAINERS?$" -Text_WouldNotLikeToMixRecords: @ 8272640 +Text_WeHopeToSeeYouAgain: @ 8272640 .string "We hope to see you again!$"