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/Route30BerryHouse.asm

@@ -6,27 +6,27 @@ Route30BerryHouse_MapScripts:
 
 	db 0 ; callbacks
 
-PokefanMScript_0x196d64:
+Route30BerryHousePokefanMScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-	iftrue UnknownScript_0x196d79
-	writetext UnknownText_0x196d82
+	iftrue .GotBerry
+	writetext Route30BerrySpeechHouseMonEatBerriesText
 	buttonsound
 	verbosegiveitem BERRY
-	iffalse UnknownScript_0x196d7d
+	iffalse .NoRoom
 	setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-UnknownScript_0x196d79:
-	writetext UnknownText_0x196dec
+.GotBerry:
+	writetext Route30BerrySpeechHouseCheckTreesText
 	waitbutton
-UnknownScript_0x196d7d:
+.NoRoom:
 	closetext
 	end
 
 Route30BerryHouseBookshelf:
 	jumpstd magazinebookshelf
 
-UnknownText_0x196d82:
+Route30BerrySpeechHouseMonEatBerriesText:
 	text "You know, #MON"
 	line "eat BERRIES."
 
@@ -38,7 +38,7 @@ UnknownText_0x196d82:
 	line "one with you!"
 	done
 
-UnknownText_0x196dec:
+Route30BerrySpeechHouseCheckTreesText:
 	text "Check trees for"
 	line "BERRIES. They just"
 	cont "drop right off."
@@ -58,4 +58,4 @@ Route30BerryHouse_MapEvents:
 	bg_event  1,  1, BGEVENT_READ, Route30BerryHouseBookshelf
 
 	db 1 ; object events
-	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route30BerryHousePokefanMScript, -1