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

data/maps/VermilionCity_House3/scripts.inc

@@ -1,24 +1,24 @@
-VermilionCity_House3_MapScripts:: @ 816BAA9
+VermilionCity_House3_MapScripts::
 	.byte 0
 
-VermilionCity_House3_EventScript_Boy:: @ 816BAAA
+VermilionCity_House3_EventScript_Boy::
 	msgbox VermilionCity_House3_Text_PidgeyFlyLetterToSaffron, MSGBOX_NPC
 	end
 
-VermilionCity_House3_EventScript_Lass:: @ 816BAB3
+VermilionCity_House3_EventScript_Lass::
 	msgbox VermilionCity_House3_Text_SendMyPidgeyToUnionRoom, MSGBOX_NPC
 	end
 
-VermilionCity_House3_EventScript_Pidgey:: @ 816BABC
+VermilionCity_House3_EventScript_Pidgey::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIDGEY, 0
+	playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL
 	msgbox VermilionCity_House3_Text_Pidgey
 	waitmoncry
 	release
 	end
 
-VermilionCity_House3_EventScript_Letter:: @ 816BACF
+VermilionCity_House3_EventScript_Letter::
 	msgbox VermilionCity_House3_Text_DearPippiLetter, MSGBOX_SIGN
 	end

data/maps/VermilionCity_House3/text.inc

@@ -1,18 +1,18 @@
-VermilionCity_House3_Text_PidgeyFlyLetterToSaffron:: @ 81953AF
+VermilionCity_House3_Text_PidgeyFlyLetterToSaffron::
     .string "I'm getting my PIDGEY to fly a\n"
     .string "letter to SAFFRON in the north.$"
 
-VermilionCity_House3_Text_Pidgey:: @ 81953EE
+VermilionCity_House3_Text_Pidgey::
     .string "PIDGEY: Kurukkoo!$"
 
-VermilionCity_House3_Text_DearPippiLetter:: @ 8195400
+VermilionCity_House3_Text_DearPippiLetter::
     .string "Dear PIPPI,\n"
     .string "I hope to see you soon.\p"
     .string "I heard SAFFRON has problems with\n"
     .string "TEAM ROCKET.\p"
     .string "VERMILION appears to be safe.$"
 
-VermilionCity_House3_Text_SendMyPidgeyToUnionRoom:: @ 8195471
+VermilionCity_House3_Text_SendMyPidgeyToUnionRoom::
     .string "I want to exchange MAIL with all\n"
     .string "sorts of people.\p"
     .string "I send my PIDGEY to a UNION ROOM\n"