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

data/maps/CeruleanCave_B1F/scripts.inc

@@ -1,34 +1,34 @@
-CeruleanCave_B1F_MapScripts:: @ 81624BE
+CeruleanCave_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, CeruleanCave_B1F_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_B1F_OnTransition
 	.byte 0
 
-CeruleanCave_B1F_OnResume:: @ 81624C9
+CeruleanCave_B1F_OnResume::
 	call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, CeruleanCave_B1F_EventScript_TryRemoveMewtwo
 	end
 
-CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3
+CeruleanCave_B1F_EventScript_TryRemoveMewtwo::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
 	return
 
-CeruleanCave_B1F_OnTransition:: @ 81624E7
+CeruleanCave_B1F_OnTransition::
 	call_if_unset FLAG_FOUGHT_MEWTWO, CeruleanCave_B1F_EventScript_ShowMewtwo
 	end
 
-CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1
+CeruleanCave_B1F_EventScript_ShowMewtwo::
 	clearflag FLAG_HIDE_MEWTWO
 	return
 
-CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
+CeruleanCave_B1F_EventScript_Mewtwo::
 	goto_if_questlog EventScript_ReleaseEnd
 	special QuestLog_CutRecording
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_MEWTWO, 2
+	playmoncry SPECIES_MEWTWO, CRY_MODE_ENCOUNTER
 	message CeruleanCave_B1F_Text_Mew
 	waitmessage
 	waitmoncry
@@ -51,12 +51,12 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
 	release
 	end
 
-CeruleanCave_B1F_EventScript_DefeatedMewtwo:: @ 8162558
+CeruleanCave_B1F_EventScript_DefeatedMewtwo::
 	setflag FLAG_FOUGHT_MEWTWO
 	goto EventScript_RemoveStaticMon
 	end
 
-CeruleanCave_B1F_EventScript_RanFromMewtwo:: @ 8162561
+CeruleanCave_B1F_EventScript_RanFromMewtwo::
 	setvar VAR_0x8004, SPECIES_MEWTWO
 	goto EventScript_MonFlewAway
 	end

data/maps/CeruleanCave_B1F/text.inc

@@ -1,3 +1,3 @@
-CeruleanCave_B1F_Text_Mew:: @ 8177F9F
+CeruleanCave_B1F_Text_Mew::
     .string "Mew!$"