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

data/maps/LavenderTown_House1/scripts.inc

@@ -1,7 +1,7 @@
-LavenderTown_House1_MapScripts:: @ 816B232
+LavenderTown_House1_MapScripts::
 	.byte 0
 
-LavenderTown_House1_EventScript_CooltrainerF:: @ 816B233
+LavenderTown_House1_EventScript_CooltrainerF::
 	lock
 	faceplayer
 	goto_if_set FLAG_RESCUED_MR_FUJI, LavenderTown_House1_EventScript_CooltrainerFGhostGone
@@ -9,16 +9,16 @@ LavenderTown_House1_EventScript_CooltrainerF:: @ 816B233
 	release
 	end
 
-LavenderTown_House1_EventScript_CooltrainerFGhostGone:: @ 816B248
+LavenderTown_House1_EventScript_CooltrainerFGhostGone::
 	msgbox LavenderTown_House1_Text_GhostOfPokemonTowerIsGone
 	release
 	end
 
-LavenderTown_House1_EventScript_Cubone:: @ 816B252
+LavenderTown_House1_EventScript_Cubone::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_CUBONE, 0
+	playmoncry SPECIES_CUBONE, CRY_MODE_NORMAL
 	msgbox LavenderTown_House1_Text_Cubone
 	waitmoncry
 	release

data/maps/LavenderTown_House1/text.inc

@@ -1,14 +1,14 @@
-LavenderTown_House1_Text_Cubone:: @ 819396B
+LavenderTown_House1_Text_Cubone::
     .string "CUBONE: Kyarugoo!$"
 
-LavenderTown_House1_Text_RocketsKilledCubonesMother:: @ 819397D
+LavenderTown_House1_Text_RocketsKilledCubonesMother::
     .string "Those horrible ROCKETS!\n"
     .string "They deserve no mercy!\p"
     .string "That poor CUBONE's mother…\p"
     .string "It was killed trying to escape from\n"
     .string "TEAM ROCKET.$"
 
-LavenderTown_House1_Text_GhostOfPokemonTowerIsGone:: @ 81939F8
+LavenderTown_House1_Text_GhostOfPokemonTowerIsGone::
     .string "The ghost of POKéMON TOWER is\n"
     .string "gone!\p"
     .string "Someone must have soothed its\n"