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

# 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

4 files changed, 11 insertions, 11 deletions

diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm
index e1b53a950..937fc67c0 100644
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -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
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 630249bf2..be18c569e 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -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
 
diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm
index c90448d33..cb333ae8d 100644
--- a/engine/phone/phone_callers.asm
+++ b/engine/phone/phone_callers.asm
@@ -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:
diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm
index c34113437..646040641 100644
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -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: