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

15 files changed, 24 insertions, 34 deletions

diff --git a/home/audio.asm b/home/audio.asm
index e5e7bb8af..f904e9599 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -502,10 +502,9 @@ GetMapMusic:: ; 3d97
 	ret
 ; 3d9f
 
-Function3d9f:: ; 3d9f
+Unreferenced_Function3d9f:: ; 3d9f
 ; Places a BCD number at the
 ; upper center of the screen.
-; Unreferenced.
 	ld a, 4 * TILE_WIDTH
 	ld [Sprite39YCoord], a
 	ld [Sprite40YCoord], a
diff --git a/home/battle.asm b/home/battle.asm
index 30096fd4a..b44fa5d97 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -130,8 +130,8 @@ RefreshBattleHuds:: ; 39c9
 ; 39d4
 
 UpdateBattleHuds:: ; 39d4
-	farcall UpdatePlayerHUD
-	farcall UpdateEnemyHUD
+	farcall Predef_UpdatePlayerHUD
+	farcall Predef_UpdateEnemyHUD
 	ret
 ; 39e1
 
diff --git a/home/fade.asm b/home/fade.asm
index c5eb2c2eb..d81a49c6c 100644
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -1,8 +1,7 @@
 ; Functions to fade the screen in and out.
 
 
-Function48c:: ; 48c
-; XXX
+Unreferenced_Function48c:: ; 48c
 ; TimeOfDayFade
 	ld a, [TimeOfDayPal]
 	ld b, a
diff --git a/home/init.asm b/home/init.asm
index 8895da0f9..f9c8ef485 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -166,7 +166,7 @@ Init:: ; 17d
 
 	call DelayFrame
 
-	predef InitSGBBorder ; SGB init
+	predef Predef_InitSGBBorder ; SGB init
 
 	call MapSetup_Sound_Off
 	xor a
diff --git a/home/lcd.asm b/home/lcd.asm
index dfb174ee1..e2fb4c5a9 100644
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -1,8 +1,7 @@
 ; LCD handling
 
 
-Function547:: ; 547
-; Unreferenced
+Unreferenced_Function547:: ; 547
 	ld a, [hLCDCPointer]
 	cp rSCX - $ff00
 	ret nz
diff --git a/home/map.asm b/home/map.asm
index eb061e713..919f162bb 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -384,7 +384,7 @@ CheckIndoorMap:: ; 22f4
 	ret
 ; 2300
 
-; XXX
+; unused
 	cp INDOOR
 	ret z
 	cp GATE
@@ -1383,7 +1383,7 @@ UpdateBGMapColumn:: ; 27f8
 	ret
 ; 2816
 
-; unreferenced
+Unreferenced_Function2816::
 	ld hl, BGMapBuffer
 	ld bc, BGMapBufferEnd - BGMapBuffer
 	xor a
@@ -1984,7 +1984,7 @@ FadeToMenu:: ; 2b29
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardMenuDataHeader
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
@@ -2010,7 +2010,7 @@ FinishExitMenu:: ; 2b5c
 	call GetSGBLayout
 	farcall LoadOW_BGPal7
 	call WaitBGMap2
-	farcall FadeInPalettes
+	farcall Special_FadeInPalettes
 	call EnableSpriteUpdates
 	ret
 ; 2b74
@@ -2043,7 +2043,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
 ReloadTilesetAndPalettes:: ; 2bae
 	call DisableLCD
 	call ClearSprites
-	farcall RefreshSprites
+	farcall Special_RefreshSprites
 	call LoadStandardFont
 	call LoadFontsExtra
 	ld a, [hROMBank]
@@ -2076,7 +2076,6 @@ GetAnyMapHeaderPointer:: ; 0x2bed
 
 ; inputs:
 ; b = map group, c = map number
-; XXX de = ???
 
 ; outputs:
 ; hl points to the map header
@@ -2248,7 +2247,7 @@ GetMapEnvironment:: ; 2c8a
 	ret
 ; 2c98
 
