pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
This commit is contained in:
Rangi
2018-02-25 20:39:54 -05:00
parent 10173f2a62 f44f306cfd
commit 335c2699f0
98 changed files with 1274 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
engine/phone/phone_scripts.asm
View File

@@ -74,36 +74,36 @@ MomPhoneOther: ; 0xbcf2f
MomSavingMoney: ; 0xbcf37
checkflag ENGINE_MOM_SAVING_MONEY
iffalse MomIsNotSaving
iffalse .NotSaving
checkmoney MOMS_MONEY, 0
ifequal HAVE_MORE, MomSavingHasMoney
jump MomSavingButBroke
ifequal HAVE_MORE, .SavingHasMoney
jump .SavingNoMoney
MomIsNotSaving: ; 0xbcf49
.NotSaving: ; 0xbcf49
checkmoney MOMS_MONEY, 0
ifequal HAVE_MORE, MomHasMoney
jump MomHasNoMoney
ifequal HAVE_MORE, .HasMoney
jump .NoMoney
MomSavingHasMoney: ; 0xbcf55
.SavingHasMoney: ; 0xbcf55
readmoney MOMS_MONEY, MEM_BUFFER_0
farwritetext MomCheckBalanceText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
MomSavingButBroke: ; 0xbcf63
.SavingNoMoney: ; 0xbcf63
farwritetext MomImportantToSaveText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
MomHasNoMoney: ; 0xbcf6e
.NoMoney: ; 0xbcf6e
farwritetext MomYoureNotSavingText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
MomHasMoney: ; 0xbcf79
.HasMoney: ; 0xbcf79
readmoney MOMS_MONEY, MEM_BUFFER_0
farwritetext MomYouveSavedText
yesorno
@@ -663,12 +663,12 @@ JoeyWantsBattle:
WadePhoneScript1:
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
checkflag ENGINE_WADE
iftrue WadeWantsBattle
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_WADE_TUESDAY_NIGHT
iftrue .NotTuesday
checkflag ENGINE_WADE_HAS_ITEM
iftrue WadeHasItem
iftrue .HasItem
checkcode VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday
checktime NITE
@@ -680,21 +680,21 @@ WadePhoneScript1:
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
ifequal TUESDAY, WadeContestToday
ifequal THURSDAY, WadeContestToday
ifequal SATURDAY, WadeContestToday
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
.NoContest:
farjump UnknownScript_0xa0938
WadeContestToday:
.ContestToday:
farjump PhoneScript_BugCatchingContest
WadeWantsBattle:
.WantsBattle:
landmarktotext ROUTE_31, MEM_BUFFER_2
farjump UnknownScript_0xa0a50
WadeHasItem:
.HasItem:
landmarktotext ROUTE_31, MEM_BUFFER_2
farjump UnknownScript_0xa0ab5
@@ -706,9 +706,9 @@ WadePhoneScript2:
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
ifequal TUESDAY, Wade_ContestToday
ifequal THURSDAY, Wade_ContestToday
ifequal SATURDAY, Wade_ContestToday
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
.NoContest:
checkflag ENGINE_WADE
@@ -729,7 +729,7 @@ WadePhoneScript2:
ifequal 0, WadeFoundRare
farjump Phone_GenericCall_Male
Wade_ContestToday:
.ContestToday:
farjump PhoneScript_BugCatchingContest
WadeTuesdayNight:
@@ -779,24 +779,24 @@ WadeHasItem2:
RalphPhoneScript1:
trainertotext FISHER, RALPH1, MEM_BUFFER_0
checkflag ENGINE_RALPH
iftrue Ralph_Rematch
iftrue .Rematch
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
iftrue Ralph_CheckSwarm
iftrue .CheckSwarm
checkcode VAR_WEEKDAY
ifnotequal WEDNESDAY, Ralph_CheckSwarm
ifnotequal WEDNESDAY, .CheckSwarm
checktime MORN
iftrue Ralph_WednesdayMorning
Ralph_CheckSwarm:
.CheckSwarm:
checkflag ENGINE_FISH_SWARM
iftrue Ralph_ReportSwarm
iftrue .ReportSwarm
farjump UnknownScript_0xa0940
Ralph_Rematch:
.Rematch:
landmarktotext ROUTE_32, MEM_BUFFER_2
farjump UnknownScript_0xa0a55
Ralph_ReportSwarm:
.ReportSwarm:
landmarktotext ROUTE_32, MEM_BUFFER_2
farjump UnknownScript_0xa0af5
@@ -804,14 +804,14 @@ RalphPhoneScript2:
trainertotext FISHER, RALPH1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse Ralph_CheckSwarm2
iffalse .CheckSwarm
checkflag ENGINE_RALPH
iftrue Ralph_CheckSwarm2
iftrue .CheckSwarm
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
iftrue Ralph_CheckSwarm2
iftrue .CheckSwarm
farscall PhoneScript_Random2
ifequal 0, Ralph_FightMe
Ralph_CheckSwarm2:
.CheckSwarm:
farscall PhoneScript_Random5
ifequal 0, Ralph_SetUpSwarm
farjump Phone_GenericCall_Male
@@ -1039,7 +1039,7 @@ ToddPhoneScript2:
checkflag ENGINE_TODD_SATURDAY_MORNING
iftrue .TryForSale
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse ToddNoGoldenrod
iffalse .NoGoldenrod
farscall PhoneScript_Random2
ifequal 0, ToddWantsBattle
@@ -1047,7 +1047,7 @@ ToddPhoneScript2:
farscall PhoneScript_Random2
ifequal 0, ToddDeptStoreSale
ToddNoGoldenrod:
.NoGoldenrod:
farscall PhoneScript_Random3
ifequal 0, ToddFoundRare
farjump Phone_GenericCall_Male
@@ -1262,11 +1262,11 @@ AlanPhoneScript2:
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ALAN
iftrue AlanGenericCall
iftrue .Generic
checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
iftrue AlanGenericCall
iftrue .Generic
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue AlanGenericCall
iftrue .Generic
farscall PhoneScript_Random3
ifequal 0, AlanWantsBattle
checkevent EVENT_ALAN_GAVE_FIRE_STONE
@@ -1278,7 +1278,7 @@ AlanPhoneScript2:
farscall PhoneScript_Random11
ifequal 0, AlanHasFireStone
AlanGenericCall:
.Generic:
farjump Phone_GenericCall_Male
AlanWednesdayDay:
@@ -1471,7 +1471,7 @@ TullyPhoneScript1:
checkflag ENGINE_TULLY_SUNDAY_NIGHT
iftrue .NotSunday
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue TullyHasWaterStone
iftrue .WaterStone
checkcode VAR_WEEKDAY
ifnotequal SUNDAY, .NotSunday
checktime NITE
@@ -1484,7 +1484,7 @@ TullyPhoneScript1:
landmarktotext ROUTE_42, MEM_BUFFER_2
farjump UnknownScript_0xa0a82
TullyHasWaterStone:
.WaterStone:
landmarktotext ROUTE_42, MEM_BUFFER_2
farjump UnknownScript_0xa0add
@@ -1600,11 +1600,11 @@ TiffanyPhoneScript2:
ifequal 0, TiffanysFamilyMembers
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_TIFFANY
iftrue TiffanyGenericCall
iftrue .Generic
checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
iftrue TiffanyGenericCall
iftrue .Generic
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue TiffanyGenericCall
iftrue .Generic
farscall PhoneScript_Random3
ifequal 0, TiffanyWantsBattle
checkevent EVENT_TIFFANY_GAVE_PINK_BOW
@@ -1616,7 +1616,7 @@ TiffanyPhoneScript2:
farscall PhoneScript_Random11
ifequal 0, TiffanyHasPinkBow
TiffanyGenericCall:
.Generic:
farjump Phone_GenericCall_Female
TiffanyTuesdayAfternoon:
@@ -1638,29 +1638,29 @@ TiffanysFamilyMembers:
.Grandma:
stringtotext GrandmaString, MEM_BUFFER_1
jump TiffanysPoorClefairy
jump .PoorClefairy
.Grandpa:
stringtotext GrandpaString, MEM_BUFFER_1
jump TiffanysPoorClefairy
jump .PoorClefairy
.Mom:
stringtotext MomString, MEM_BUFFER_1
jump TiffanysPoorClefairy
jump .PoorClefairy
.Dad:
stringtotext DadString, MEM_BUFFER_1
jump TiffanysPoorClefairy
jump .PoorClefairy
.Sister:
stringtotext SisterString, MEM_BUFFER_1
jump TiffanysPoorClefairy
jump .PoorClefairy
.Brother:
stringtotext BrotherString, MEM_BUFFER_1
jump TiffanysPoorClefairy
jump .PoorClefairy
TiffanysPoorClefairy:
.PoorClefairy:
farjump TiffanyItsAwful
TiffanyHasPinkBow:
@@ -1673,7 +1673,7 @@ TiffanyHasPinkBow:
VancePhoneScript1:
trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
checkflag ENGINE_VANCE
iftrue VanceWantsBattle
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
iftrue .NotWednesday
@@ -1685,7 +1685,7 @@ VancePhoneScript1:
.NotWednesday:
farjump VanceLookingForward
VanceWantsBattle:
.WantsBattle:
landmarktotext ROUTE_44, MEM_BUFFER_2
farjump VanceHurryHurry