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/events/battle_tower/battle_tower.asm

@@ -1,11 +1,11 @@
-BattleTowerRoomMenu: ; 1700b0
+Special_BattleTowerRoomMenu: ; 1700b0
 ; special
 	call InitBattleTowerChallengeRAM
 	farcall _BattleTowerRoomMenu
 	ret
 ; 1700ba
 
-Function1700ba: ; 1700ba
+Special_Function1700ba: ; 1700ba
 	call InitBattleTowerChallengeRAM
 	farcall Function11811a
 	ret
@@ -53,7 +53,7 @@ Function1700c4: ; 1700c4
 	ret
 ; 170114
 
-Function170114: ; 170114
+Special_Function170114: ; 170114
 	call InitBattleTowerChallengeRAM
 	call .Function170121
 	farcall Function11805f
@@ -182,14 +182,14 @@ Function170139: ; 170139
 	ret
 ; 170215
 
-BattleTowerBattle: ; 170215
+Special_BattleTowerBattle: ; 170215
 	xor a
 	ld [wBattleTowerBattleEnded], a
 	call _BattleTowerBattle
 	ret
 ; 17021d
 
-EmptySpecial_17021d: ; 17021d
+DummySpecial_17021d: ; 17021d
 	ret
 ; 17021e
 
@@ -243,12 +243,12 @@ RunBattleTowerTrainer: ; 17024d
 
 	xor a
 	ld [wLinkMode], a
-	farcall TrainerRankings_Healings
+	farcall Special_StubbedTrainerRankings_Healings
 	farcall HealParty
 	call ReadBTTrainerParty
 	call Clears5_a89a
 
-	predef StartBattle
+	predef Predef_StartBattle
 
 	farcall LoadPokemonData
 	farcall HealParty
@@ -484,7 +484,7 @@ endr
 	ld hl, MON_STAT_EXP - 1
 	add hl, bc
 	ld b, $1
-	predef CalcPkmnStats
+	predef Predef_CalcPkmnStats
 	pop de
 	pop hl
 	dec de
@@ -599,8 +599,7 @@ SkipBattleTowerTrainer: ; 1704c9
 	ret
 ; 1704ca
 
-Function1704ca: ; 1704ca
-; unreferenced mobile function
+Unreferenced_Function1704ca: ; 1704ca
 	ld a, [$be46]
 	cp $7
 	jr c, .asm_1704d3
@@ -620,8 +619,7 @@ Function1704ca: ; 1704ca
 	ret
 ; 1704e1
 
-Function1704e1: ; 1704e1
-; unreferenced special
+UnusedSpecial_Function1704e1: ; 1704e1
 	call SpeechTextBox
 	call FadeToMenu
 	call InitBattleTowerChallengeRAM
@@ -902,7 +900,7 @@ Function1704e1: ; 1704e1
 	db "れきだいりーダーいちらん@"
 ; 170687
 
-BattleTowerAction: ; 170687
+Special_BattleTowerAction: ; 170687
 	ld a, [ScriptVar]
 	ld e, a
 	ld d, 0
@@ -1605,7 +1603,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
 	ld [ScriptVar], a
 	ret
 
-Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
+Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
 	farcall Function_LoadOpponentTrainerAndPokemons
 	ld a, [rSVBK]
 	push af
@@ -1652,11 +1650,11 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
 
 INCLUDE "data/trainers/sprites.asm"
 
-ret_170bd2: ; 170bd2
+DummySpecial_170bd2: ; 170bd2
 	ret
 ; 170bd3
 
-SpecialCheckForBattleTowerRules: ; 170bd3
+Special_CheckForBattleTowerRules: ; 170bd3
 	farcall CheckForBattleTowerRules
 	jr c, .asm_170bde
 	xor a ; FALSE

engine/events/buena.asm

@@ -1,4 +1,4 @@
-SpecialBuenasPassword: ; 8af6b
+Special_BuenasPassword: ; 8af6b
 	xor a
 	ld [wWhichIndexSet], a
 	ld hl, .MenuDataHeader
@@ -63,7 +63,7 @@ SpecialBuenasPassword: ; 8af6b
 	ret
 ; 8afd4
 
-SpecialBuenaPrize: ; 8afd4
+Special_BuenaPrize: ; 8afd4
 	xor a
 	ld [wMenuScrollPosition], a
 	ld a, $1

engine/events/buena_menu.asm

@@ -1,4 +1,4 @@
-AskRememberPassword: ; 4ae12
+Special_AskRememberPassword: ; 4ae12
 	call .DoMenu
 	ld a, $0
 	jr c, .okay

engine/events/bug_contest/contest_2.asm

@@ -76,7 +76,7 @@ Special_CheckBugContestContestantFlag: ; 139ed
 
 INCLUDE "data/bug_contest_flags.asm"
 
-ContestDropOffMons: ; 13a12
+Special_ContestDropOffMons: ; 13a12
 	ld hl, PartyMon1HP
 	ld a, [hli]
 	or [hl]
@@ -101,7 +101,7 @@ ContestDropOffMons: ; 13a12
 	ret
 ; 13a31
 
-ContestReturnMons: ; 13a31
+Special_ContestReturnMons: ; 13a31
 ; Restore the species of the second mon.
 	ld hl, PartySpecies + 1
 	ld a, [wBugContestSecondPartySpecies]

engine/events/bug_contest/display_stats.asm

@@ -101,7 +101,7 @@ DisplayAlreadyCaughtText: ; cc0c7
 	text_jump UnknownText_0x1c10dd
 	db "@"
 
-Predef2F:
-Predef38:
-Predef39: ; cc0d5
+DummyPredef2F:
+DummyPredef38:
+DummyPredef39: ; cc0d5
 	ret

engine/events/bug_contest/judging.asm

@@ -1,6 +1,6 @@
-_BugContestJudging: ; 1369d
+_Special_BugContestJudging: ; 1369d
 	call ContestScore
-	farcall TrainerRankings_BugContestScore
+	farcall StubbedTrainerRankings_BugContestScore
 	call BugContest_JudgeContestants
 	ld a, [wBugContestThirdPlaceWinnerID]
 	call LoadContestantName

engine/events/catch_tutorial.asm

@@ -41,7 +41,7 @@ CatchTutorial:: ; 4e554
 	ld hl, .AutoInput
 	ld a, BANK(.AutoInput)
 	call StartAutoInput
-	callfar StartBattle
+	callfar Predef_StartBattle
 	call StopAutoInput
 	pop af
 

engine/events/celebi.asm

@@ -362,7 +362,7 @@ CelebiEvent_SetBattleType: ; 49bf3
 
 ; 49bf9
 
-CheckCaughtCelebi: ; 49bf9
+Special_CheckCaughtCelebi: ; 49bf9
 	ld a, [wBattleResult]
 	bit 6, a
 	jr z, .false

engine/events/daycare.asm

@@ -565,7 +565,7 @@ DayCare_GiveEgg: ; 169ac
 	pop hl
 	push bc
 	ld b, $0
-	predef CalcPkmnStats
+	predef Predef_CalcPkmnStats
 	pop bc
 	ld hl, MON_HP
 	add hl, bc
@@ -639,7 +639,7 @@ DayCare_InitBreeding: ; 16a3b
 	cp DITTO
 	ld a, $0
 	jr z, .LoadWhichBreedmonIsTheMother
-	farcall GetGender
+	farcall Predef_GetGender
 	ld a, $0
 	jr z, .LoadWhichBreedmonIsTheMother
 	inc a
@@ -684,7 +684,7 @@ DayCare_InitBreeding: ; 16a3b
 	ld de, wEggMonMoves
 	xor a
 	ld [Buffer1], a
-	predef FillMoves
+	predef Predef_FillMoves
 	farcall InitEggMoves
 	ld hl, wEggMonID
 	ld a, [PlayerID]
@@ -726,7 +726,7 @@ DayCare_InitBreeding: ; 16a3b
 	ld a, TEMPMON
 	ld [MonType], a
 	push hl
-	farcall GetGender
+	farcall Predef_GetGender
 	pop hl
 	ld de, wBreedMon1DVs
 	ld bc, wBreedMon2DVs
@@ -770,7 +770,7 @@ DayCare_InitBreeding: ; 16a3b
 	call CopyBytes
 	ld hl, wEggMonMoves
 	ld de, wEggMonPP
-	predef FillPP
+	predef Predef_FillPP
 	ld hl, wMonOrItemNameBuffer
 	ld de, StringBuffer1
 	ld bc, NAME_LENGTH

engine/events/dratini.asm

@@ -1,4 +1,4 @@
-SpecialDratini: ; 0x8b170
+Special_Dratini: ; 0x8b170
 ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
 ;  0: give it a special moveset with Extremespeed.
 ;  1: give it the normal moveset of a level 15 Dratini.

engine/events/field_moves.asm

@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
 ; 8c7e1
 
 BlindingFlash: ; 8c7e1
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	ld hl, wStatusFlags
 	set 2, [hl] ; Flash
 	farcall ReplaceTimeOfDayPals
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
 	ld b, SCGB_MAPPALS
 	call GetSGBLayout
 	farcall LoadOW_BGPal7
-	farcall FadeInPalettes
+	farcall Special_FadeInPalettes
 	ret
 ; 8c80a
 

engine/events/fruit_trees.asm

@@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
 ; 4405f
 
 PickedFruitTree: ; 4405f
-	farcall TrainerRankings_FruitPicked
+	farcall StubbedTrainerRankings_FruitPicked
 	ld b, 1
 	jp GetFruitTreeFlag
 ; 4406a

engine/events/halloffame.asm

@@ -42,7 +42,7 @@ RedCredits:: ; 86455
 	ld [MusicFadeID + 1], a
 	ld a, 10
 	ld [MusicFade], a
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
@@ -65,7 +65,7 @@ HallOfFame_FadeOutMusic: ; 8648e
 	ld [MusicFadeID + 1], a
 	ld a, 10
 	ld [MusicFade], a
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
@@ -130,7 +130,7 @@ AnimateHallOfFame: ; 864c3
 	call WaitBGMap
 	decoord 6, 5
 	ld c, $6
-	predef HOF_AnimateFrontpic
+	predef HOF_Predef_AnimateFrontpic
 	ld c, 60
 	call DelayFrames
 	and a
@@ -244,18 +244,18 @@ AnimateHOFMonEntrance: ; 865b5
 	ld a, [hli]
 	ld [TempMonDVs + 1], a
 	ld hl, TempMonDVs
-	predef GetUnownLetter
+	predef Predef_GetUnownLetter
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	call ByteFill
 	ld de, vTiles2 tile $31
-	predef GetMonBackpic
+	predef Predef_GetMonBackpic
 	ld a, $31
 	ld [hGraphicStartTile], a
 	hlcoord 6, 6
 	lb bc, 6, 6
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld a, $d0
 	ld [hSCY], a
 	ld a, $90
@@ -403,7 +403,7 @@ _HallOfFamePC: ; 86650
 	call SetPalettes
 	decoord 6, 5
 	ld c, $6
-	predef HOF_AnimateFrontpic
+	predef HOF_Predef_AnimateFrontpic
 	and a
 	ret
 
@@ -478,7 +478,7 @@ DisplayHOFMon: ; 86748
 	ld [CurPartySpecies], a
 	ld [wd265], a
 	ld hl, TempMonDVs
