Merge branch 'master' into shop

6 files changed, 11 insertions, 27 deletions

diff --git a/data/cable_club.s b/data/cable_club.s
deleted file mode 100644
index f62b0b90a..000000000
--- a/data/cable_club.s
+++ /dev/null
@@ -1,16 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-	.align 2
-gUnknown_08550594:: @ 8550594
-	window_template 0x00, 0x10, 0x0b, 0x0b, 0x02, 0x0f, 0x0125
-
-	.align 2
-gUnknown_0855059C:: @ 855059C
-	.4byte gText_BronzeCard
-	.4byte gText_CopperCard
-	.4byte gText_SilverCard
-	.4byte gText_GoldCard
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 2b07b7ea4..e0f2c3c5e 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -929,7 +929,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
 
 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
 	setvar VAR_0x8004, 9
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	setvar VAR_0x8005, 0
 	special sub_80B2DA4
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 0052f09aa..36bfc422a 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -260,7 +260,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
 
 MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
-	special sub_80F94E8
+	special ReducePlayerPartyToThree
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 4
 	special sub_81A1780
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 652ac791a..36d0edd3a 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -106,7 +106,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	compare VAR_RESULT, 0
 	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
 	special SavePlayerParty
-	special sub_80F94E8
+	special ReducePlayerPartyToThree
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
 	closemessage
 	compare VAR_FACING, 2
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 96e36dcf9..08f5accca 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -430,7 +430,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	special sub_80B2DA4
 	waitstate
@@ -532,7 +532,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	special sub_80B2E4C
 	waitstate
@@ -607,7 +607,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	special sub_80B2E74
 	waitstate
@@ -1675,21 +1675,21 @@ OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061
 	.string "A POKéMON holding the {STR_VAR_1}\n"
 	.string "BERRY can’t be traded.$"
 
-OldaleTown_PokemonCenter_2F_Text_278091:: @ 8278091
+gText_PleaseWaitForLink:: @ 8278091
 	.string "Please wait.\n"
 	.string "… … B Button: Cancel$"
 
-OldaleTown_PokemonCenter_2F_Text_2780B3:: @ 82780B3
+gText_ConfirmLinkWhenPlayersReady:: @ 82780B3
 	.string "When all players are ready…\n"
 	.string "A Button: Confirm\l"
 	.string "B Button: Cancel$"
 
-OldaleTown_PokemonCenter_2F_Text_2780F2:: @ 82780F2
+gText_ConfirmStartLinkWithXPlayers:: @ 82780F2
 	.string "Start link with {STR_VAR_1} players.\n"
 	.string "A Button: Confirm\l"
 	.string "B Button: Cancel$"
 
-OldaleTown_PokemonCenter_2F_Text_278131:: @ 8278131
+gText_AwaitingLinkup:: @ 8278131
 	.string "Awaiting linkup…\n"
 	.string "… … B Button: Cancel$"
 
diff --git a/data/specials.inc b/data/specials.inc
index 5d31c425f..07da8edab 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -259,7 +259,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F9490
 	def_special ValidateEReaderTrainer
 	def_special GetBestBattleTowerStreak
-	def_special sub_80F94E8
+	def_special ReducePlayerPartyToThree
 	def_special BedroomPC
 	def_special PlayerPC
 	def_special FieldShowRegionMap