diff options
| author | Idain <luiscarlosholguinperez@outlook.com> | 2022-02-22 10:47:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 09:47:05 -0500 |
| commit | d0c8f63f25c9e9be52a75b2551ecdee149a6acb3 (patch) | |
| tree | c909377ace2f201acd2ed478a11bf396bd11c063 | |
| parent | 2cc17f780a4b50ac3eebeb7e6865639926a611cd (diff) | |
Rename ENGINE_FISH_SWARM to ENGINE_QWILFISH_SWARM (#879)
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | engine/phone/scripts/ralph.asm | 6 | ||||
| -rw-r--r-- | maps/Route32.asm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 5b45c4b22..a93e58121 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -97,7 +97,7 @@ ; wDailyFlags1 const ENGINE_KURT_MAKING_BALLS const ENGINE_DAILY_BUG_CONTEST - const ENGINE_FISH_SWARM + const ENGINE_QWILFISH_SWARM const ENGINE_TIME_CAPSULE const ENGINE_ALL_FRUIT_TREES const ENGINE_GOT_SHUCKIE_TODAY diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 3bf9f70f9..43328d28c 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -10,7 +10,7 @@ RalphPhoneCalleeScript: checktime MORN iftrue Ralph_WednesdayMorning .CheckSwarm: - checkflag ENGINE_FISH_SWARM + checkflag ENGINE_QWILFISH_SWARM iftrue .ReportSwarm farsjump RalphNoItemScript @@ -46,9 +46,9 @@ Ralph_FightMe: farsjump PhoneScript_WantsToBattle_Male Ralph_SetUpSwarm: - checkflag ENGINE_FISH_SWARM + checkflag ENGINE_QWILFISH_SWARM iftrue .Generic - setflag ENGINE_FISH_SWARM + setflag ENGINE_QWILFISH_SWARM getmonname STRING_BUFFER_4, QWILFISH getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 setval FISHSWARM_QWILFISH diff --git a/maps/Route32.asm b/maps/Route32.asm index 6e90ff1c3..76e3ee603 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -172,7 +172,7 @@ TrainerFisherRalph1: opentext checkflag ENGINE_RALPH_READY_FOR_REMATCH iftrue .Rematch - checkflag ENGINE_FISH_SWARM + checkflag ENGINE_QWILFISH_SWARM iftrue .Swarm checkcellnum PHONE_FISHER_RALPH iftrue .NumberAccepted |