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, 72 insertions, 72 deletions

diff --git a/engine/predef.asm b/engine/predef.asm
index 837f7b96b..62ca7b147 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -30,79 +30,79 @@ PredefPointers:: ; 856b
 ; $4b Predef pointers
 ; address, bank
 
-	add_predef LearnMove ; $0
-	add_predef Predef1
-	add_predef HealParty
-	add_predef FlagPredef
-	add_predef ComputeHPBarPixels
-	add_predef FillPP
-	add_predef TryAddMonToParty
-	add_predef AddTempmonToParty
-	add_predef SentGetPkmnIntoFromBox
-	add_predef SentPkmnIntoBox
-	add_predef GiveEgg
-	add_predef AnimateHPBar
-	add_predef CalcPkmnStats
-	add_predef CalcPkmnStatC
-	add_predef CanLearnTMHMMove
-	add_predef GetTMHMMove
+	add_predef Predef_LearnMove ; $0
+	add_predef DummyPredef1
+	add_predef HealParty ; this is both a special and a predef
+	add_predef Predef_SmallFarFlagAction
+	add_predef Predef_ComputeHPBarPixels
+	add_predef Predef_FillPP
+	add_predef Predef_TryAddMonToParty
+	add_predef Predef_AddTempmonToParty
+	add_predef Predef_SendGetPkmnIntoFromBox
+	add_predef Predef_SendPkmnIntoBox
+	add_predef Predef_GiveEgg
+	add_predef Predef_AnimateHPBar
+	add_predef Predef_CalcPkmnStats
+	add_predef Predef_CalcPkmnStatC
+	add_predef Predef_CanLearnTMHMMove
+	add_predef Predef_GetTMHMMove
 	add_predef Predef_LinkTextbox ; $ 10
-	add_predef PrintMoveDesc
-	add_predef UpdatePlayerHUD
-	add_predef PlaceGraphic
-	add_predef CheckPlayerPartyForFitPkmn
-	add_predef UpdateEnemyHUD
-	add_predef StartBattle
-	add_predef FillInExpBar
-	add_predef GetBattleMonBackpic ; $18
-	add_predef GetEnemyMonFrontpic
-	add_predef LearnLevelMoves
-	add_predef FillMoves
-	add_predef EvolveAfterBattle
-	add_predef TradeAnimationPlayer2
-	add_predef TradeAnimation
-	add_predef CopyPkmnToTempMon
-	add_predef ListMoves ; $20
-	add_predef PlaceNonFaintStatus
-	add_predef Predef22
-	add_predef ListMovePP
-	add_predef GetGender
-	add_predef StatsScreenInit
-	add_predef DrawPlayerHP
-	add_predef DrawEnemyHP
-	add_predef PrintTempMonStats ; $28
-	add_predef GetTypeName
-	add_predef PrintMoveType
-	add_predef PrintType
-	add_predef PrintMonTypes
-	add_predef GetUnownLetter
-	add_predef LoadPoisonBGPals
-	add_predef Predef2F
-	add_predef InitSGBBorder ; $30
-	add_predef Predef_LoadSGBLayout
-	add_predef _Area
-	add_predef CheckContestMon
+	add_predef Predef_PrintMoveDesc
+	add_predef Predef_UpdatePlayerHUD
+	add_predef Predef_PlaceGraphic
+	add_predef Predef_CheckPlayerPartyForFitPkmn
+	add_predef Predef_UpdateEnemyHUD
 	add_predef Predef_StartBattle
-	add_predef Predef35
-	add_predef Predef36
-	add_predef PlayBattleAnim
-	add_predef Predef38 ; $38
-	add_predef Predef39
-	add_predef Predef3A
-	add_predef PartyMonItemName
-	add_predef GetMonFrontpic
-	add_predef GetMonBackpic
-	add_predef GetAnimatedFrontpicPredef
-	add_predef GetTrainerPic
-	add_predef DecompressPredef ; $40
-	add_predef CheckTypeMatchup
-	add_predef ConvertMon_1to2
-	add_predef NewPokedexEntry
-	add_predef AnimateMon_Slow_Normal
-	add_predef PlaceStatusString
-	add_predef LoadMonAnimation
-	add_predef AnimateFrontpic
-	add_predef Predef48 ; $48
-	add_predef HOF_AnimateFrontpic
+	add_predef Predef_FillInExpBar
+	add_predef Predef_GetBattleMonBackpic ; $18
+	add_predef Predef_GetEnemyMonFrontpic
+	add_predef Predef_LearnLevelMoves
+	add_predef Predef_FillMoves
+	add_predef Predef_EvolveAfterBattle
+	add_predef Predef_TradeAnimationPlayer2
+	add_predef Predef_TradeAnimation
+	add_predef Predef_CopyPkmnToTempMon
+	add_predef Predef_ListMoves ; $20
+	add_predef Predef_PlaceNonFaintStatus
+	add_predef UnusedPredef22
+	add_predef Predef_ListMovePP
+	add_predef Predef_GetGender
+	add_predef Predef_StatsScreenInit
+	add_predef Predef_DrawPlayerHP
+	add_predef Predef_DrawEnemyHP
+	add_predef Predef_PrintTempMonStats ; $28
+	add_predef Predef_GetTypeName
+	add_predef Predef_PrintMoveType
+	add_predef Predef_PrintType
+	add_predef Predef_PrintMonTypes
+	add_predef Predef_GetUnownLetter
+	add_predef Predef_LoadPoisonBGPals
+	add_predef DummyPredef2F
+	add_predef Predef_InitSGBBorder ; $30
+	add_predef Predef_LoadSGBLayout
+	add_predef Predef_Pokedex_GetArea
+	add_predef UnusedPredef_CheckContestMon
+	add_predef Predef_DoBattleTransition
+	add_predef DummyPredef35
+	add_predef DummyPredef36
+	add_predef Predef_PlayBattleAnim
+	add_predef DummyPredef38 ; $38
+	add_predef DummyPredef39
+	add_predef DummyPredef3A
+	add_predef Predef_PartyMonItemName
+	add_predef Predef_GetMonFrontpic
+	add_predef Predef_GetMonBackpic
+	add_predef Predef_GetAnimatedFrontpic
+	add_predef Predef_GetTrainerPic
+	add_predef Predef_Decompress ; $40
+	add_predef Predef_CheckTypeMatchup
+	add_predef Predef_ConvertMon_1to2
+	add_predef Predef_NewPokedexEntry
+	add_predef UnusedPredef_AnimateMon_Slow_Normal
+	add_predef Predef_PlaceStatusString
+	add_predef Predef_LoadMonAnimation
+	add_predef Predef_AnimateFrontpic
+	add_predef UnusedPredef48 ; $48
+	add_predef HOF_Predef_AnimateFrontpic
 	dbw $ff, InexplicablyEmptyFunction ; ???
 ; 864c