summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-04 13:10:39 -0500
committerhuderlem <huderlem@gmail.com>2019-12-05 21:20:55 -0600
commit7beddd16dd81d79ee886183053037e68910e01d5 (patch)
treecb57171e71084e0b113f785d6b92b3db919ac233
parent49c6ae1ac66dd93a295dff543c8e774d9ae3d510 (diff)
Document missed scripts/text
-rw-r--r--data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc20
-rw-r--r--data/maps/MauvilleCity_Gym/scripts.inc4
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/scripts.inc8
-rw-r--r--data/maps/MossdeepCity_StevensHouse/scripts.inc3
-rw-r--r--data/maps/PetalburgCity_WallysHouse/scripts.inc8
-rw-r--r--data/maps/RecordCorner/map.json2
-rw-r--r--data/maps/SeafloorCavern_Entrance/map.json2
-rw-r--r--data/maps/SeafloorCavern_Entrance/scripts.inc36
-rw-r--r--data/scripts/cable_club.inc27
-rw-r--r--data/scripts/day_care.inc4
-rw-r--r--data/scripts/mauville_man.inc3
-rw-r--r--data/text/cable_club.inc8
12 files changed, 65 insertions, 60 deletions
diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
index b343b0c97..a822c463b 100644
--- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
@@ -453,25 +453,25 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
end
BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
- msgbox BattleFrontier_ExchangeServiceCorner_Text_260099, MSGBOX_NPC
+ msgbox BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
- msgbox BattleFrontier_ExchangeServiceCorner_Text_26002E, MSGBOX_NPC
+ msgbox BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
lock
- msgbox BattleFrontier_ExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
+ msgbox BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant, MSGBOX_DEFAULT
release
end
BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
- msgbox BattleFrontier_ExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
+ msgbox BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
- msgbox BattleFrontier_ExchangeServiceCorner_Text_26012D, MSGBOX_NPC
+ msgbox BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
@@ -629,7 +629,7 @@ BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
.string "Please visit us when you have\n"
.string "saved up Battle Points.$"
-BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
+BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
.string "Oh, they're so nice!\n"
.string "I wish I had them!\l"
.string "Cute cushions!\l"
@@ -637,18 +637,18 @@ BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
.string "Little plush DOLLS!\l"
.string "I wish I had them all!$"
-BattleFrontier_ExchangeServiceCorner_Text_25FFD0: @ 825FFD0
+BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant: @ 825FFD0
.string "Leave it to your mommy!\p"
.string "If it's anything you want, I'll go\n"
.string "through anything to get it, honey!$"
-BattleFrontier_ExchangeServiceCorner_Text_26002E: @ 826002E
+BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher: @ 826002E
.string "If I can get hold of the items here,\n"
.string "my POKéMON will get tougher.\p"
.string "You bet they will!\n"
.string "No question about it!$"
-BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
+BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
.string "Hah?\n"
.string "What are you gawking at?\p"
.string "I don't like you staring at my plush\n"
@@ -656,7 +656,7 @@ BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
.string "If you want it, go get one yourself!\n"
.string "Isn't that right, SMOOCHUM?$"
-BattleFrontier_ExchangeServiceCorner_Text_26012D: @ 826012D
+BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord: @ 826012D
.string "Did you know?\p"
.string "If you stretch your record at any of\n"
.string "the BATTLE facilities, they start\l"
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index a4489018f..450f41220 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4
MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE
trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons
- msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE
+ msgbox MauvilleCity_Gym_Text_WattsonPostRematch, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
@@ -410,7 +410,7 @@ MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42
.string "Oof…\n"
.string "Our batteries ran dry…$"
-MauvilleCity_Gym_Text_20EA5E: @ 820EA5E
+MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
.string "WATTSON: We'll have to recharge our\n"
.string "batteries again.\p"
.string "When we're fully charged up, we'll\n"
diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index 79f1a54e2..95b08256e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
@@ -1,14 +1,14 @@
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
- map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_OnFrame
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0
-MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
+MossdeepCity_GameCorner_1F_OnWarp: @ 8224B37
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
.2byte 0
-MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
+MossdeepCity_GameCorner_1F_OnFrame: @ 8224B41
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
.2byte 0
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index c14314b16..cd552bc1d 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -189,7 +189,8 @@ MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E
MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED
.string "{PLAYER} obtained a BELDUM.$"
-MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
+@ Unused
+MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon: @ 8222C03
.string "There is no space for another POKéMON.$"
MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A
diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index 1516e33d2..786fb26e7 100644
--- a/data/maps/PetalburgCity_WallysHouse/scripts.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
@@ -1,9 +1,9 @@
PetalburgCity_WallysHouse_MapScripts:: @ 8204229
- map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_OnFrame
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_OnWarp
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_OnWarp
.byte 0
-PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234
+PetalburgCity_WallysHouse_OnWarp: @ 8204234
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
.2byte 0
@@ -12,7 +12,7 @@ PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
turnobject 1, DIR_WEST
end
-PetalburgCity_WallysHouse_MapScript2_OnFrame: @ 8204247
+PetalburgCity_WallysHouse_OnFrame: @ 8204247
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf
.2byte 0
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
index d34ad4903..e2d5f3a52 100644
--- a/data/maps/RecordCorner/map.json
+++ b/data/maps/RecordCorner/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RecordCorner_EventScript_2774C6",
+ "script": "RecordCorner_EventScript_Attendant",
"flag": "0"
}
],
diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json
index 12000c699..c7336476c 100644
--- a/data/maps/SeafloorCavern_Entrance/map.json
+++ b/data/maps/SeafloorCavern_Entrance/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SeafloorCavern_Entrance_EventScript_234485",
+ "script": "SeafloorCavern_Entrance_EventScript_Grunt",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT"
}
],
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index e10b52d00..b9ff722e6 100644
--- a/data/maps/SeafloorCavern_Entrance/scripts.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -1,16 +1,16 @@
SeafloorCavern_Entrance_MapScripts:: @ 823446E
- map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474
+ map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_OnResume
.byte 0
-SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
+SeafloorCavern_Entrance_OnResume: @ 8234474
setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
end
-SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
+SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485
lockall
compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
- goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED
+ goto_if_eq SeafloorCavern_Entrance_EventScript_GruntSpeechShort
waitse
playse SE_PIN
applymovement 1, Common_Movement_ExclamationMark
@@ -19,51 +19,51 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
waitmovement 0
delay 20
compare VAR_FACING, DIR_WEST
- call_if_eq SeafloorCavern_Entrance_EventScript_23452E
+ call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
compare VAR_FACING, DIR_EAST
- call_if_eq SeafloorCavern_Entrance_EventScript_234523
+ call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
compare VAR_FACING, DIR_NORTH
- call_if_eq SeafloorCavern_Entrance_EventScript_234539
+ call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
copyobjectxytoperm 1
- msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
+ msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
-SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
+SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: @ 82344ED
compare VAR_FACING, DIR_WEST
- call_if_eq SeafloorCavern_Entrance_EventScript_23452E
+ call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
compare VAR_FACING, DIR_EAST
- call_if_eq SeafloorCavern_Entrance_EventScript_234523
+ call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
compare VAR_FACING, DIR_NORTH
- call_if_eq SeafloorCavern_Entrance_EventScript_234539
- msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
+ call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
+ msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
-SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
+SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: @ 8234523
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
+SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: @ 823452E
applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
-SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
+SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: @ 8234539
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
-SeafloorCavern_Entrance_Text_234544: @ 8234544
+SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: @ 8234544
.string "Hey!\n"
.string "I remember your face!\p"
.string "If you're here, it must mean that\n"
@@ -79,7 +79,7 @@ SeafloorCavern_Entrance_Text_234544: @ 8234544
.string "That bunch of goons, they sure don't\n"
.string "look good near the sea!$"
-SeafloorCavern_Entrance_Text_2346C8: @ 82346C8
+SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort: @ 82346C8
.string "A punk like you, do you really think\n"
.string "you can take on TEAM AQUA?\p"
.string "I'd say you're too early by about\n"
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 1b2e3f60f..f37596961 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -49,7 +49,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
end
@ Unused?
-OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
+CableClub_EventScript_MysteryGiftThankYou2:: @ 8276B62
msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT
release
end
@@ -301,7 +301,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7
end
CableClub_EventScript_SelectBattleMode:: @ 8276EC2
- message CableClub_Text_WhichBattleMode
+ message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
@@ -795,39 +795,40 @@ EventScript_TradeCenter_Chair3:: @ 8277413
waitstate
end
+@ VAR_TEMP_1 for below scripts set by ReceiveGiftItem
EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
-RecordCorner_EventScript_277471:: @ 8277471
+RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
bufferitemname 1, VAR_TEMP_1
message RecordCorner_Text_PlayerSentOverOneX
waitmessage
@@ -868,7 +869,7 @@ TradeCenter_EventScript_Attendant:: @ 82774B6
closemessage
end
-RecordCorner_EventScript_2774C6:: @ 82774C6
+RecordCorner_EventScript_Attendant:: @ 82774C6
compare VAR_TEMP_0, 0
goto_if_ne RecordCorner_EventScript_AlreadyMixed
special Script_FacePlayer
@@ -1090,7 +1091,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
end
CableClub_EventScript_WirelessBattleSelect:: @ 827783B
- message CableClub_Text_WhichBattleMode
+ message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 61763ba17..968464f9d 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -262,7 +262,7 @@ Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
step_end
@ Unused. Possibly a commented script, or a typo end added to the above Movement script
-Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
+Route117_PokemonDayCare_EventScript_UnusedEnd:: @ 8291F5B
end
Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
@@ -279,7 +279,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
end
@ Unused
-Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
+Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 34622775a..a6585ca4d 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -289,7 +289,8 @@ MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE
.string "Then tell me, have you any tales that\n"
.string "are even remotely legendary?$"
-MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844
+@ Unused
+MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale: @ 828E844
.string "Incidentally… Would you care to hear\n"
.string "another legendary tale?$"
diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc
index 7e98d9fc7..c1922d147 100644
--- a/data/text/cable_club.inc
+++ b/data/text/cable_club.inc
@@ -201,14 +201,16 @@ CableClub_Text_CanMixRecords:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
-OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
+@ Unused
+CableClub_Text_GuideToVariousServices: @ 827886B
.string "A guide to the WIRELESS CLUB's\n"
.string "various services.$"
CableClub_Text_CancelSelectedItem:: @ 827889C
.string "Cancels the selected MENU item.$"
-OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
+@ Unused
+CableClub_Text_WhichBattleMode: @ 82788BC
.string "Which battle mode would you like?$"
@ Unused
@@ -340,7 +342,7 @@ CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013
CableClub_Text_TradePokemon: @ 827909D
.string "Would you like to trade POKéMON?$"
-CableClub_Text_WhichBattleMode: @ 82790BE
+CableClub_Text_PlayWhichBattleMode: @ 82790BE
.string "Which Battle Mode would you like\n"
.string "to play?$"