Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[in progress] Harmonize more constant and data files with pokegold

Browse Source
This commit is contained in:
Rangi
2020-06-16 14:11:49 -04:00
parent 2354c41a96
commit 7b2515d1e4
51 changed files with 263 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
JackPhoneCalleeScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
checkflag ENGINE_JACK
checkflag ENGINE_JACK_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JACK_MONDAY_MORNING
@@ -22,7 +22,7 @@ JackPhoneCallerScript:
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, JackBattleTrivia
checkflag ENGINE_JACK
checkflag ENGINE_JACK_READY_FOR_REMATCH
iftrue .WaitingForBattle
checkflag ENGINE_JACK_MONDAY_MORNING
iftrue .WaitingForBattle
@@ -39,7 +39,7 @@ JackMondayMorning:
JackWantsToBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
setflag ENGINE_JACK
setflag ENGINE_JACK_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
JackFindsRare: