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

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

Browse Source 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/phone/generic_calls.asm
View File

@@ -1240,7 +1240,7 @@ PhoneScript_Generic_Female:
end
PhoneScript_MonFlavorText:
special RandomPhoneMon
special Special_RandomPhoneMon
farscall PhoneScript_Random2
if_equal $0, .TooEnergetic
farwritetext UnknownText_0x1b518b

4
engine/phone/phone.asm
View File

@@ -469,7 +469,7 @@ UnknownScript_0x90261: ; 0x90261
RingTwice_StartCall: ; 9026f
call .Ring
call .Ring
farcall TrainerRankings_PhoneCalls
farcall StubbedTrainerRankings_PhoneCalls
ret
; 9027c
@@ -498,7 +498,7 @@ PhoneCall:: ; 9029a
ld [PhoneCaller + 1], a
call Phone_FirstOfTwoRings
call Phone_FirstOfTwoRings
farcall TrainerRankings_PhoneCalls
farcall StubbedTrainerRankings_PhoneCalls
ret
; 902b3

10
engine/phone/phone_callers.asm
View File

@@ -1,5 +1,5 @@
Phone_GenericCall_Male:
special RandomPhoneMon
special Special_RandomPhoneMon
farscall PhoneScript_Random2
if_equal 0, .Bragging
farscall PhoneScript_Generic_Male
@@ -9,7 +9,7 @@ Phone_GenericCall_Male:
farjump Phone_BraggingCall_Male
Phone_GenericCall_Female:
special RandomPhoneMon
special Special_RandomPhoneMon
farscall PhoneScript_Random2
if_equal 0, .Bragging
farscall PhoneScript_Generic_Female
@@ -27,7 +27,7 @@ Phone_BraggingCall_Female:
farjump Phone_FoundAMon_Female
Phone_FoundAMon_Male:
special RandomPhoneWildMon
special Special_RandomPhoneWildMon
farscall PhoneScript_Random2
if_equal 0, .GotAway
farscall Phone_WhoDefeatedMon_Male
@@ -37,7 +37,7 @@ Phone_FoundAMon_Male:
farjump Phone_GotAwayCall_Male
Phone_FoundAMon_Female:
special RandomPhoneWildMon
special Special_RandomPhoneWildMon
farscall PhoneScript_Random2
if_equal 0, .GotAway
farscall Phone_WhoDefeatedMon_Female
@@ -851,7 +851,7 @@ Phone_CheckIfUnseenRare_Female:
farjump PhoneScript_HangupText_Female
PhoneScriptRareWildMon:
special RandomUnseenWildMon
special Special_RandomUnseenWildMon
end
PhoneScript_BugCatchingContest:

6
engine/phone/phone_scripts.asm
View File

@@ -392,7 +392,7 @@ HueyPhoneScript1:
iftrue HueyWednesdayNight
.NotWednesday:
special RandomPhoneMon
special Special_RandomPhoneMon
farjump UnknownScript_0xa0908
.WantsBattle:
@@ -629,7 +629,7 @@ JoeyPhoneScript1:
iftrue JoeyMondayAfternoon
.NotMonday:
special RandomPhoneMon
special Special_RandomPhoneMon
farjump UnknownScript_0xa0930
.WantsBattle:
@@ -851,7 +851,7 @@ LizPhoneScript1:
iftrue LizThursdayAfternoon
.NotThursday:
special RandomPhoneMon
special Special_RandomPhoneMon
farjump UnknownScript_0xa0948
.WantsBattle: