From 7d1a1abe51950796d9433999ca1e8d8646b7a792 Mon Sep 17 00:00:00 2001 From: Jaizu Date: Mon, 31 Aug 2020 12:12:32 +0200 Subject: [PATCH] Update Rock Climb script Small fixes and make it more consistent with other field move scripts. --- data/scripts/field_move_scripts.inc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index d04304abc9..5d1cb31fcb 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -302,7 +302,6 @@ EventScript_FailSweetScent:: @ 8290CAE Text_FailSweetScent: @ 8290CB7 .string "Looks like there's nothing here…$" - EventScript_UseRockClimb:: lockall checkpartymove MOVE_ROCK_CLIMB @@ -314,16 +313,25 @@ EventScript_UseRockClimb:: compare VAR_RESULT, NO goto_if_eq EventScript_EndRockClimb msgbox Text_MonUsedRockClimb, MSGBOX_DEFAULT + closemessage dofieldeffect FLDEFF_USE_ROCK_CLIMB + waitstate goto EventScript_EndRockClimb -EventScript_CantRockClimb:: @ 8290A84 + +EventScript_CantRockClimb:: msgbox Text_CantRockClimb, MSGBOX_DEFAULT -EventScript_EndRockClimb:: @ 8290A8C + +EventScript_EndRockClimb:: releaseall end + Text_WantToRockClimb: - .string "The cliff is steep.\nWould you like to use Rock Climb?$" + .string "The cliff is steep.\n" + .string "Would you like to use Rock Climb?$" + Text_MonUsedRockClimb: .string "{STR_VAR_1} used Rock Climb!$" + Text_CantRockClimb: - .string "The cliff is steep.\nA Pokémon may be able to climb it.$" + .string "The cliff is steep.\n" + .string "A Pokémon may be able to climb it.$"