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

data/maps/Route16_House/scripts.inc

@@ -1,7 +1,7 @@
-Route16_House_MapScripts:: @ 817014E
+Route16_House_MapScripts::
 	.byte 0
 
-Route16_House_EventScript_Woman:: @ 817014F
+Route16_House_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02
@@ -15,21 +15,21 @@ Route16_House_EventScript_Woman:: @ 817014F
 	release
 	end
 
-Route16_House_EventScript_NoRoomForHM02:: @ 817019B
+Route16_House_EventScript_NoRoomForHM02::
 	msgbox Route16_House_Text_DontHaveAnyRoomForThis
 	release
 	end
 
-Route16_House_EventScript_AlreadyGotHM02:: @ 81701A5
+Route16_House_EventScript_AlreadyGotHM02::
 	msgbox Route16_House_Text_ExplainHM02
 	release
 	end
 
-Route16_House_EventScript_Fearow:: @ 81701AF
+Route16_House_EventScript_Fearow::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_FEAROW, 0
+	playmoncry SPECIES_FEAROW, CRY_MODE_NORMAL
 	msgbox Route16_House_Text_Fearow
 	waitmoncry
 	release

data/maps/Route16_House/text.inc

@@ -1,21 +1,21 @@
-Route16_House_Text_FoundMySecretRetreat:: @ 819F851
+Route16_House_Text_FoundMySecretRetreat::
     .string "Oh, dear.\n"
     .string "You've found my secret retreat.\p"
     .string "Please don't tell anyone I'm here.\n"
     .string "I'll make it up to you with this!$"
 
-Route16_House_Text_ReceivedHM02FromGirl:: @ 819F8C0
+Route16_House_Text_ReceivedHM02FromGirl::
     .string "{PLAYER} received HM02\n"
     .string "from the girl.$"
 
-Route16_House_Text_ExplainHM02:: @ 819F8E0
+Route16_House_Text_ExplainHM02::
     .string "HM02 is FLY.\n"
     .string "It's a wonderfully convenient move.\p"
     .string "Please, put it to good use.$"
 
-Route16_House_Text_DontHaveAnyRoomForThis:: @ 819F92D
+Route16_House_Text_DontHaveAnyRoomForThis::
     .string "You don't have any room for this.$"
 
-Route16_House_Text_Fearow:: @ 819F94F
+Route16_House_Text_Fearow::
     .string "FEAROW: Kyueen!$"