summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/hangups.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-03-10 16:39:31 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2019-03-10 16:39:31 -0400
commitf5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch)
tree2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /engine/phone/scripts/hangups.asm
parente002b536af8423f420e13e93d6c0e59f94ee5044 (diff)
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
Diffstat (limited to 'engine/phone/scripts/hangups.asm')
-rw-r--r--engine/phone/scripts/hangups.asm68
1 files changed, 34 insertions, 34 deletions
diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm
index 713f8eac9..55d2f8144 100644
--- a/engine/phone/scripts/hangups.asm
+++ b/engine/phone/scripts/hangups.asm
@@ -1,132 +1,132 @@
JackPhoneTips:
farwritetext UnknownText_0x1745c2
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0900:
farwritetext UnknownText_0x17485b
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa0908:
farwritetext UnknownText_0x17496b
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0910:
farwritetext UnknownText_0x174c29
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0918:
farwritetext UnknownText_0x174ec5
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa0920:
farwritetext UnknownText_0x17519b
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0928:
farwritetext UnknownText_0x17549b
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa0930:
farwritetext UnknownText_0x17571d
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0938:
farwritetext UnknownText_0x175abe
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0940:
farwritetext UnknownText_0x175eaf
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0948:
farwritetext UnknownText_0x1768b0
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa0950:
farwritetext UnknownText_0x176d32
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0958:
farwritetext UnknownText_0x1770fb
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0960:
farwritetext UnknownText_0x177465
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa0968:
farwritetext UnknownText_0x64bc6
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0970:
farwritetext UnknownText_0x64e90
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0978:
farwritetext UnknownText_0x65161
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa0980:
farwritetext UnknownText_0x65a23
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0988:
farwritetext UnknownText_0x65d5c
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0990:
farwritetext UnknownText_0x65ff2
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa0998:
farwritetext UnknownText_0x6651e
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa09a0:
farwritetext UnknownText_0x66882
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
VanceLookingForward:
farwritetext VanceLookingForwardText
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
WiltonHaventFoundAnything:
farwritetext WiltonHaventFoundAnythingText
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
ParryBattleWithMe:
farwritetext ParryBattleWithMeText
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
ErinWorkingHardScript:
farwritetext ErinWorkingHardText
buttonsound
- jump PhoneScript_HangupText_Female
+ sjump PhoneScript_HangupText_Female
UnknownScript_0xa09c8:
random 3
@@ -137,17 +137,17 @@ UnknownScript_0xa09c8:
UnknownScript_0xa09d6:
farwritetext UnknownText_0x64846
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa09de:
farwritetext UnknownText_0x64881
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
UnknownScript_0xa09e6:
farwritetext UnknownText_0x648dc
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
KenjiAnswerPhoneScript:
readvar VAR_KENJI_BREAK
@@ -155,12 +155,12 @@ KenjiAnswerPhoneScript:
ifequal 1, .OnBreak
farwritetext UnknownText_0x66e17
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
.Training:
farwritetext UnknownText_0x66e67
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
.OnBreak:
checktime MORN
@@ -170,14 +170,14 @@ KenjiAnswerPhoneScript:
setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiBreakText
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
.Morning:
farwritetext UnknownText_0x66ed3
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male
.Night:
farwritetext UnknownText_0x66f52
buttonsound
- jump PhoneScript_HangupText_Male
+ sjump PhoneScript_HangupText_Male