diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 15:31:59 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:00:19 -0400 |
| commit | e002b536af8423f420e13e93d6c0e59f94ee5044 (patch) | |
| tree | b5bd658c777fca9e7d464d776a7f438deed61386 /engine/phone/scripts/ralph.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/ralph.asm')
| -rw-r--r-- | engine/phone/scripts/ralph.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 0baf77b33..ed23c69c3 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -1,11 +1,11 @@ RalphPhoneCalleeScript: - trainertotext FISHER, RALPH1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, RALPH1 checkflag ENGINE_RALPH iftrue .Rematch farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_RALPH_WEDNESDAY_MORNING iftrue .CheckSwarm - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .CheckSwarm checktime MORN iftrue Ralph_WednesdayMorning @@ -15,15 +15,15 @@ RalphPhoneCalleeScript: farjump UnknownScript_0xa0940 .Rematch: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 farjump UnknownScript_0xa0a55 .ReportSwarm: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 farjump UnknownScript_0xa0af5 RalphPhoneCallerScript: - trainertotext FISHER, RALPH1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, RALPH1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD iffalse .CheckSwarm @@ -41,7 +41,7 @@ RalphPhoneCallerScript: Ralph_WednesdayMorning: setflag ENGINE_RALPH_WEDNESDAY_MORNING Ralph_FightMe: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 setflag ENGINE_RALPH farjump PhoneScript_WantsToBattle_Male @@ -49,9 +49,9 @@ Ralph_SetUpSwarm: checkflag ENGINE_FISH_SWARM iftrue .Generic setflag ENGINE_FISH_SWARM - pokenamemem QWILFISH, MEM_BUFFER_1 - landmarktotext ROUTE_32, MEM_BUFFER_2 - writebyte FISHSWARM_QWILFISH + getmonname STRING_BUFFER_4, QWILFISH + getlandmarkname STRING_BUFFER_5, ROUTE_32 + setval FISHSWARM_QWILFISH special ActivateFishingSwarm farjump UnknownScript_0xa05d6 |