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

data/maps/LavenderTown/scripts.inc

@@ -1,14 +1,14 @@
-LavenderTown_MapScripts:: @ 816686B
+LavenderTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_OnTransition
 	.byte 0
 
-LavenderTown_OnTransition:: @ 8166871
+LavenderTown_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN
 	setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
 	setflag FLAG_HIDE_SS_ANNE_RIVAL
 	end
 
-LavenderTown_EventScript_LittleGirl:: @ 816687D
+LavenderTown_EventScript_LittleGirl::
 	lock
 	faceplayer
 	msgbox LavenderTown_Text_DoYouBelieveInGhosts, MSGBOX_YESNO
@@ -18,31 +18,31 @@ LavenderTown_EventScript_LittleGirl:: @ 816687D
 	release
 	end
 
-LavenderTown_EventScript_LittleGirlBelieve:: @ 816689C
+LavenderTown_EventScript_LittleGirlBelieve::
 	msgbox LavenderTown_Text_SoThereAreBelievers
 	release
 	end
 
-LavenderTown_EventScript_WorkerM:: @ 81668A6
+LavenderTown_EventScript_WorkerM::
 	msgbox LavenderTown_Text_TownKnownAsMonGraveSite, MSGBOX_NPC
 	end
 
-LavenderTown_EventScript_Boy:: @ 81668AF
+LavenderTown_EventScript_Boy::
 	msgbox LavenderTown_Text_GhostsAppearedInTower, MSGBOX_NPC
 	end
 
-LavenderTown_EventScript_TownSign:: @ 81668B8
+LavenderTown_EventScript_TownSign::
 	msgbox LavenderTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-LavenderTown_EventScript_SilphScopeNotice:: @ 81668C1
+LavenderTown_EventScript_SilphScopeNotice::
 	msgbox LavenderTown_Text_SilphScopeNotice, MSGBOX_SIGN
 	end
 
-LavenderTown_EventScript_VolunteerHouseSign:: @ 81668CA
+LavenderTown_EventScript_VolunteerHouseSign::
 	msgbox LavenderTown_Text_VolunteerPokemonHouse, MSGBOX_SIGN
 	end
 
-LavenderTown_EventScript_PokemonTowerSign:: @ 81668D3
+LavenderTown_EventScript_PokemonTowerSign::
 	msgbox LavenderTown_Text_PokemonTowerSign, MSGBOX_SIGN
 	end

data/maps/LavenderTown/text.inc

@@ -1,40 +1,40 @@
-LavenderTown_Text_DoYouBelieveInGhosts:: @ 817F52E
+LavenderTown_Text_DoYouBelieveInGhosts::
     .string "Do you believe in ghosts?$"
 
-LavenderTown_Text_SoThereAreBelievers:: @ 817F548
+LavenderTown_Text_SoThereAreBelievers::
     .string "Really?\n"
     .string "So there are believers…$"
 
-LavenderTown_Text_JustImaginingWhiteHand:: @ 817F568
+LavenderTown_Text_JustImaginingWhiteHand::
     .string "Hahaha, I guess not.\p"
     .string "That white hand on your shoulder…\n"
     .string "I'm just imagining it.$"
 
-LavenderTown_Text_TownKnownAsMonGraveSite:: @ 817F5B6
+LavenderTown_Text_TownKnownAsMonGraveSite::
     .string "This town is known as the grave\n"
     .string "site of POKéMON.\p"
     .string "Memorial services are held in\n"
     .string "POKéMON TOWER.$"
 
-LavenderTown_Text_GhostsAppearedInTower:: @ 817F614
+LavenderTown_Text_GhostsAppearedInTower::
     .string "Ghosts appeared in POKéMON TOWER.\p"
     .string "I think they're the spirits of\n"
     .string "POKéMON that the ROCKETS killed.$"
 
-LavenderTown_Text_TownSign:: @ 817F676
+LavenderTown_Text_TownSign::
     .string "LAVENDER TOWN\n"
     .string "The Noble Purple Town$"
 
-LavenderTown_Text_SilphScopeNotice:: @ 817F69A
+LavenderTown_Text_SilphScopeNotice::
     .string "New SILPH SCOPE!\n"
     .string "Make the Invisible Plain to See!\p"
     .string "SILPH CO.$"
 
-LavenderTown_Text_VolunteerPokemonHouse:: @ 817F6D6
+LavenderTown_Text_VolunteerPokemonHouse::
     .string "LAVENDER VOLUNTEER\n"
     .string "POKéMON HOUSE$"
 
-LavenderTown_Text_PokemonTowerSign:: @ 817F6F7
+LavenderTown_Text_PokemonTowerSign::
     .string "POKéMON TOWER\n"
     .string "Becalm the Spirits of POKéMON$"