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

1 files changed, 16 insertions, 16 deletions

diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index f5c5e76d1..a15e01247 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -415,7 +415,7 @@ ParkBall: ; e8a2
 	ld [hBattleTurn], a
 	ld [Buffer2], a
 	ld [wNumHits], a
-	predef PlayBattleAnim
+	predef Predef_PlayBattleAnim
 
 	ld a, [wWildMon]
 	and a
@@ -517,7 +517,7 @@ ParkBall: ; e8a2
 	cp BATTLETYPE_TUTORIAL
 	jp z, .FinishTutorial
 
-	farcall TrainerRankings_WildMonsCaught
+	farcall StubbedTrainerRankings_WildMonsCaught
 
 	ld hl, Text_GotchaMonWasCaught
 	call PrintText
@@ -547,7 +547,7 @@ ParkBall: ; e8a2
 
 	ld a, [EnemyMonSpecies]
 	ld [wd265], a
-	predef NewPokedexEntry
+	predef Predef_NewPokedexEntry
 
 .skip_pokedex
 	ld a, [BattleType]
@@ -567,7 +567,7 @@ ParkBall: ; e8a2
 	ld [MonType], a
 	call ClearSprites
 
-	predef TryAddMonToParty
+	predef Predef_TryAddMonToParty
 
 	farcall SetCaughtData
 
@@ -623,7 +623,7 @@ ParkBall: ; e8a2
 .SendToPC:
 	call ClearSprites
 
-	predef SentPkmnIntoBox
+	predef Predef_SendPkmnIntoBox
 
 	farcall SetBoxMonCaughtData
 
@@ -979,7 +979,7 @@ LoveBallMultiplier:
 	ld [MonType], a
 	ld a, [CurBattleMon]
 	ld [CurPartyMon], a
-	farcall GetGender
+	farcall Predef_GetGender
 	jr c, .done1 ; no effect on genderless
 
 	ld d, 0 ; male
@@ -993,7 +993,7 @@ LoveBallMultiplier:
 	ld [CurPartySpecies], a
 	ld a, WILDMON
 	ld [MonType], a
-	farcall GetGender
+	farcall Predef_GetGender
 	jr c, .done2 ; no effect on genderless
 
 	ld d, 0 ; male
@@ -1283,7 +1283,7 @@ UpdateStatsAfterItem: ; ee8c
 	ld a, MON_STAT_EXP - 1
 	call GetPartyParamLocation
 	ld b, $1
-	predef_jump CalcPkmnStats
+	predef_jump Predef_CalcPkmnStats
 ; ee9f
 
 RareCandy_StatBooster_ExitMenu: ; ee9f
@@ -1422,7 +1422,7 @@ RareCandy: ; ef14
 
 	xor a ; PARTYMON
 	ld [MonType], a
-	predef CopyPkmnToTempMon
+	predef Predef_CopyPkmnToTempMon
 
 	hlcoord 9, 0
 	ld b, 10
@@ -1431,7 +1431,7 @@ RareCandy: ; ef14
 
 	hlcoord 11, 1
 	ld bc, 4
-	predef PrintTempMonStats
+	predef Predef_PrintTempMonStats
 
 	call WaitPressAorB_BlinkCursor
 
@@ -1439,7 +1439,7 @@ RareCandy: ; ef14
 	ld [MonType], a
 	ld a, [CurPartySpecies]
 	ld [wd265], a
-	predef LearnLevelMoves
+	predef Predef_LearnLevelMoves
 
 	xor a
 	ld [wForceEvolution], a
@@ -1645,7 +1645,7 @@ RevivePokemon: ; f0d6
 	ld d, 0
 	ld hl, wBattleParticipantsIncludingFainted
 	ld b, CHECK_FLAG
-	predef FlagPredef
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	jr z, .skip_to_revive
@@ -1654,7 +1654,7 @@ RevivePokemon: ; f0d6
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
 	ld b, SET_FLAG
-	predef FlagPredef
+	predef Predef_SmallFarFlagAction
 
 .skip_to_revive
 	xor a
@@ -1821,7 +1821,7 @@ HealHP_SFX_GFX: ; f1db (3:71db)
 	call AddNTimes
 	ld a, $2
 	ld [wWhichHPBar], a
-	predef_jump AnimateHPBar
+	predef_jump Predef_AnimateHPBar
 
 UseItem_SelectMon: ; f1f9 (3:71f9)
 	call .SelectMon
@@ -2912,7 +2912,7 @@ UseBallInTrainerBattle: ; f7a0
 	ld [wBattleAnimParam], a
 	ld [hBattleTurn], a
 	ld [wNumHits], a
-	predef PlayBattleAnim
+	predef Predef_PlayBattleAnim
 	ld hl, BlockedTheBallText
 	call PrintText
 	ld hl, DontBeAThiefText
@@ -3059,7 +3059,7 @@ ApplyPPUp: ; f84c
 	call GetPartyParamLocation
 	push hl
 	ld de, Buffer1
-	predef FillPP
+	predef Predef_FillPP
 	pop hl
 	ld bc, MON_PP - MON_MOVES
 	add hl, bc