Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

data/maps/SaffronCity_House/scripts.inc

@@ -1,24 +1,24 @@
-SaffronCity_House_MapScripts:: @ 816EF73
+SaffronCity_House_MapScripts::
 	.byte 0
 
-SaffronCity_House_EventScript_Lass:: @ 816EF74
+SaffronCity_House_EventScript_Lass::
 	msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC
 	end
 
-SaffronCity_House_EventScript_Youngster:: @ 816EF7D
+SaffronCity_House_EventScript_Youngster::
 	msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC
 	end
 
-SaffronCity_House_EventScript_Pidgey:: @ 816EF86
+SaffronCity_House_EventScript_Pidgey::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIDGEY, 0
+	playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL
 	msgbox SaffronCity_House_Text_Pidgey
 	waitmoncry
 	release
 	end
 
-SaffronCity_House_EventScript_Letter:: @ 816EF99
+SaffronCity_House_EventScript_Letter::
 	msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN
 	end

data/maps/SaffronCity_House/text.inc

@@ -1,17 +1,17 @@
-SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74
+SaffronCity_House_Text_DontLookAtMyLetter::
     .string "…Thank you for writing.\n"
     .string "I hope to see you soon!\p"
     .string "…Hey!\n"
     .string "Don't look at my letter!$"
 
-SaffronCity_House_Text_Pidgey:: @ 819BEC3
+SaffronCity_House_Text_Pidgey::
     .string "PIDGEY: Kurukkoo!$"
 
-SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5
+SaffronCity_House_Text_GettingCopycatPokeDoll::
     .string "The COPYCAT is cute!\n"
     .string "I'm getting her a POKé DOLL.$"
 
-SaffronCity_House_Text_ExplainPPUp:: @ 819BF07
+SaffronCity_House_Text_ExplainPPUp::
     .string "I was given a PP UP as a gift.\p"
     .string "It's used to increase the PP of\n"
     .string "a POKéMON's move.\p"