diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:39:31 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:39:31 -0400 |
| commit | f5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch) | |
| tree | 2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /engine/phone/scripts/wade.asm | |
| parent | e002b536af8423f420e13e93d6c0e59f94ee5044 (diff) | |
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
Diffstat (limited to 'engine/phone/scripts/wade.asm')
| -rw-r--r-- | engine/phone/scripts/wade.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 557b7aac6..44d82ec01 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -23,18 +23,18 @@ WadePhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farjump UnknownScript_0xa0938 + farsjump UnknownScript_0xa0938 .ContestToday: - farjump PhoneScript_BugCatchingContest + farsjump PhoneScript_BugCatchingContest .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farjump UnknownScript_0xa0a50 + farsjump UnknownScript_0xa0a50 .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farjump UnknownScript_0xa0ab5 + farsjump UnknownScript_0xa0ab5 WadePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 @@ -65,10 +65,10 @@ WadePhoneCallerScript: .next: farscall PhoneScript_Random3 ifequal 0, WadeFoundRare - farjump Phone_GenericCall_Male + farsjump Phone_GenericCall_Male .ContestToday: - farjump PhoneScript_BugCatchingContest + farsjump PhoneScript_BugCatchingContest WadeTuesdayNight: setflag ENGINE_WADE_TUESDAY_NIGHT @@ -76,10 +76,10 @@ WadeTuesdayNight: WadeWantsBattle2: getlandmarkname STRING_BUFFER_5, ROUTE_31 setflag ENGINE_WADE - farjump PhoneScript_WantsToBattle_Male + farsjump PhoneScript_WantsToBattle_Male WadeFoundRare: - farjump Phone_CheckIfUnseenRare_Male + farsjump Phone_CheckIfUnseenRare_Male WadeHasItem2: setflag ENGINE_WADE_HAS_ITEM @@ -96,18 +96,18 @@ WadeHasItem2: .Berry: setevent EVENT_WADE_HAS_BERRY - jump .FoundBerry + sjump .FoundBerry .PsnCureBerry: setevent EVENT_WADE_HAS_PSNCUREBERRY - jump .FoundBerry + sjump .FoundBerry .PrzCureBerry: setevent EVENT_WADE_HAS_PRZCUREBERRY - jump .FoundBerry + sjump .FoundBerry .Bitterberry: setevent EVENT_WADE_HAS_BITTER_BERRY .FoundBerry: - farjump PhoneScript_FoundItem_Male + farsjump PhoneScript_FoundItem_Male |