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

diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 7c73e1e2d..920617df8 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -169,8 +169,8 @@ UnknownScript_0x59260:
 	closetext
 	end
 
-UnknownScript_0x59269:
-	jumptext UnknownText_0x59848
+UnreferencedScript_0x59269:
+	jumptext UnusedText_0x59848
 
 MapRuinsOfAlphResearchCenterSignpost0Script:
 	jumptext UnknownText_0x59886
@@ -308,8 +308,8 @@ UnknownText_0x595cb:
 	cont "kinds of them…"
 	done
 
-; possibly unused
-UnknownText_0x59669:
+; unused
+UnusedText_0x59669:
 	text "We think something"
 	line "caused the cryptic"
 
@@ -320,8 +320,8 @@ UnknownText_0x59669:
 	line "studies on that."
 	done
 
-; possibly unused
-UnknownText_0x596d3:
+; unused
+UnusedText_0x596d3:
 	text "According to my"
 	line "research…"
 
@@ -374,8 +374,8 @@ UnknownText_0x5982d:
 	line "printed out."
 	done
 
-; possibly unused
-UnknownText_0x59848:
+; unused
+UnusedText_0x59848:
 	text "It's a photo of"
 	line "the RESEARCH"