summaryrefslogtreecommitdiff
path: root/data/scripts/mauville_man.inc
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-24 17:36:39 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-24 17:36:39 -0500
commit207f8e6a76f6b13855780bb2608be9d8c1f14b15 (patch)
treecbf6a37ec9bbd3c9d10f33550617e645a2725915 /data/scripts/mauville_man.inc
parent1e2601a0287fdacfb8f0d680fbe82a274414ea65 (diff)
more script command renaming
Diffstat (limited to 'data/scripts/mauville_man.inc')
-rw-r--r--data/scripts/mauville_man.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 0a74b3c9a..1881bc242 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -36,7 +36,7 @@ yes_hear_song:
setvar 0x8004, 0
@ Give the player ear rape
special ScrSpecial_PlayBardSong
- pause 60
+ delay 60
special ScrSpecial_HasBardSongBeenChanged
compare_var_to_imm RESULT, FALSE
@ Prompt new lyrics only if song hasn't been changed
@@ -69,7 +69,7 @@ write_lyrics:
setvar 0x8004, 1
@ Give the player ear rape again
special ScrSpecial_PlayBardSong
- pause 60
+ delay 60
msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO
compare_var_to_imm RESULT, NO
goto_if_eq write_lyrics @ Keep looping until player responds YES
@@ -227,7 +227,7 @@ SpeakToStoryteller:
msgbox gTextStoryteller_Introduction, MSGBOX_YESNO
compare_var_to_imm RESULT, NO
goto_if_eq dont_hear_story
- specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+ specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot
compare_var_to_imm RESULT, 0 @ If slot is 0, then the list is empty
goto_if_eq no_stories_recorded
choose_story:
@@ -241,7 +241,7 @@ choose_story:
special ScrSpecial_StorytellerDisplayStory
waittext
waitbutton
- specialval RESULT, ScrSpecial_StorytellerUpdateStat
+ specialvar RESULT, ScrSpecial_StorytellerUpdateStat
compare_var_to_imm RESULT, FALSE
goto_if_eq no_stat_update
goto stat_update
@@ -255,10 +255,10 @@ no_stat_update:
compare_var_to_imm RESULT, YES
goto_if_eq choose_story
yes_hear_story:
- specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
+ specialvar RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
compare_var_to_imm RESULT, TRUE
goto_if_eq cant_record_story @ already recorded story
- specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+ specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot
compare_var_to_imm RESULT, 4
goto_if_eq cant_record_story @ story list is full
goto prompt_record_story
@@ -268,7 +268,7 @@ prompt_record_story:
msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO
compare_var_to_imm RESULT, NO
goto_if_eq dont_hear_story
- specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat
+ specialvar RESULT, ScrSpecial_StorytellerInitializeRandomStat
compare_var_to_imm RESULT, TRUE
goto_if_eq stat_update
msgbox gTextStoryteller_ImNotSatisfied, 4