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

data/maps/ThreeIsland_DunsparceTunnel/scripts.inc

@@ -1,10 +1,10 @@
 .set LOCALID_PROSPECTOR, 1
 
-ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26
+ThreeIsland_DunsparceTunnel_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition
 	.byte 0
 
-ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C
+ThreeIsland_DunsparceTunnel_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	copyvar VAR_0x8008, VAR_RESULT
@@ -14,16 +14,16 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C
 	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall
 	end
 
-ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50
+ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut::
 	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT
 	return
 
-ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54
+ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall::
 	setobjectxyperm LOCALID_PROSPECTOR, 6, 3
 	setobjectmovementtype LOCALID_PROSPECTOR, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60
+ThreeIsland_DunsparceTunnel_EventScript_Prospector::
 	lock
 	faceplayer
 	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
@@ -37,7 +37,7 @@ ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60
 	release
 	end
 
-ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold::
 	msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou
 	giveitem ITEM_NUGGET
 	compare VAR_RESULT, FALSE
@@ -46,12 +46,12 @@ ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90
 	goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	end
 
-ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8
+ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget::
 	msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull
 	release
 	end
 
-ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget::
 	msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget
 	release
 	end

data/maps/ThreeIsland_DunsparceTunnel/text.inc

@@ -1,4 +1,4 @@
-ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B
+ThreeIsland_DunsparceTunnel_Text_ProspectingForGold::
     .string "Hey, there!\n"
     .string "How's it going?\p"
     .string "What am I doing here, you ask?\n"
@@ -6,7 +6,7 @@ ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B
     .string "When I strike it rich, I'm buying\n"
     .string "a house in KANTO.$"
 
-ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9
+ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou::
     .string "Hey, there! How's it going?\n"
     .string "Did you hear? I've struck gold!\p"
     .string "You remembered that I was\n"
@@ -16,12 +16,12 @@ ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9
     .string "So, I'll show you!\n"
     .string "This is for you!$"
 
-ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C
+ThreeIsland_DunsparceTunnel_Text_ThatsANugget::
     .string "That's a NUGGET!\p"
     .string "I can't give you any nuggets of\n"
     .string "wisdom, so that'll have to do!$"
 
-ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC
+ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull::
     .string "Whoops, your BAG is crammed full!\n"
     .string "I'll give this to you later.$"