pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename ENGINE_FISH_SWARM to ENGINE_QWILFISH_SWARM (#879)

Browse Source
This commit is contained in:
Idain 2022-02-22 10:47:05 -04:00 committed by GitHub
parent 2cc17f780a
commit d0c8f63f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/engine_flags.asm
View File

@ -97,7 +97,7 @@
; wDailyFlags1 ; wDailyFlags1
const ENGINE_KURT_MAKING_BALLS const ENGINE_KURT_MAKING_BALLS
const ENGINE_DAILY_BUG_CONTEST const ENGINE_DAILY_BUG_CONTEST
const ENGINE_FISH_SWARM const ENGINE_QWILFISH_SWARM
const ENGINE_TIME_CAPSULE const ENGINE_TIME_CAPSULE
const ENGINE_ALL_FRUIT_TREES const ENGINE_ALL_FRUIT_TREES
const ENGINE_GOT_SHUCKIE_TODAY const ENGINE_GOT_SHUCKIE_TODAY

6
engine/phone/scripts/ralph.asm
View File

@ -10,7 +10,7 @@ RalphPhoneCalleeScript:
checktime MORN checktime MORN
iftrue Ralph_WednesdayMorning iftrue Ralph_WednesdayMorning
.CheckSwarm: .CheckSwarm:
checkflag ENGINE_FISH_SWARM checkflag ENGINE_QWILFISH_SWARM
iftrue .ReportSwarm iftrue .ReportSwarm
farsjump RalphNoItemScript farsjump RalphNoItemScript
@ -46,9 +46,9 @@ Ralph_FightMe:
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
Ralph_SetUpSwarm: Ralph_SetUpSwarm:
checkflag ENGINE_FISH_SWARM checkflag ENGINE_QWILFISH_SWARM
iftrue .Generic iftrue .Generic
setflag ENGINE_FISH_SWARM setflag ENGINE_QWILFISH_SWARM
getmonname STRING_BUFFER_4, QWILFISH getmonname STRING_BUFFER_4, QWILFISH
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
setval FISHSWARM_QWILFISH setval FISHSWARM_QWILFISH

2
maps/Route32.asm
View File

@ -172,7 +172,7 @@ TrainerFisherRalph1:
opentext opentext
checkflag ENGINE_RALPH_READY_FOR_REMATCH checkflag ENGINE_RALPH_READY_FOR_REMATCH
iftrue .Rematch iftrue .Rematch
checkflag ENGINE_FISH_SWARM checkflag ENGINE_QWILFISH_SWARM
iftrue .Swarm iftrue .Swarm
checkcellnum PHONE_FISHER_RALPH checkcellnum PHONE_FISHER_RALPH
iftrue .NumberAccepted iftrue .NumberAccepted