summaryrefslogtreecommitdiff
path: root/maps/ManiasHouse.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-25 10:16:29 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-25 10:16:29 -0500
commit01792e00d2d1b0fc1e5550f13a8851c21917aa60 (patch)
tree2a1241f269e70af4d6712731fef354429da17ed8 /maps/ManiasHouse.asm
parentf599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff)
Rename several script commands
Diffstat (limited to 'maps/ManiasHouse.asm')
-rw-r--r--maps/ManiasHouse.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index f07170951..8d1470916 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -19,11 +19,11 @@ ManiaScript:
iffalse .partyfull
writetext ManiaText_TakeCareOfShuckle
keeptextopen
- waitbutton
+ waitsfx
writetext ManiaText_GotShuckle
playsound SFX_KEY_ITEM
- waitbutton
- loadmovesprites
+ waitsfx
+ closetext
setevent EVENT_GOT_SHUCKIE
end
@@ -31,20 +31,20 @@ ManiaScript:
checkflag ENGINE_SHUCKLE_GIVEN
iffalse .returnshuckie
writetext ManiaText_TakeCareOfShuckle
+ waitbutton
closetext
- loadmovesprites
end
.partyfull:
writetext ManiaText_PartyFull
+ waitbutton
closetext
- loadmovesprites
end
.refusetotakeshuckie:
writetext ManiaText_IfHeComesBack
+ waitbutton
closetext
- loadmovesprites
end
.returnshuckie:
@@ -57,40 +57,40 @@ ManiaScript:
if_equal $3, .superhappy
if_equal $4, .default_postevent
writetext ManiaText_ThankYou
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
.wrong:
writetext ManiaText_ShuckleNotThere
+ waitbutton
closetext
- loadmovesprites
end
.superhappy:
writetext ManiaText_ShuckleLikesYou
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
.refused:
writetext ManiaText_SameAsBeingRobbed
+ waitbutton
closetext
- loadmovesprites
end
.nothingleft:
writetext ManiaText_ShuckleIsYourLastMon
+ waitbutton
closetext
- loadmovesprites
end
.default_postevent:
writetext ManiaText_HappinessSpeech
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x9d300: