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

data/maps/OneIsland/scripts.inc

@@ -1,19 +1,19 @@
 .equ LOCALID_BILL, 1
 
-OneIsland_MapScripts:: @ 8167484
+OneIsland_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame
 	.byte 0
 
-OneIsland_OnTransition:: @ 816748F
+OneIsland_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND
 	end
 
-OneIsland_OnFrame:: @ 8167493
+OneIsland_OnFrame::
 	map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, OneIsland_EventScript_EnterOneIslandFirstTime
 	.2byte 0
 
-OneIsland_EventScript_EnterOneIslandFirstTime:: @ 816749D
+OneIsland_EventScript_EnterOneIslandFirstTime::
 	lockall
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor
@@ -51,32 +51,32 @@ OneIsland_EventScript_EnterOneIslandFirstTime:: @ 816749D
 	walk_up
 	.endm
 
-OneIsland_Movement_PlayerWalkToPokeCenter:: @ 81674F4
+OneIsland_Movement_PlayerWalkToPokeCenter::
 	walk_up
 	walk_to_pokecenter
 	step_end
 
-OneIsland_Movement_PlayerEnterPokeCenter:: @ 8167501
+OneIsland_Movement_PlayerEnterPokeCenter::
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-OneIsland_Movement_PlayerExitHarbor:: @ 8167505
+OneIsland_Movement_PlayerExitHarbor::
 	walk_up
 	step_end
 
-OneIsland_Movement_BillWalkToPokeCenter:: @ 8167507
+OneIsland_Movement_BillWalkToPokeCenter::
 	walk_to_pokecenter
 	walk_up
 	step_end
 
-OneIsland_Movement_BillEnterPokeCenter:: @ 8167514
+OneIsland_Movement_BillEnterPokeCenter::
 	walk_up
 	set_invisible
 	step_end
 
-OneIsland_EventScript_OldMan:: @ 8167517
+OneIsland_EventScript_OldMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_EventScript_OldManLinkHoenn
@@ -85,24 +85,24 @@ OneIsland_EventScript_OldMan:: @ 8167517
 	release
 	end
 
-OneIsland_EventScript_OldManLinkKanto:: @ 8167535
+OneIsland_EventScript_OldManLinkKanto::
 	msgbox OneIsland_Text_HavePCLinkageWithKanto
 	release
 	end
 
-OneIsland_EventScript_OldManLinkHoenn:: @ 816753F
+OneIsland_EventScript_OldManLinkHoenn::
 	msgbox OneIsland_Text_HavePCLinkageWithHoenn
 	release
 	end
 
-OneIsland_EventScript_BaldingMan:: @ 8167549
+OneIsland_EventScript_BaldingMan::
 	msgbox OneIsland_Text_IsntWarmClimateHereGreat, MSGBOX_NPC
 	end
 
-OneIsland_EventScript_IslandSign:: @ 8167552
+OneIsland_EventScript_IslandSign::
 	msgbox OneIsland_Text_IslandSign, MSGBOX_SIGN
 	end
 
-OneIsland_EventScript_PokemonNetCenterSign:: @ 816755B
+OneIsland_EventScript_PokemonNetCenterSign::
 	msgbox OneIsland_Text_PokemonNetCenterSign, MSGBOX_SIGN
 	end

data/maps/OneIsland/text.inc

@@ -1,4 +1,4 @@
-OneIsland_Text_BillLetsGoSeeCelio:: @ 818161B
+OneIsland_Text_BillLetsGoSeeCelio::
     .string "BILL: Here we are!\n"
     .string "This is ONE ISLAND.\p"
     .string "There are several islands around\n"
@@ -10,11 +10,11 @@ OneIsland_Text_BillLetsGoSeeCelio:: @ 818161B
     .string "…Why am I telling you this now?\n"
     .string "Let's just go see CELIO!$"
 
-Text_WhereDoYouWantToSail:: @ 8181726
+Text_WhereDoYouWantToSail::
     .string "Ahoy, there!\n"
     .string "Where do you want to sail?$"
 
-OneIsland_Text_LuckyToHaveCelioHere:: @ 818174E
+OneIsland_Text_LuckyToHaveCelioHere::
     .string "Here we are on an island smack in\n"
     .string "the middle of nowhere.\p"
     .string "We're lucky to have an upstanding\n"
@@ -26,7 +26,7 @@ OneIsland_Text_LuckyToHaveCelioHere:: @ 818174E
     .string "I'm not sure what that means, but\n"
     .string "CELIO is quite the man!$"
 
-OneIsland_Text_HavePCLinkageWithKanto:: @ 8181858
+OneIsland_Text_HavePCLinkageWithKanto::
     .string "My granddaughter was in a tizzy\n"
     .string "over a new breakthrough.\p"
     .string "She said we now have PC linkage\n"
@@ -34,7 +34,7 @@ OneIsland_Text_HavePCLinkageWithKanto:: @ 8181858
     .string "I'm not sure what that means, but\n"
     .string "CELIO is quite the man!$"
 
-OneIsland_Text_HavePCLinkageWithHoenn:: @ 8181901
+OneIsland_Text_HavePCLinkageWithHoenn::
     .string "My granddaughter was in a tizzy\n"
     .string "over a new breakthrough.\p"
     .string "She said we finally have PC linkage\n"
@@ -44,19 +44,19 @@ OneIsland_Text_HavePCLinkageWithHoenn:: @ 8181901
     .string "He would make a fine husband for\n"
     .string "my granddaughter!$"
 
-OneIsland_Text_IslandSign:: @ 81819E1
+OneIsland_Text_IslandSign::
     .string "ONE ISLAND\n"
     .string "Friends Gather at Knot Island$"
 
-OneIsland_Text_PokemonNetCenterSign:: @ 8181A0A
+OneIsland_Text_PokemonNetCenterSign::
     .string "Expanding the POKéMON World!\n"
     .string "POKéMON NET CENTER$"
 
 @ Unused
-OneIsland_Text_ReturnToCinnabar:: @ 8181A3A
+OneIsland_Text_ReturnToCinnabar::
     .string "グレンタウンに　もどりますか？$"
 
-OneIsland_Text_IsntWarmClimateHereGreat:: @ 8181A4A
+OneIsland_Text_IsntWarmClimateHereGreat::
     .string "Hi, sight-seeing, are you?\n"
     .string "Isn't the warm climate here great?$"