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

data/maps/PokemonTower_1F/scripts.inc

@@ -1,24 +1,24 @@
-PokemonTower_1F_MapScripts:: @ 8163235
+PokemonTower_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, PokemonTower_1F_OnTransition
 	.byte 0
 
-PokemonTower_1F_OnTransition:: @ 816323B
+PokemonTower_1F_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F
 	end
 
-PokemonTower_1F_EventScript_Channeler:: @ 816323F
+PokemonTower_1F_EventScript_Channeler::
 	msgbox PokemonTower_1F_Text_SenseSpiritsUpToMischief, MSGBOX_NPC
 	end
 
-PokemonTower_1F_EventScript_Woman1:: @ 8163248
+PokemonTower_1F_EventScript_Woman1::
 	msgbox PokemonTower_1F_Text_GrowlitheWhyDidYouDie, MSGBOX_NPC
 	end
 
-PokemonTower_1F_EventScript_BaldingMan:: @ 8163251
+PokemonTower_1F_EventScript_BaldingMan::
 	msgbox PokemonTower_1F_Text_CameToPrayForDepartedClefairy, MSGBOX_NPC
 	end
 
-PokemonTower_1F_EventScript_Woman2:: @ 816325A
+PokemonTower_1F_EventScript_Woman2::
 	lock
 	faceplayer
 	checkplayergender
@@ -28,11 +28,11 @@ PokemonTower_1F_EventScript_Woman2:: @ 816325A
 	release
 	end
 
-PokemonTower_1F_EventScript_Woman2MalePlayer:: @ 8163272
+PokemonTower_1F_EventScript_Woman2MalePlayer::
 	msgbox PokemonTower_1F_Text_ComeToPayRespectsSon
 	release
 	end
 
-PokemonTower_1F_EventScript_WorkerF:: @ 816327C
+PokemonTower_1F_EventScript_WorkerF::
 	msgbox PokemonTower_1F_Text_ErectedInMemoryOfDeadMons, MSGBOX_NPC
 	end

data/maps/PokemonTower_1F/text.inc

@@ -1,28 +1,28 @@
-PokemonTower_1F_Text_ErectedInMemoryOfDeadMons:: @ 8179B7A
+PokemonTower_1F_Text_ErectedInMemoryOfDeadMons::
     .string "POKéMON TOWER was erected in the\n"
     .string "memory of POKéMON that died.$"
 
-PokemonTower_1F_Text_ComeToPayRespectsSon:: @ 8179BB8
+PokemonTower_1F_Text_ComeToPayRespectsSon::
     .string "Did you come to pay respects?\p"
     .string "Bless your POKéMON-loving heart,\n"
     .string "son.$"
 
-PokemonTower_1F_Text_ComeToPayRespectsGirl:: @ 8179BFC
+PokemonTower_1F_Text_ComeToPayRespectsGirl::
     .string "Did you come to pay respects?\p"
     .string "Bless your POKéMON-loving heart,\n"
     .string "girl.$"
 
-PokemonTower_1F_Text_CameToPrayForDepartedClefairy:: @ 8179C41
+PokemonTower_1F_Text_CameToPrayForDepartedClefairy::
     .string "I came to pray for my dearly\n"
     .string "departed CLEFAIRY.\p"
     .string "Sniff!\n"
     .string "I'm awash in tears…$"
 
-PokemonTower_1F_Text_GrowlitheWhyDidYouDie:: @ 8179C8C
+PokemonTower_1F_Text_GrowlitheWhyDidYouDie::
     .string "My GROWLITHE…\n"
     .string "Why did you die?$"
 
-PokemonTower_1F_Text_SenseSpiritsUpToMischief:: @ 8179CAB
+PokemonTower_1F_Text_SenseSpiritsUpToMischief::
     .string "I am a CHANNELER.\p"
     .string "There are spirits up to mischief.\n"
     .string "I sense them high in the TOWER.$"