Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm

maps/RuinsOfAlphHoOhChamber.asm

@@ -51,10 +51,10 @@ MapRuinsOfAlphHoOhChamberSignpost2Script:
 	writebyte UNOWNPUZZLE_HO_OH
 	special UnownPuzzle
 	closetext
-	iftrue UnknownScript_0x585ba
+	iftrue .PuzzleComplete
 	end
 
-UnknownScript_0x585ba:
+.PuzzleComplete:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_HO_OH_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
@@ -89,7 +89,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script:
 
 MapRuinsOfAlphHoOhChamberSignpost5Script:
 	checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
-	iftrue UnknownScript_0x58609
+	iftrue .WallOpen
 	opentext
 	writetext UnknownText_0x58644
 	writebyte UNOWNWORDS_HO_OH
@@ -97,7 +97,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script:
 	closetext
 	end
 
-UnknownScript_0x58609:
+.WallOpen:
 	opentext
 	writetext UnknownText_0x58665
 	waitbutton