-	predef GetUnownLetter
+	predef Predef_GetUnownLetter
 	xor a
 	ld [wBoxAlignment], a
 	hlcoord 6, 5
@@ -499,7 +499,7 @@ DisplayHOFMon: ; 86748
 	call PlaceString
 	ld a, TEMPMON
 	ld [MonType], a
-	farcall GetGender
+	farcall Predef_GetGender
 	ld a, " "
 	jr c, .got_gender
 	ld a, "♂"
@@ -546,7 +546,7 @@ HOF_AnimatePlayerPic: ; 86810
 	ld [hGraphicStartTile], a
 	hlcoord 6, 6
 	lb bc, 6, 6
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld a, $d0
 	ld [hSCY], a
 	ld a, $90
@@ -570,7 +570,7 @@ HOF_AnimatePlayerPic: ; 86810
 	ld [hGraphicStartTile], a
 	hlcoord 12, 5
 	lb bc, 7, 7
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld a, $c0
 	ld [hSCX], a
 	call WaitBGMap

engine/events/happiness_egg.asm

@@ -1,4 +1,4 @@
-GetFirstPokemonHappiness: ; 718d
+Special_GetFirstPokemonHappiness: ; 718d
 	ld hl, PartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, PartySpecies
@@ -17,7 +17,7 @@ GetFirstPokemonHappiness: ; 718d
 	call GetPokemonName
 	jp CopyPokemonName_Buffer1_Buffer3
 
-CheckFirstMonIsEgg: ; 71ac
+Special_CheckFirstMonIsEgg: ; 71ac
 	ld a, [PartySpecies]
 	ld [wd265], a
 	cp EGG

engine/events/heal_machine_anim.asm

@@ -1,4 +1,4 @@
-HealMachineAnim: ; 12324
+Special_HealMachineAnim: ; 12324
 	; If you have no Pokemon, don't change the buffer.  This can lead to some glitchy effects if you have no Pokemon.
 	ld a, [PartyCount]
 	and a

engine/events/kurt.asm

@@ -161,7 +161,7 @@ Kurt_SelectQuantity: ; 880c2
 	db $40 ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12
 
-	; XXX
+	; unused
 	dw 0
 	db -1
 	db 0

engine/events/lucky_number.asm

@@ -103,7 +103,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
 	ld a, [ScriptVar]
 	and a
 	ret z ; found nothing
-	farcall TrainerRankings_LuckyNumberShow
+	farcall StubbedTrainerRankings_LuckyNumberShow
 	ld a, [wFoundMatchingIDInParty]
 	and a
 	push af

engine/events/magikarp.asm

@@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32
 	ld c, l
 	call CalcMagikarpLength
 	call PrintMagikarpLength
-	farcall TrainerRankings_MagikarpLength
+	farcall StubbedTrainerRankings_MagikarpLength
 	ld hl, .MeasureItText
 	call PrintText
 

engine/events/misc_scripts.asm

@@ -2,7 +2,7 @@ Script_AbortBugContest: ; 0x122c1
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iffalse .finish
 	setflag ENGINE_DAILY_BUG_CONTEST
-	special ContestReturnMons
+	special Special_ContestReturnMons
 .finish
 	end
 

engine/events/mom_phone.asm

@@ -217,7 +217,7 @@ endr
 
 INCLUDE "data/items/mom_phone.asm"
 
-	db 0, 0, 0 ; XXX
+	db 0, 0, 0 ; unused
 
 _MomText_HiHowAreYou: ; 0xfd1b1
 	; Hi,  ! How are you?
@@ -255,10 +255,10 @@ _MomText_ItsInRoom: ; 0xfd1ca
 	db "@"
 ; 0xfd1cf
 
-	db 0 ; XXX
+	db 0 ; unused
 
-Predef3A: ; fd1d0
+DummyPredef3A: ; fd1d0
 	ret
 ; fd1d1
 
-	ret ; XXX
+	ret ; unused