-	ret ; XXX
+	ret ; unused
 ; 2c99
 
 GetAnyMapEnvironment:: ; 2c99
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 3857bef0c..1db2bb3ba 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -316,7 +316,7 @@ CheckObjectTime:: ; 18f5
 	ret
 ; 194d
 
-; XXX
+; unused
 	ld [hMapObjectIndexBuffer], a
 	call GetMapObject
 	call CopyObjectStruct
@@ -383,7 +383,7 @@ CopyPlayerObjectTemplate:: ; 19a6
 	ret
 ; 19b8
 
-; XXX
+Unreferenced_Function19b8:
 	call GetMapObject
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
 	add hl, bc
diff --git a/home/menu.asm b/home/menu.asm
index e44e1b2ca..6ef1ba7f3 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -28,8 +28,7 @@ MenuTextBox:: ; 1d4f
 	jp PrintText
 ; 1d57
 
-ret_1d57:: ; 1d57
-; unreferenced
+; unused
 	ret
 ; 1d58
 
@@ -450,8 +449,7 @@ PlaceNthMenuStrings:: ; 1f8d
 	ret
 ; 1f9e
 
-Function1f9e:: ; 1f9e
-; unreferenced
+Unreferenced_Function1f9e:: ; 1f9e
 	call GetMenuDataPointerTableEntry
 	inc hl
 	inc hl
diff --git a/home/mobile.asm b/home/mobile.asm
index f50571ff4..1248c3f7e 100644
--- a/home/mobile.asm
+++ b/home/mobile.asm
@@ -127,8 +127,7 @@ Timer:: ; 3e93
 	reti
 ; 3ed7
 
-Function3ed7:: ; 3ed7
-; unreferenced
+Unreferenced_Function3ed7:: ; 3ed7
 	ld [$dc02], a
 	ld a, [hROMBank]
 	push af
@@ -160,8 +159,7 @@ Function3eea:: ; 3eea
 	ret
 ; 3efd
 
-Function3efd:: ; 3efd
-; unreferenced
+Unreferenced_Function3efd:: ; 3efd
 	push hl
 	hlcoord 0, 12
 	ld b, 4
diff --git a/home/palettes.asm b/home/palettes.asm
index 79ff71887..9f10da118 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -319,7 +319,7 @@ ret_d90:: ; d90
 ; d91
 
 
-Special_ReloadSpritesNoPalettes:: ; d91
+ReloadSpritesNoPalettes:: ; d91
 	ld a, [hCGB]
 	and a
 	ret z
diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm
index 7aacd4981..ace3d6802 100644
--- a/home/pokedex_flags.asm
+++ b/home/pokedex_flags.asm
@@ -31,7 +31,7 @@ CheckSeenMon:: ; 339b
 
 PokedexFlagAction:: ; 33a1
 	ld d, 0
-	predef FlagPredef
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	ret
diff --git a/home/serial.asm b/home/serial.asm
index b0151eae2..1d6f11bd1 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -398,8 +398,7 @@ LinkDataReceived:: ; 908
 	ret
 ; 919
 
-Function919:: ; 919
-; XXX
+Unreferenced_Function919:: ; 919
 	ld a, [wLinkMode]
 	and a
 	ret nz
diff --git a/home/text.asm b/home/text.asm
index 49b5f8abc..a89f39eb2 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -1013,8 +1013,7 @@ Text_PlaySound:: ; 1500
 	ret
 ; 1522
 
-Function1522:: ; 1522
-; XXX
+Unreferenced_Function1522:: ; 1522
 ; TX_CRY
 	push de
 	ld e, [hl]
diff --git a/home/trainers.asm b/home/trainers.asm
index 857a95629..44093bfc1 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -240,7 +240,7 @@ PrintWinLossText:: ; 3718
 	cp BATTLETYPE_CANLOSE
 	jr .canlose ; ??????????
 
-; unreferenced
+; unused
 	ld hl, wWinTextPointer
 	jr .ok
 
diff --git a/home/window.asm b/home/window.asm
index 0570bbb01..67debe5d3 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -99,7 +99,7 @@ SafeUpdateSprites:: ; 2e31
 	ld [hOAMUpdate], a
 	ret
 
-; XXX
+; unused
 	scf
 	ret
 ; 2e50