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

engine/npctrade.asm

@@ -59,7 +59,7 @@ NPCTrade:: ; fcba8
 	push af
 	ld a, [wcf64]
 	push af
-	predef TradeAnimation
+	predef Predef_TradeAnimation
 	pop af
 	ld [wcf64], a
 	pop af
@@ -80,12 +80,12 @@ CheckTradeGender: ; fcc23
 	cp TRADE_MALE_ONLY
 	jr z, .check_male
 
-	farcall GetGender
+	farcall Predef_GetGender
 	jr nz, .not_matching
 	jr .matching
 
 .check_male
-	farcall GetGender
+	farcall Predef_GetGender
 	jr z, .not_matching
 
 .matching
@@ -101,7 +101,7 @@ TradeFlagAction: ; fcc4a
 	ld hl, wTradeFlags
 	ld a, [wJumptableIndex]
 	ld c, a
-	predef FlagPredef
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	ret
@@ -188,7 +188,7 @@ DoNPCTrade: ; fcc63
 	ld [MonType], a
 	ld [wPokemonWithdrawDepositParameter], a
 	callfar RemoveMonFromPartyOrBox
-	predef TryAddMonToParty
+	predef Predef_TryAddMonToParty
 
 	ld e, TRADE_DIALOG
 	call GetTradeAttribute
@@ -324,8 +324,7 @@ CopyTradeName: ; fcdf4
 	ret
 ; fcdfb
 
-Functionfcdfb: ; fcdfb
-; unreferenced
+Unreferenced_Functionfcdfb: ; fcdfb
 	ld bc, 4
 	call CopyBytes
 	ld a, "@"
@@ -333,8 +332,7 @@ Functionfcdfb: ; fcdfb
 	ret
 ; fce05
 
-Functionfce05: ; fce05
-; unreferenced
+Unreferenced_Functionfce05: ; fce05
 	ld bc, 3
 	call CopyBytes
 	ld a, "@"