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

data/maps/ThreeIsland_BerryForest/scripts.inc

@@ -1,15 +1,15 @@
 .set LOCALID_LOSTELLE, 1
 
-ThreeIsland_BerryForest_MapScripts:: @ 8163C71
+ThreeIsland_BerryForest_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition
 	.byte 0
 
-ThreeIsland_BerryForest_OnTransition:: @ 8163C77
+ThreeIsland_BerryForest_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST
 	setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6
 	end
 
-ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
+ThreeIsland_BerryForest_EventScript_Lostelle::
 	lock
 	faceplayer
 	msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon
@@ -21,7 +21,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
 	msgbox ThreeIsland_BerryForest_Text_HereItComesAgain
 	goto_if_questlog EventScript_ReleaseEnd
 	waitse
-	playmoncry SPECIES_HYPNO, 2
+	playmoncry SPECIES_HYPNO, CRY_MODE_ENCOUNTER
 	waitmoncry
 	setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
 	dowildbattle
@@ -44,11 +44,11 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
 	release
 	end
 
-ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: @ 8163D19
+ThreeIsland_BerryForest_EventScript_NoRoomForBerry::
 	msgbox ThreeIsland_BerryForest_Text_BerryPouchIsFull
 	return
 
-ThreeIsland_BerryForest_Movement_LostelleLookAround:: @ 8163D22
+ThreeIsland_BerryForest_Movement_LostelleLookAround::
 	walk_in_place_fastest_left
 	delay_16
 	walk_in_place_fastest_right
@@ -56,10 +56,10 @@ ThreeIsland_BerryForest_Movement_LostelleLookAround:: @ 8163D22
 	walk_in_place_fastest_left
 	step_end
 
-ThreeIsland_BerryForest_EventScript_WelcomeSign:: @ 8163D28
+ThreeIsland_BerryForest_EventScript_WelcomeSign::
 	msgbox ThreeIsland_BerryForest_Text_WelcomeToBerryForest, MSGBOX_SIGN
 	end
 
-ThreeIsland_BerryForest_EventScript_BewareSign:: @ 8163D31
+ThreeIsland_BerryForest_EventScript_BewareSign::
 	msgbox ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons, MSGBOX_SIGN
 	end

data/maps/ThreeIsland_BerryForest/text.inc

@@ -1,4 +1,4 @@
-ThreeIsland_BerryForest_Text_HelpScaryPokemon:: @ 817ADD6
+ThreeIsland_BerryForest_Text_HelpScaryPokemon::
     .string "LOSTELLE: Whimper… Sniff…\n"
     .string "Oh! Please, help!\p"
     .string "A scary POKéMON appeared there\n"
@@ -8,36 +8,36 @@ ThreeIsland_BerryForest_Text_HelpScaryPokemon:: @ 817ADD6
     .string "I'm too scared to move!\n"
     .string "But I want to go home…$"
 
-ThreeIsland_BerryForest_Text_HereItComesAgain:: @ 817AE8E
+ThreeIsland_BerryForest_Text_HereItComesAgain::
     .string "Oh! Here it comes again!\n"
     .string "No! Go away! It's scaring me!\p"
     .string "Waaaaaaah!\n"
     .string "I want my daddy!$"
 
-ThreeIsland_BerryForest_Text_ThankYouHaveThis:: @ 817AEE1
+ThreeIsland_BerryForest_Text_ThankYouHaveThis::
     .string "Ohh! That was so scary!\n"
     .string "Thank you!\p"
     .string "LOSTELLE came to pick some\n"
     .string "BERRIES.\p"
     .string "You can have this!$"
 
-ThreeIsland_BerryForest_Text_LetsGoHome:: @ 817AF3B
+ThreeIsland_BerryForest_Text_LetsGoHome::
     .string "What's your name?\p"
     .string "LOSTELLE's scared, so can I go\n"
     .string "with you to my daddy's house?\p"
     .string "Okay!\n"
     .string "Let's go home!$"
 
-ThreeIsland_BerryForest_Text_BerryPouchIsFull:: @ 817AF9F
+ThreeIsland_BerryForest_Text_BerryPouchIsFull::
     .string "Your BERRY POUCH is full.\n"
     .string "I guess you don't want this.$"
 
-ThreeIsland_BerryForest_Text_WelcomeToBerryForest:: @ 817AFD6
+ThreeIsland_BerryForest_Text_WelcomeToBerryForest::
     .string "Welcome to the BERRY FOREST\p"
     .string "Be friendly and share BERRIES with\n"
     .string "others and POKéMON.$"
 
-ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons:: @ 817B029
+ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons::
     .string "Beware of wild, BERRY-loving\n"
     .string "POKéMON!$"