diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-03-15 19:53:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-15 19:53:14 -0400 |
| commit | 66b902f900c128d05940de45aca7130639ded0c0 (patch) | |
| tree | 5a81c2c1d2bfc29206d29ff3c107f784b0b18be4 /engine/phone/scripts/ralph.asm | |
| parent | c87f8512a4d736a847dbc69e09c781a29eeaa638 (diff) | |
| parent | ad50e94b5029ce5a7d45fd3576f8f017eae6449c (diff) | |
Merge pull request #696 from Rangi42/master
Rename LANDMARK_* constants, and refactor flypoints
Diffstat (limited to 'engine/phone/scripts/ralph.asm')
| -rw-r--r-- | engine/phone/scripts/ralph.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 245cce175..ef0714de1 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -15,11 +15,11 @@ RalphPhoneCalleeScript: farsjump RalphNoItemScript .Rematch: - getlandmarkname STRING_BUFFER_5, ROUTE_32 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 farsjump RalphReminderScript .ReportSwarm: - getlandmarkname STRING_BUFFER_5, ROUTE_32 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 farsjump RalphHurryScript RalphPhoneCallerScript: @@ -41,7 +41,7 @@ RalphPhoneCallerScript: Ralph_WednesdayMorning: setflag ENGINE_RALPH_WEDNESDAY_MORNING Ralph_FightMe: - getlandmarkname STRING_BUFFER_5, ROUTE_32 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 setflag ENGINE_RALPH farsjump PhoneScript_WantsToBattle_Male @@ -50,7 +50,7 @@ Ralph_SetUpSwarm: iftrue .Generic setflag ENGINE_FISH_SWARM getmonname STRING_BUFFER_4, QWILFISH - getlandmarkname STRING_BUFFER_5, ROUTE_32 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 setval FISHSWARM_QWILFISH special ActivateFishingSwarm farsjump RalphItemScript |