summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route103.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/maps/Route103.inc
parent1e2601a0287fdacfb8f0d680fbe82a274414ea65 (diff)
more script command renaming
Diffstat (limited to 'data/scripts/maps/Route103.inc')
-rw-r--r--data/scripts/maps/Route103.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index 328021785..586075465 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92
Route103_EventScript_14EBAB:: @ 814EBAB
msgbox Route103_Text_16D57A, 4
- playmusic 415, 1
+ playbgm 415, 1
move 2, Route103_Movement_1A0839
waitmove 0
move 2, Route103_Movement_1A0833
@@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB
Route103_EventScript_14EC04:: @ 814EC04
msgbox Route103_Text_16D762, 4
- playmusic 421, 1
+ playbgm 421, 1
move 2, Route103_Movement_1A0839
waitmove 0
move 2, Route103_Movement_1A0833
@@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9
Route103_EventScript_14ED0C:: @ 814ED0C
move 2, Route103_Movement_14ED67
waitmove 0
- playsfx 10
+ playse 10
move 2, Route103_Movement_14ED6B
waitmove 0
goto Route103_EventScript_14ED46
@@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C
Route103_EventScript_14ED29:: @ 814ED29
move 2, Route103_Movement_14ED71
waitmove 0
- playsfx 10
+ playse 10
move 2, Route103_Movement_14ED74
waitmove 0
goto Route103_EventScript_14ED46
@@ -123,8 +123,8 @@ Route103_EventScript_14ED46:: @ 814ED46
setflag 130
setvar 0x40c7, 1
clearflag 979
- playmusicbattle 0
- fadedefault
+ savebgm 0
+ fadedefaultbgm
releaseall
end
@@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94
Route103_EventScript_14EDAB:: @ 814EDAB
trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare_var_to_imm RESULT, 1
goto_if_eq Route103_EventScript_14EDD6
msgbox Route103_Text_1B7E50, 6
@@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6
Route103_EventScript_14EDF1:: @ 814EDF1
trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare_var_to_imm RESULT, 1
goto_if_eq Route103_EventScript_14EE1C
msgbox Route103_Text_1B7F40, 6
@@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37
Route103_EventScript_14EE4E:: @ 814EE4E
trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare_var_to_imm RESULT, 1
goto_if_eq Route103_EventScript_14EE75
msgbox Route103_Text_1B830D, 6