Move NoPokeDoll state: If user kicks out of MoveTutor, should go to "Tutor Refused" instead. Moved the "take money" command to the "successfully taught move" section rather than before the move is taught.

1 files changed, 26 insertions, 9 deletions

diff --git a/Move-Tutor-and-Tutor-Moves.md b/Move-Tutor-and-Tutor-Moves.md
index a0b4443..506cd86 100644
--- a/Move-Tutor-and-Tutor-Moves.md
+++ b/Move-Tutor-and-Tutor-Moves.md
@@ -411,19 +411,22 @@ CeladonCityTutorSoftboiledScript:
 	special MoveTutor
 	if_equal $0, .TeachMove
 
-+.NoPokeDoll:
-+       writetext CeladonCityTutorNoDoll
-+       waitbutton
-+       closetext
-+       end
-
 .TutorRefused:
 	writetext CeladonCityTutorSoftboiledRefused
 	waitbutton
 	closetext
 	end
 
++.NoPokeDoll:
++       writetext CeladonCityTutorNoDoll
++       waitbutton
++       closetext
++       end
+
 .TeachMove
+	writetext CeladonCityTutorPayment
+	takeitem POKE_DOLL
+	waitbutton
 	writetext CeladonCityTutorSoftboiledTaught
 	waitbutton
 	closetext
@@ -431,6 +434,11 @@ CeladonCityTutorSoftboiledScript:
 
 ...
 
++CeladonCityTutorPayment:
++	text "<PLAYER> gave the"
++	line "man a #DOLL."
++	done
+
 CeladonCityTutorSoftboiledTaught:
 	text "Now if your"
 	line "#MON is in a"
@@ -454,9 +462,9 @@ CeladonCityTutorSoftboiledTaught:
 +	done
 ```
 
-If the player has no `POKE_DOLL` in their Pack, the script will jump to `CeladonCityTutorNoDoll`, and will end dialogue with the tutor. If the player has one, one will be taken in exchange to tutor a move.
+If the player has no `POKE_DOLL` in their Pack, the script will jump to `CeladonCityTutorNoDoll`, and will end dialogue with the tutor. If the player has one, the script will enter the Move Tutor dialogue. If the move is successfully taught, one will be taken in exchange to tutor a move. If the player quits out of the menu due to having no compatible Pokémon or changing their mind, they will get the "Refused" dialogue.
 
-To charge a price, replace the `checkitem` command with a `checkmoney`, and after `yesorno`, add a `takemoney` command. Keep in mind you'll have to change the dialogue in `CeladonCityTutorNoDoll` also!
+To charge a price, replace the `checkitem` command with a `checkmoney`, and after `yesorno`, add a `takemoney` command to the `TeachMove` script. Keep in mind you'll have to change the dialogue in `CeladonCityTutorNoDoll` also!
 
 ```diff
 CeladonCityTutorSoftboiledScript:
@@ -471,7 +479,6 @@ CeladonCityTutorSoftboiledScript:
 	writetext CeladonCityTutorSoftboiledText2
 	yesorno
 	iffalse .TutorRefused
-+       takemoney YOUR_MONEY, 1000
 	writebyte SOFTBOILED
 	writetext CeladonCityTutorSoftboiledClear
 	special MoveTutor
@@ -482,6 +489,16 @@ CeladonCityTutorSoftboiledScript:
         waitbutton
         closetext
         end
+
+.TeachMove
+	writetext CeladonCityTutorPayment
+-	takeitem POKE_DOLL
++       takemoney YOUR_MONEY, 1000
+	waitbutton
+	writetext CeladonCityTutorSoftboiledTaught
+	waitbutton
+	closetext
+	end
 ```
 
 For other ideas, look at the Goldenrod move tutor script. Perhaps you want move tutors that appear on different days of the week? Or teach different moves based on what day it is? All of this is possible, and left up to you intrepid assembly hackers to challenge yourself with.
\ No newline at end of file