Merge branch 'master' into doc-dome

.travis.yml

@@ -1,5 +1,5 @@
 language: generic
-dist: trusty
+dist: bionic
 sudo: false
 env:
   global:

asm/macros/battle_frontier/battle_tower.inc

@@ -53,7 +53,36 @@
 	special CallBattleTowerFunc
 	.endm
 
-	@ TODO: Document and add macros for BATTLE_TOWER_FUNC_10 - BATTLE_TOWER_FUNC_14 
+	@ Load the parties, gfx, and other data (like Apprentice id) for the multi partner candidates
+	.macro tower_loadpartners
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_LOAD_PARTNERS
+	special CallBattleTowerFunc
+	.endm
+
+	@ Print message from potential multi partner. msgId is any PARTNER_MSGID_*
+	.macro tower_dopartnermsg msgId:req
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_PARTNER_MSG
+	setvar VAR_0x8005, \msgId
+	special CallBattleTowerFunc
+	.endm
+
+	@ Receives/loads the opponent data for a link multi challenge. Returns 6 when finished, and finishes immediately if not doing a link multi battle.
+	.macro tower_loadlinkopponents
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS
+	special CallBattleTowerFunc
+	.endm
+
+	@ Unknown. Destroys some link task if using wireless link. Wait for link?
+	.macro tower_unklink
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_13
+	special CallBattleTowerFunc
+	.endm
+
+	@ Set VAR_OBJ_GFX_ID_E to the gfx id of the selected multi partner
+	.macro tower_setpartnergfx
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_PARTNER_GFX
+	special CallBattleTowerFunc
+	.endm
 
 	@ Set the data used for the post-challenge Battle Tower interview
 	.macro tower_setinterviewdata

asm/macros/event.inc

@@ -233,14 +233,12 @@
 	.endm
 
 	@ Generic compare macro which attempts to deduce argument types based on their values
-	@ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers
+	@ Any values between 0x4000 to 0x40FF and 0x8000 to 0x8015 are considered event variable identifiers
-	.macro compare arg1:req, arg2:req
+	.macro compare var:req, arg:req
-		.if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
+		.if ((\arg >= VARS_START && \arg <= VARS_END) || (\arg >= SPECIAL_VARS_START && \arg <= SPECIAL_VARS_END))
-			compare_var_to_var \arg1, \arg2
+			compare_var_to_var \var, \arg
-		.elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF)
-			compare_var_to_value \arg1, \arg2
 		.else
-			.error "Invalid arguments for 'compare'"
+			compare_var_to_value \var, \arg
 		.endif
 	.endm
 
@@ -465,12 +463,12 @@
 	.2byte \Y
 	.endm
 
-	@ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
+	@ Retrieves the number of Pokemon in the player's party, and stores that number in VAR_RESULT.
 	.macro getpartysize
 	.byte 0x43
 	.endm
 
-	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000.
+	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE.
 	.macro giveitem index:req, quantity:req
 	.byte 0x44
 	.2byte \index
@@ -484,21 +482,21 @@
 	.2byte \quantity
 	.endm
 
-	@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room.
+	@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room.
 	.macro checkitemspace index:req, quantity:req
 	.byte 0x46
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	@ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item.
+	@ Checks if the player has quantity or more of item index in their Bag. Sets VAR_RESULT to TRUE if the player has enough of the item, or FALSE if they have fewer than quantity of the item.
 	.macro checkitem index:req, quantity:req
 	.byte 0x47
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	@ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
+	@ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
 	.macro checkitemtype index:req
 	.byte 0x48
 	.2byte \index
@@ -536,7 +534,7 @@
 	.2byte \decoration
 	.endm
 
-	@ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	@ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
 	.macro checkdecorspace decoration:req
 	.byte 0x4e
 	.2byte \decoration
@@ -818,7 +816,7 @@
 	.byte 0x6d
 	.endm
 
-	@ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES".
+	@ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in VAR_RESULT as NO (0) or YES (1). Pressing B is equivalent to answering NO
 	.macro yesnobox x:req, y:req
 	.byte 0x6e
 	.byte \x
@@ -925,7 +923,7 @@
 	.2byte \move
 	.endm
 
-	@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
+	@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, VAR_RESULT is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, VAR_RESULT is set to PARTY_SIZE. VAR_0x8004 is also set to this Pokemon's species.
 	.macro checkpartymove index:req
 	.byte 0x7c
 	.2byte \index
@@ -1045,7 +1043,7 @@
 	.byte 0x8e
 	.endm
 
-	@ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT).
+	@ Stores a random integer between 0 and limit in VAR_RESULT.
 	.macro random limit:req
 	.byte 0x8f
 	.2byte \limit
@@ -1065,7 +1063,7 @@
 	.byte \check
 	.endm
 
-	@ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not.
+	@ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player has enough money, or FALSE if they do not.
 	.macro checkmoney value:req, check:req
 	.byte 0x92
 	.4byte \value
@@ -1154,7 +1152,7 @@
 	.2byte \heallocation
 	.endm
 
-	@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
+	@ Checks the player's gender. If male, then MALE (0) is stored in VAR_RESULT. If female, then FEMALE (1) is stored in VAR_RESULT.
 	.macro checkplayergender
 	.byte 0xa0
 	.endm
@@ -1437,7 +1435,7 @@
 	.2byte \slot
 	.endm
 
-	@ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokemon is obedient (or if the specified slot is empty or invalid), 0x0000 is written.
+	@ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, VAR_RESULT is TRUE. If the Pokemon is obedient (or if the specified slot is empty or invalid), VAR_RESULT is FALSE.
 	.macro checkmonobedience slot:req
 	.byte 0xce
 	.2byte \slot
@@ -1539,7 +1537,7 @@
 	.4byte \pointer
 	.endm
 
-	.macro warp8 map:req, byte:req, word1:req, word2:req
+	.macro warpsootopolislegend map:req, byte:req, word1:req, word2:req
 	.byte 0xe0
 	map \map
 	.byte \byte

data/event_scripts.s

@@ -473,9 +473,9 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/SafariZone_Northeast/scripts.inc"
 	.include "data/maps/SafariZone_Southeast/scripts.inc"
 	.include "data/maps/BattleFrontier_OutsideEast/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc"
 	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc"
-	.include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc"
-	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc"
 	.include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc"
 	.include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc"
 	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc"

data/layouts/layouts.json

@@ -3892,24 +3892,24 @@
       "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin"
     },
     {
-      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
-      "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout",
+      "name": "BattleFrontier_BattleTowerMultiPartnerRoom_Layout",
       "width": 21,
       "height": 15,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattleFrontier",
-      "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin",
-      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin"
     },
     {
-      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
-      "name": "BattleFrontier_BattleTowerCorridor2_Layout",
+      "name": "BattleFrontier_BattleTowerMultiCorridor_Layout",
       "width": 17,
       "height": 5,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattleFrontier",
-      "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin",
+      "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin",
-      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER",

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

@@ -48,7 +48,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
 	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft
 	setvar VAR_TEMP_2, 1
-	frontier_set FRONTIER_DATA_6, 1
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
@@ -143,8 +143,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
 	call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent
 	compare VAR_RESULT, 6
 	call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
@@ -252,8 +252,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: @ 82578BC
 BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
 	message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon
 	waitmessage
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
@@ -380,7 +380,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle:: @ 8257B5E
 BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C
 	closemessage
 	setvar VAR_TEMP_2, 0
-	frontier_set FRONTIER_DATA_6, 0
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
 	setvar VAR_0x8005, 0

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -77,8 +77,8 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
 	arena_save 0
 	playse SE_SAVE
 	waitse
-	call BattleFrontier_BattleArenaLobby_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
 	message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch
 	waitmessage

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -459,7 +459,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw:: @ 824C436
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_Draw
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 824C440
-	frontier_set FRONTIER_DATA_6, 0
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_DOME
 	setvar VAR_0x8005, 0

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -84,7 +84,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
 	dome_save 0
 	playse SE_SAVE
 	waitse
-	call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
 	message BattleFrontier_BattleDomeLobby_Text_RecordLastMatch

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
 BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
-	frontier_set FRONTIER_DATA_6, 1
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	setvar VAR_TEMP_0, 1
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
 	waitmovement 0
@@ -28,7 +28,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage
 	waitmessage
 	switch VAR_RESULT  @ No case?
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord
 	multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
-	frontier_set FRONTIER_DATA_6, 0
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
 	setvar VAR_0x8005, 0
@@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
 	closemessage
-	frontier_set FRONTIER_DATA_6, 0
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
 	setvar VAR_0x8005, 0

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -75,8 +75,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
 	waitse
 
 BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
-	call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
 	message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch
 	waitmessage

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -100,8 +100,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent
 	compare VAR_RESULT, 6
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
@@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69
 	special SavePlayerParty
 	factory_setparties 0
-	frontier_set FRONTIER_DATA_6, 1
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	special CalculatePlayerPartyCount
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
@@ -391,8 +391,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible:: @ 825A0B0
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead
 	waitmessage
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -45,7 +45,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
 	waitmovement 0
 	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
 	setvar VAR_TEMP_2, 1
-	frontier_set FRONTIER_DATA_6, 1
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5
@@ -104,8 +104,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98
 	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent
 	compare VAR_RESULT, 6
 	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
@@ -180,8 +180,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: @ 824FB61
 BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
 	message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven
 	waitmessage
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
@@ -290,7 +290,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8
 BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
 	closemessage
 	setvar VAR_TEMP_2, 0
-	frontier_set FRONTIER_DATA_6, 0
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
 	setvar VAR_0x8005, 0

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -77,8 +77,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
 	palace_save 0
 	playse SE_SAVE
 	waitse
-	call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
 	message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch
 	waitmessage

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -1,147 +1,145 @@
 BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B
+BattleFrontier_BattleTowerBattleRoom_OnWarp: @ 8241B4B
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55
+BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects:: @ 8241B55
 	setvar VAR_TEMP_1, 1
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible
 	end
 
-BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62
+BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
+BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
 	setvar VAR_TEMP_0, 1
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
 	waitmovement 0
 	setvar VAR_TEMP_2, 1
-	frontier_set FRONTIER_DATA_6, 1
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
+BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3
 	tower_setopponent
 	addobject 1
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter
 	waitmovement 0
 	tower_getopponentintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	switch VAR_RESULT
-	case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F
+	case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
+BattleFrontier_BattleTower_EventScript_WarpToLobbyLost:: @ 8241C03
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, 3
 	special Script_TryGainNewFanFromCounter
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
 	call BattleFrontier_EventScript_IncrementWinStreak
 	tower_setbattlewon
 	switch VAR_RESULT
-	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit
 	waitmovement 0
 	removeobject 1
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
+	call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
 	waitmovement 0
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
-BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
+	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext
 	frontier_get FRONTIER_DATA_BATTLE_NUM
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8241D0A
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
-	message BattleFrontier_BattleTowerBattleRoom_Text_2423A3
+	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72
+BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle:: @ 8241D72
 	call BattleFrontier_EventScript_SaveBattle
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge:: @ 8241D7C
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
-	case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22
+	case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
-	message BattleFrontier_BattleTowerBattleRoom_Text_24244C
+	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
+BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
 	waitmovement 0
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon:: @ 8241DF6
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, 3
 	special Script_TryGainNewFanFromCounter
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
+BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
-	message BattleFrontier_BattleTowerBattleRoom_Text_242426
+	message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	tower_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
@@ -150,43 +148,43 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
 	frontier_reset
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44
 	copyvar VAR_TEMP_F, VAR_RESULT
 	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent
-	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5
+	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent
-	case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC
+	case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent
-	case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3
+	case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8241E90
-	message BattleFrontier_BattleTowerBattleRoom_Text_242277
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8241E97
-	message BattleFrontier_BattleTowerBattleRoom_Text_2422A9
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8241E9E
-	message BattleFrontier_BattleTowerBattleRoom_Text_2422DB
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8241EA5
-	message BattleFrontier_BattleTowerBattleRoom_Text_24230D
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8241EAC
-	message BattleFrontier_BattleTowerBattleRoom_Text_24233F
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8241EB3
-	message BattleFrontier_BattleTowerBattleRoom_Text_242371
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
@@ -194,8 +192,8 @@ BattleFrontier_EventScript_IncrementWinStreak:: @ 8241EBA
 	frontier_incrementstreak
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
+BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC3
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter
 	waitmovement 0
 	applymovement 3, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
@@ -204,113 +202,111 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant
 	waitmovement 0
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit
 	waitmovement 0
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A
+BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: @ 8241F0A
 	compare VAR_TEMP_2, 1
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
-BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden
-	message BattleFrontier_BattleTowerBattleRoom_Text_242542
 	waitmessage
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
+	call BattleFrontier_EventScript_GetCantRecordBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8241F79
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
 	waitmovement 0
 	addobject 1
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter
 	waitmovement 0
 	switch VAR_TEMP_F
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_242085
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029
+	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver:: @ 8242029
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
+	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 8242046
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleTowerBattleRoom_Text_24270E
+	message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
+BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro:: @ 8242085
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
+	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold:: @ 82420B2
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
+	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleTowerBattleRoom_Text_242932
+	message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E
+BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E
-BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	closemessage
 	setvar VAR_TEMP_2, 0
-	frontier_set FRONTIER_DATA_6, 0
+	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
 	setvar VAR_0x8005, 0
@@ -318,11 +314,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	waitstate
 	copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_0x8004, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle
 	frontier_restorehelditems
 	special HealPlayerParty
 	frontier_resetsketch
-BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
+BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle:: @ 824215A
 	tower_setinterviewdata
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	return
@@ -331,22 +327,22 @@ BattleFrontier_EventScript_SetBrainObjectGfx:: @ 8242170
 	frontier_setbrainobj
 	return
 
-BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter: @ 8242179
 	walk_up
 	walk_up
 	walk_up
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant: @ 824217E
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle: @ 8242180
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
+BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182
 	walk_down
 	walk_down
 	walk_down
@@ -354,21 +350,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188
+BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit: @ 8242188
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer: @ 824218D
 	walk_right
 	walk_right
 	walk_right
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192
 	walk_down
 	walk_left
 	walk_left
@@ -376,11 +372,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198
+BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible: @ 8242198
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A
 	set_visible
 	delay_16
 	walk_up
@@ -389,21 +385,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
 	delay_8
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit: @ 82421A1
 	walk_right
 	walk_right
 	walk_down
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay: @ 82421A6
 	delay_16
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82421AB
 	face_right
 	delay_16
 	delay_16
@@ -412,7 +408,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
 	walk_in_place_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
+BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
@@ -420,113 +416,107 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles
 	compare VAR_RESULT, FRONTIER_MODE_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis
 	compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles:: @ 82421E8
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_13
+	tower_unklink
-	special CallBattleTowerFunc
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E
+BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge:: @ 824220E
 	setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
+	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217
+BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth: @ 8242217
-BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217
 	.string "We will restore your POKéMON to\n"
 	.string "full health.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244
+@ Unused
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent: @ 8242244
 	.string "You will be facing opponent no. {STR_VAR_1}.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent: @ 8242277
 	.string "You will be facing opponent no. 2.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent: @ 82422A9
 	.string "You will be facing opponent no. 3.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent: @ 82422DB
 	.string "You will be facing opponent no. 4.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent: @ 824230D
 	.string "You will be facing opponent no. 5.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent: @ 824233F
 	.string "You will be facing opponent no. 6.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent: @ 8242371
 	.string "You will be facing opponent no. 7.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3
+BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle: @ 82423A3
-BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3
 	.string "Record your battle on your\n"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD
+BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass: @ 82423CD
 	.string "{PLAYER}'s battle was recorded\n"
 	.string "on the FRONTIER PASS.$"
 
-BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC
+BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame: @ 82423FC
-BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC
 	.string "Would you like to save and\n"
 	.string "quit the game?$"
 
-BattleFrontier_BattleTowerBattleRoom2_Text_242426: @ 8242426
+BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait: @ 8242426
-BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426
 	.string "Saving your battle data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C
+BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge: @ 824244C
-BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C
 	.string "Would you like to cancel your BATTLE\n"
 	.string "ROOM challenge?$"
 
-gText_BattleRecordCouldntBeSaved:: @ 8242481
+BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved:: @ 8242481
 	.string "There was an error of some sort.\n"
 	.string "Your record could not be saved.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2
+BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay: @ 82424C2
 	.string "Excuse me, but…\p"
 	.string "Our leader, the SALON MAIDEN, is on\n"
 	.string "her way here in hopes of battling you.\p"
 	.string "She should be arriving very shortly.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden: @ 8242542
 	.string "You will be facing the SALON MAIDEN.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579
+BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579
 	.string "Greetings…\n"
 	.string "My name is ANABEL.\p"
 	.string "I am the SALON MAIDEN, and I am in\n"
@@ -538,20 +528,20 @@ BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579
 	.string "The reason I've come to see you…\n"
 	.string "Well, there is but one reason…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C
+BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent: @ 824268C
 	.string "Let me see your talent in\n"
 	.string "its entirety…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized: @ 82426B4
 	.string "ANABEL: Fufufu, nicely done…\p"
 	.string "Your FRONTIER PASS, please…\n"
 	.string "Your talent shall be recognized.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E
+BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol: @ 824270E
 	.string "The Ability Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744
+BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744
 	.string "… … … … … …\p"
 	.string "You have confidence in your POKéMON\n"
 	.string "battling talent, don't you?\p"
@@ -560,7 +550,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744
 	.string "I will be waiting for you.\n"
 	.string "Until the next time we meet…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9
 	.string "ANABEL: You really did come back to\n"
 	.string "see me…\p"
 	.string "… … … … … …\p"
@@ -570,18 +560,18 @@ BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9
 	.string "Too long since I've been able to battle\n"
 	.string "without thinking about anything…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0
+BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe: @ 82428E0
 	.string "Let's begin, shall we?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease: @ 82428F7
 	.string "ANABEL: Fufu, congratulations…\n"
 	.string "Your FRONTIER PASS, please…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932
+BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine: @ 8242932
 	.string "The Ability Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D
+BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain: @ 824295D
 	.string "That was fun…\p"
 	.string "I have never had a POKéMON battle\n"
 	.string "so enjoyable before…\p"

data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json

@@ -1,99 +0,0 @@
-{
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2",
-  "name": "BattleFrontier_BattleTowerBattleRoom2",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
-  "music": "MUS_SATTOWER",
-  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
-      "x": 5,
-      "y": 1,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "0x0",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_TEALA",
-      "x": 1,
-      "y": 4,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "0x0",
-      "flag": "0"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_TEALA",
-      "x": 1,
-      "y": 5,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "0x0",
-      "flag": "0"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
-      "x": 4,
-      "y": 1,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "0x0",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
-      "x": 4,
-      "y": 8,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "0x0",
-      "flag": "0"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_E",
-      "x": 5,
-      "y": 8,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "0x0",
-      "flag": "0"
-    }
-  ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
-}

data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc

@@ -1,55 +1,52 @@
 BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
-	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
+	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
+BattleFrontier_BattleTowerCorridor_OnLoad: @ 8241AB5
 	compare VAR_0x8006, 1
-	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
+	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
 	setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
 	setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
-BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3
+BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: @ 8241AD3
 	setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
 	setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
-BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6
+BattleFrontier_BattleTowerCorridor_OnFrame: @ 8241AE6
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0
+BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
 	setvar VAR_TEMP_0, 1
 	compare VAR_0x8006, 1
-	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16
+	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
-	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A
+	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
 	waitmovement 0
-	goto BattleFrontier_BattleTowerCorridor_EventScript_241B27
+	goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
 
-BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16
+BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
-	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37
+	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
 	waitmovement 0
 
-BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27
+BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27
 	setvar VAR_TEMP_0, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
 	waitstate
 	end
 
-BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36
+BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor: @ 8241B36
 	walk_right
-
+BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor: @ 8241B37
-BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
 	walk_right
 	walk_right
-
+BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor: @ 8241B39
-BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
 	walk_right
-
+BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor: @ 8241B3A
-BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
 	walk_right
 	walk_right
 	walk_right

data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc

@@ -1,172 +0,0 @@
-BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
-	.byte 0
-
-BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
-	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91
-	end
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
-	special CallBattleTowerFunc
-	checkplayergender
-	compare VAR_RESULT, FEMALE
-	goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
-	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
-	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
-	special SetBattleTowerLinkPlayerGfx
-	return
-
-BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F
-	.2byte 0
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
-	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
-	hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
-	special OffsetCameraForBattle
-	end
-
-BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC
-	.2byte 0
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
-	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4002
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 1
-	opendoor 1, 1
-	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4002
-	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
-	showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
-	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
-	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
-	waitmovement 0
-	setflag FLAG_SPECIAL_FLAG_0x4002
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 1
-	closedoor 1, 1
-	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4002
-	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC
-	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
-	waitmovement 0
-	delay 40
-	applymovement 3, Common_Movement_WalkInPlaceFastestUp
-	applymovement 2, Common_Movement_WalkInPlaceFastestUp
-	waitmovement 0
-	opendoor 7, 1
-	waitdooranim
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
-	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
-	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
-	waitmovement 0
-	closedoor 7, 1
-	waitdooranim
-	delay 30
-	setvar VAR_TEMP_1, 1
-	call BattleFrontier_BattleTowerCorridor2_EventScript_248E71
-	releaseall
-	end
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
-	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
-	waitstate
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5
-	waitstate
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5
-	waitstate
-	return
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE
-	delay_16
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6
-	walk_down
-	step_end
-

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -1,89 +1,89 @@
 BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6
+BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator
 	.2byte 0
 
-BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
+BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
 	setvar VAR_TEMP_0, 1
-	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
+	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
 	waitmovement 0
 	special BufferBattleTowerElevatorFloors
 	waitse
 	special MoveElevator
 	waitstate
 	delay 48
-	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
+	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit
 	waitmovement 0
-	call BattleFrontier_BattleTowerElevator_EventScript_241A28
+	call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
 	end
 
-BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
+BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
+	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
+	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
-	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F
+	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72
+	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
+BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: @ 8241A55
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
+BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: @ 8241A5F
-	goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C
+	goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72
+BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: @ 8241A72
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C
+BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: @ 8241A7C
-	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86
+BattleFrontier_BattleTowerElevator_Movement_AttendantEnter: @ 8241A86
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A
+BattleFrontier_BattleTowerElevator_Movement_PlayerEnter: @ 8241A8A
 	walk_up
 	walk_up
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E
+BattleFrontier_BattleTowerElevator_Movement_AttendantExit: @ 8241A8E
 	walk_down
 	walk_down
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92
+BattleFrontier_BattleTowerElevator_Movement_PlayerExit: @ 8241A92
 	walk_right
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
+BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
+BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end

data/maps/BattleFrontier_BattleTowerLobby/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant",
       "flag": "0"
     }
   ],
@@ -163,7 +163,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7"
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults"
     },
     {
       "type": "sign",
@@ -171,7 +171,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0"
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults"
     },
     {
       "type": "sign",
@@ -179,7 +179,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9"
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults"
     },
     {
       "type": "sign",
@@ -187,7 +187,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23F012"
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults"
     },
     {
       "type": "sign",
@@ -195,7 +195,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE"
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_RulesBoard"
     }
   ]
 }

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
   "name": "BattleFrontier_BattleTowerMultiBattleRoom",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
   "music": "MUS_SATTOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
@@ -9,127 +9,88 @@
   "map_type": "MAP_TYPE_INDOOR",
   "allow_bike": false,
   "allow_escape_rope": false,
-  "allow_running": true,
+  "allow_running": false,
   "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
-      "x": 11,
+      "x": 5,
-      "y": 2,
+      "y": 1,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
+      "movement_range_x": 0,
-      "movement_range_y": 1,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A",
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 1,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
-      "x": 2,
+      "x": 1,
-      "y": 10,
+      "y": 5,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-      "movement_range_x": 1,
+      "movement_range_x": 0,
-      "movement_range_y": 1,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29",
+      "script": "0x0",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
+      "flag": "0"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_VAR_1",
-      "x": 17,
+      "x": 4,
-      "y": 11,
+      "y": 1,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
+      "movement_range_x": 0,
-      "movement_range_y": 1,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB",
+      "script": "0x0",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "graphics_id": "EVENT_OBJ_GFX_VAR_F",
-      "x": 6,
+      "x": 4,
-      "y": 9,
+      "y": 8,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
-      "x": 8,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
-      "x": 10,
-      "y": 11,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
+      "movement_range_x": 0,
-      "movement_range_y": 1,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022",
+      "script": "0x0",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
+      "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "graphics_id": "EVENT_OBJ_GFX_VAR_E",
-      "x": 13,
+      "x": 5,
-      "y": 10,
+      "y": 8,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
+      "movement_range_x": 0,
-      "movement_range_y": 1,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F",
+      "script": "0x0",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
+      "flag": "0"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
-    },
-    {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
-      "x": 4,
-      "y": 12,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2"
     }
   ],
   "warp_events": [],

data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
-  "name": "BattleFrontier_BattleTowerCorridor2",
+  "name": "BattleFrontier_BattleTowerMultiCorridor",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
   "music": "MUS_SATTOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,

data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc

@@ -0,0 +1,176 @@
+BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiCorridor_OnTransition
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnFrame
+	.byte 0
+
+	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
+	@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_F
+	@ The multi partner is represented by object event 4, which has the gfx id VAR_OBJ_GFX_ID_E
+
+BattleFrontier_BattleTowerMultiCorridor_OnTransition: @ 8248D5A
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
+	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
+	end
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
+	tower_setpartnergfx
+	checkplayergender
+	compare VAR_RESULT, FEMALE
+	goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
+	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
+	return
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B
+	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
+	return
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91
+	special SetBattleTowerLinkPlayerGfx
+	return
+
+BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects
+	.2byte 0
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F
+	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
+	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
+	hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
+	special OffsetCameraForBattle
+	end
+
+BattleFrontier_BattleTowerMultiCorridor_OnFrame: @ 8248DB2
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor
+	.2byte 0
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC
+	lockall
+	setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
+	setvar VAR_0x8004, 14  @ x coord of far door, used by DrawDoor
+	setvar VAR_0x8005, 1   @ y coord of far door, used by DrawDoor
+	opendoor 1, 1
+	waitdooranim
+	clearflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
+	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
+	showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
+	applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator
+	applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator
+	waitmovement 0
+	setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
+	setvar VAR_0x8004, 14  @ x coord of far door, used by DrawDoor
+	setvar VAR_0x8005, 1   @ y coord of far door, used by DrawDoor
+	closedoor 1, 1
+	waitdooranim
+	clearflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
+	applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor
+	applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor
+	applymovement 3, BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor
+	applymovement 2, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor
+	waitmovement 0
+	delay 40
+	applymovement 3, Common_Movement_WalkInPlaceFastestUp
+	applymovement 2, Common_Movement_WalkInPlaceFastestUp
+	waitmovement 0
+	opendoor 7, 1
+	waitdooranim
+	applymovement 3, BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor
+	applymovement 2, BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor
+	applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor
+	applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor
+	waitmovement 0
+	closedoor 7, 1
+	waitdooranim
+	delay 30
+	setvar VAR_TEMP_1, 1
+	call BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom
+	releaseall
+	end
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
+	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
+	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
+	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
+	return
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom:: @ 8248E9E
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
+	waitstate
+	return
+
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom:: @ 8248EA8
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
+	waitstate
+	return
+
+@ Unnecessary duplicate of the above
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom:: @ 8248EB2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
+	waitstate
+	return
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 8248ECC
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8248ED5
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor: @ 8248EDE
+	delay_16
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor: @ 8248EE3
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator: @ 8248EE6
+	walk_down
+	step_end
+

data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json

@@ -0,0 +1,138 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
+  "name": "BattleFrontier_BattleTowerMultiPartnerRoom",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
+  "music": "MUS_SATTOWER",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "x": 11,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "x": 2,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner1",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "x": 17,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner2",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner3",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "x": 8,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner4",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "x": 10,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner5",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "x": 13,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner6",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner7",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "x": 4,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}

data/maps/LilycoveCity/scripts.inc

@@ -296,32 +296,32 @@ LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
 	end
 
 LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE
-	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TREECKO, LilycoveCity_Text_MayDefeat
 	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
 LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE
-	trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TORCHIC, LilycoveCity_Text_MayDefeat
 	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
 LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE
-	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_LILYCOVE_MUDKIP, LilycoveCity_Text_MayDefeat
 	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
 LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E
-	trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TREECKO, LilycoveCity_Text_BrendanDefeat
 	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
 LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E
-	trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TORCHIC, LilycoveCity_Text_BrendanDefeat
 	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
 LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E
-	trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_MUDKIP, LilycoveCity_Text_BrendanDefeat
 	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 

data/maps/MagmaHideout_4F/scripts.inc

@@ -54,7 +54,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT
 	closemessage
-	trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_MaxieDefeat
+	trainerbattle_no_intro TRAINER_MAXIE_MAGMA_HIDEOUT, MagmaHideout_4F_Text_MaxieDefeat
 	msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
@@ -121,7 +121,7 @@ MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
 	end
 
 MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
-	trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
+	trainerbattle_single TRAINER_TABITHA_MAGMA_HIDEOUT, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
 	msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 

data/maps/MauvilleCity/scripts.inc

@@ -204,7 +204,7 @@ MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
 
 MauvilleCity_EventScript_BattleWally:: @ 81DF63A
 	msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat
+	trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat
 	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -337,11 +337,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157
-	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
+	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_MOSSDEEP, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166
-	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
+	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_MOSSDEEP, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175

data/maps/MtChimney/scripts.inc

@@ -43,7 +43,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat
+	trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat
 	msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -415,7 +415,7 @@ MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065
 	end
 
 MtChimney_EventScript_Tabitha:: @ 822F06E
-	trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
+	trainerbattle_single TRAINER_TABITHA_MT_CHIMNEY, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
 	msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 

data/maps/Route103/scripts.inc

@@ -61,32 +61,32 @@ Route103_EventScript_RivalBrendan:: @ 81EC434
 	end
 
 Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E
-	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TREECKO, Route103_Text_MayDefeated
 	goto Route103_EventScript_AfterMayBattle
 	end
 
 Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E
-	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TORCHIC, Route103_Text_MayDefeated
 	goto Route103_EventScript_AfterMayBattle
 	end
 
 Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE
-	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_103_MUDKIP, Route103_Text_MayDefeated
 	goto Route103_EventScript_AfterMayBattle
 	end
 
 Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE
-	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TREECKO, Route103_Text_BrendanDefeated
 	goto Route103_EventScript_AfterBrendanBattle
 	end
 
 Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE
-	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TORCHIC, Route103_Text_BrendanDefeated
 	goto Route103_EventScript_AfterBrendanBattle
 	end
 
 Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE
-	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_MUDKIP, Route103_Text_BrendanDefeated
 	goto Route103_EventScript_AfterBrendanBattle
 	end
 

data/maps/Route104/scripts.inc

@@ -167,19 +167,19 @@ Route104_EventScript_RestoreMusic:: @ 81ECE31
 	return
 
 Route104_EventScript_BattleMayTreecko:: @ 81ECE36
-	trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_MayDefeated
 	end
 
 Route104_EventScript_BattleMayTorchic:: @ 81ECE49
-	trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_MayDefeated
 	end
 
 Route104_EventScript_BattleMayMudkip:: @ 81ECE5C
-	trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_MayDefeated
 	end
@@ -237,19 +237,19 @@ Route104_EventScript_BrendanDefeated:: @ 81ECF38
 	end
 
 Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D
-	trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_BrendanDefeated
 	end
 
 Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60
-	trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_BrendanDefeated
 	end
 
 Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73
-	trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_BrendanDefeated
 	end

data/maps/Route110/scripts.inc

@@ -421,17 +421,17 @@ Route110_EventScript_MayBattle:: @ 81EF7EB
 	end
 
 Route110_EventScript_MayBattleTreecko:: @ 81EF81A
-	trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TREECKO, Route110_Text_MayDefeated
 	goto Route110_EventScript_MayDefeated
 	end
 
 Route110_EventScript_MayBattleTorchic:: @ 81EF82A
-	trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TORCHIC, Route110_Text_MayDefeated
 	goto Route110_EventScript_MayDefeated
 	end
 
 Route110_EventScript_MayBattleMudkip:: @ 81EF83A
-	trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_110_MUDKIP, Route110_Text_MayDefeated
 	goto Route110_EventScript_MayDefeated
 	end
 
@@ -451,17 +451,17 @@ Route110_EventScript_BrendanBattle:: @ 81EF865
 	end
 
 Route110_EventScript_BrendanBattleTreecko:: @ 81EF894
-	trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TREECKO, Route110_Text_BrendanDefeated
 	goto Route110_EventScript_BrendanDefeated
 	end
 
 Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4
-	trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TORCHIC, Route110_Text_BrendanDefeated
 	goto Route110_EventScript_BrendanDefeated
 	end
 
 Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4
-	trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_MUDKIP, Route110_Text_BrendanDefeated
 	goto Route110_EventScript_BrendanDefeated
 	end
 

data/maps/Route119/scripts.inc

@@ -86,17 +86,17 @@ Route119_EventScript_BattleMay:: @ 81F450B
 	end
 
 Route119_EventScript_BattleMayTreecko:: @ 81F453A
-	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TREECKO, Route119_Text_MayDefeat
 	goto Route119_EventScript_DefeatedMay
 	end
 
 Route119_EventScript_BattleMayTorchic:: @ 81F454A
-	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TORCHIC, Route119_Text_MayDefeat
 	goto Route119_EventScript_DefeatedMay
 	end
 
 Route119_EventScript_BattleMayMudkip:: @ 81F455A
-	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_ROUTE_119_MUDKIP, Route119_Text_MayDefeat
 	goto Route119_EventScript_DefeatedMay
 	end
 
@@ -116,17 +116,17 @@ Route119_EventScript_BattleBrendan:: @ 81F4585
 	end
 
 Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4
-	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TREECKO, Route119_Text_BrendanDefeat
 	goto Route119_EventScript_DefeatedBrendan
 	end
 
 Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4
-	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TORCHIC, Route119_Text_BrendanDefeat
 	goto Route119_EventScript_DefeatedBrendan
 	end
 
 Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4
-	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_MUDKIP, Route119_Text_BrendanDefeat
 	goto Route119_EventScript_DefeatedBrendan
 	end
 

data/maps/Route119_WeatherInstitute_2F/scripts.inc

@@ -41,7 +41,7 @@ Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
 	end
 
 Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
-	trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
+	trainerbattle_single TRAINER_SHELLY_WEATHER_INSTITUTE, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
 	msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 

data/maps/RustboroCity/scripts.inc

@@ -896,19 +896,19 @@ RustboroCity_EventScript_RestoreBgm:: @ 81E10D6
 	return
 
 RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB
-	trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
 RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE
-	trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
 RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101
-	trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat
+	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
@@ -960,19 +960,19 @@ RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0
 	end
 
 RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5
-	trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
 RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8
-	trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
 RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB
-	trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat
+	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end

data/maps/SeafloorCavern_Room3/scripts.inc

@@ -2,7 +2,7 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937
 	.byte 0
 
 SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
-	trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
+	trainerbattle_single TRAINER_SHELLY_SEAFLOOR_CAVERN, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
 	msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 

data/maps/SootopolisCity/scripts.inc

@@ -547,7 +547,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	fadenewbgm MUS_RUNECITY
 	delay 120
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
-	warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
+	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32
 	waitstate
 	end
 
@@ -600,7 +600,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	fadenewbgm MUS_NAMINORI
 	delay 120
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
-	warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
+	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53
 	waitstate
 	end
 

data/maps/VictoryRoad_1F/scripts.inc

@@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat
+	trainerbattle_no_intro TRAINER_WALLY_VR_1, VictoryRoad_1F_Text_WallyEntranceDefeat
 	msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	copyobjectxytoperm 4
@@ -84,7 +84,7 @@ VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C
 
 @ This Wally appears and remains at the exit after the Hall of Fame is entered 
 VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
-	trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
+	trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq VictoryRoad_1F_EventScript_RematchWally
@@ -92,7 +92,7 @@ VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
 	end
 
 VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C
-	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
+	trainerbattle_rematch TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
 	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 

data/maps/map_groups.json

@@ -510,9 +510,9 @@
     "SafariZone_Northeast",
     "SafariZone_Southeast",
     "BattleFrontier_OutsideEast",
+    "BattleFrontier_BattleTowerMultiPartnerRoom",
+    "BattleFrontier_BattleTowerMultiCorridor",
     "BattleFrontier_BattleTowerMultiBattleRoom",
-    "BattleFrontier_BattleTowerCorridor2",
-    "BattleFrontier_BattleTowerBattleRoom2",
     "BattleFrontier_BattleDomeLobby",
     "BattleFrontier_BattleDomeCorridor",
     "BattleFrontier_BattleDomePreBattleRoom",

data/script_cmd_table.inc

@@ -224,7 +224,7 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_buffertrainerclassname
 	.4byte ScrCmd_buffertrainername
 	.4byte ScrCmd_pokenavcall
-	.4byte ScrCmd_warpE0
+	.4byte ScrCmd_warpsootopolislegend
 	.4byte ScrCmd_buffercontesttype
 	.4byte ScrCmd_bufferitemnameplural
 

data/scripts/cable_club.inc

@@ -391,7 +391,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
 	goto_if_eq CableClub_EventScript_WarpTo4PColosseum
 	special SetCableClubWarp
 	warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
-	special sub_80AF948
+	special DoCableClubWarp
 	waitstate
 	end
 
@@ -404,7 +404,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
 CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
 	special SetCableClubWarp
 	warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
-	special sub_80AF948
+	special DoCableClubWarp
 	waitstate
 	end
 
@@ -494,7 +494,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
 	release
 	special SetCableClubWarp
 	setwarp MAP_TRADE_CENTER, 255, 5, 8
-	special sub_80AF948
+	special DoCableClubWarp
 	waitstate
 	end
 
@@ -569,7 +569,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
 	release
 	special SetCableClubWarp
 	setwarp MAP_RECORD_CORNER, 255, 8, 9
-	special sub_80AF948
+	special DoCableClubWarp
 	waitstate
 	end
 
@@ -618,7 +618,7 @@ MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9
 @ Unused
 CableClub_EventScript_CableClubWarp:: @ 8277306
 	special SetCableClubWarp
-	special sub_80AF948
+	special DoCableClubWarp
 	waitstate
 	end
 

data/scripts/mevent_altering_cave.inc

@@ -1,7 +1,7 @@
 MysteryEventScript_AlteringCave:: @ 86756E3
 	setvaddress MysteryEventScript_AlteringCave
 	addvar VAR_ALTERING_CAVE_WILD_SET, 1
-	compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
+	compare VAR_ALTERING_CAVE_WILD_SET, 10
 	vgoto_if_ne MysteryEventScript_AlteringCave_
 	setvar VAR_ALTERING_CAVE_WILD_SET, 0
 MysteryEventScript_AlteringCave_: @ 86756FD

data/scripts/mevent_aurora_ticket.inc

@@ -7,13 +7,13 @@ MysteryEventScript_AuroraTicket:: @ 867533C
 	checkflag FLAG_BATTLED_DEOXYS
 	vgoto_if_eq AuroraTicket_Obtained
 	checkitem ITEM_AURORA_TICKET, 1
-	compare_var_to_value VAR_RESULT, TRUE
+	compare VAR_RESULT, TRUE
 	vgoto_if_eq AuroraTicket_Obtained
 	vmessage sText_AuroraTicketForYou
 	waitmessage
 	waitbuttonpress
 	checkitemspace ITEM_AURORA_TICKET, 1
-	compare_var_to_value VAR_RESULT, FALSE
+	compare VAR_RESULT, FALSE
 	vgoto_if_eq AuroraTicket_NoBagSpace
 	giveitem_std ITEM_AURORA_TICKET
 	setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND

data/scripts/mevent_battle_card.inc

@@ -4,7 +4,7 @@ MysteryEventScript_BattleCard:: @ 867513C
 	vgoto_if_eq MysteryEventScript_BattleCardInfo
 	setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
 	specialvar VAR_0x8008, GetMysteryEventCardVal
-	compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES
+	compare VAR_0x8008, REQUIRED_CARD_BATTLES
 	vgoto_if_ne MysteryEventScript_BattleCardInfo
 	lock
 	faceplayer

data/scripts/mevent_mystic_ticket.inc

@@ -9,13 +9,13 @@ MysteryEventScript_MysticTicket:: @ 867550B
 	checkflag FLAG_CAUGHT_HO_OH
 	vgoto_if_eq MysticTicket_Obtained
 	checkitem ITEM_MYSTIC_TICKET, 1
-	compare_var_to_value VAR_RESULT, TRUE
+	compare VAR_RESULT, TRUE
 	vgoto_if_eq MysticTicket_Obtained
 	vmessage sText_MysticTicketForYou
 	waitmessage
 	waitbuttonpress
 	checkitemspace ITEM_MYSTIC_TICKET, 1
-	compare_var_to_value VAR_RESULT, FALSE
+	compare VAR_RESULT, FALSE
 	vgoto_if_eq MysticTicket_NoBagSpace
 	giveitem_std ITEM_MYSTIC_TICKET
 	setflag FLAG_ENABLE_SHIP_NAVEL_ROCK

data/scripts/mevent_old_sea_map.inc

@@ -7,13 +7,13 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
 	checkflag FLAG_CAUGHT_MEW
 	vgoto_if_eq OldSeaMap_Obtained
 	checkitem ITEM_OLD_SEA_MAP, 1
-	compare_var_to_value VAR_RESULT, TRUE
+	compare VAR_RESULT, TRUE
 	vgoto_if_eq OldSeaMap_Obtained
 	vmessage sText_MysteryGiftOldSeaMapForYou
 	waitmessage
 	waitbuttonpress
 	checkitemspace ITEM_OLD_SEA_MAP, 1
-	compare_var_to_value VAR_RESULT, FALSE
+	compare VAR_RESULT, FALSE
 	vgoto_if_eq OldSeaMap_NoBagSpace
 	giveitem_std ITEM_OLD_SEA_MAP
 	setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND

data/scripts/mevent_pichu.inc

@@ -6,7 +6,7 @@ MysteryEventScript_SurfPichu:: @ 8674D3D
 
 SurfPichu_GiveIfPossible: @ 8674D4C
 	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE
+	compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE
 	vgoto_if_eq SurfPichu_FullParty
 	setflag FLAG_MYSTERY_EVENT_DONE
 	vcall SurfPichu_GiveEgg
@@ -33,15 +33,15 @@ SurfPichu_GiveEgg: @ 8674D7E
 	giveegg SPECIES_PICHU
 	setmonobedient VAR_EVENT_PICHU_SLOT
 	setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
+	compare VAR_EVENT_PICHU_SLOT, 1
 	vgoto_if_eq SurfPichu_Slot1
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
+	compare VAR_EVENT_PICHU_SLOT, 2
 	vgoto_if_eq SurfPichu_Slot2
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
+	compare VAR_EVENT_PICHU_SLOT, 3
 	vgoto_if_eq SurfPichu_Slot3
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
+	compare VAR_EVENT_PICHU_SLOT, 4
 	vgoto_if_eq SurfPichu_Slot4
-	compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
+	compare VAR_EVENT_PICHU_SLOT, 5
 	vgoto_if_eq SurfPichu_Slot5
 	return
 

data/scripts/mevent_trainer.inc

@@ -1,7 +1,7 @@
 MysteryEventScript_VisitingTrainer:: @ 8674EC1
 	setvaddress MysteryEventScript_VisitingTrainer
 	special ValidateEReaderTrainer
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
 	lock
 	faceplayer

data/specials.inc

@@ -10,7 +10,7 @@
 gSpecials:: @ 81DBA64
 	def_special HealPlayerParty
 	def_special SetCableClubWarp
-	def_special sub_80AF948
+	def_special DoCableClubWarp
 	def_special ReturnFromLinkRoom
 	def_special CleanupLinkRoomState
 	def_special ExitLinkRoom
@@ -513,7 +513,7 @@ gSpecials:: @ 81DBA64
 	def_special TurnOnTVScreen
 	def_special sub_81D4A90
 	def_special ShouldDistributeEonTicket
-	def_special sub_813B568
+	def_special LinkRetireStatusWithBattleTowerPartner
 	def_special sub_813B534
 	def_special CallTrainerHillFunction
 	def_special Script_DoRayquazaScene @ Listed twice

include/battle_pyramid_bag.h

@@ -41,10 +41,10 @@ void sub_81C5924(void);
 void sub_81C59BC(void);
 void sub_81C4EFC(void);
 void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
-void sub_81C6714(u8 taskId);
+void Task_CloseBattlePyramidBagMessage(u8 taskId);
 void TryStoreHeldItemsInPyramidBag(void);
 void ChooseItemsToTossFromPyramidBag(void);
-void sub_81C5B14(u8 taskId);
+void CloseBattlePyramidBagAndSetCallback(u8 taskId);
 void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId));
 
 #endif // GUARD_BATTLE_PYRAMID_BAG_H

include/constants/apprentice.h

@@ -6,6 +6,8 @@
 
 #define NUM_WHICH_MON_QUESTIONS  MULTI_PARTY_SIZE
 #define NUM_WHICH_MOVE_QUESTIONS 5
+// + 2 below is 1 each for the lead mon question and the win speech question
+#define MAX_APPRENTICE_QUESTIONS NUM_WHICH_MON_QUESTIONS + NUM_WHICH_MOVE_QUESTIONS + 2
 
 #define APPRENTICE_LVL_MODE_50    (FRONTIER_LVL_50 + 1)
 #define APPRENTICE_LVL_MODE_OPEN  (FRONTIER_LVL_OPEN + 1)

include/constants/battle_tower.h

@@ -11,15 +11,31 @@
 #define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO    7
 #define BATTLE_TOWER_FUNC_NOP                   8
 #define BATTLE_TOWER_FUNC_NOP2                  9
-#define BATTLE_TOWER_FUNC_10                    10
+#define BATTLE_TOWER_FUNC_LOAD_PARTNERS         10
-#define BATTLE_TOWER_FUNC_11                    11
+#define BATTLE_TOWER_FUNC_PARTNER_MSG           11
-#define BATTLE_TOWER_FUNC_12                    12
+#define BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS   12
 #define BATTLE_TOWER_FUNC_13                    13
-#define BATTLE_TOWER_FUNC_14                    14
+#define BATTLE_TOWER_FUNC_SET_PARTNER_GFX       14
 #define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA    15
 
 #define TOWER_DATA_WIN_STREAK         1
 #define TOWER_DATA_WIN_STREAK_ACTIVE  2
 #define TOWER_DATA_LVL_MODE           3
 
+// IDs for the messages printed by potential partners in the Battle Tower Multi Partner Room
+#define PARTNER_MSGID_INTRO      0
+#define PARTNER_MSGID_MON1       1
+#define PARTNER_MSGID_MON2_ASK   2
+#define PARTNER_MSGID_ACCEPT     3
+#define PARTNER_MSGID_REJECT     4
+
+// IDs for communicating with the Link Multi partner
+#define BATTLE_TOWER_LINK_CONTINUE  0
+#define BATTLE_TOWER_LINK_RETIRE    1
+
+#define BATTLE_TOWER_LINKSTAT_CONTINUE        0
+#define BATTLE_TOWER_LINKSTAT_BOTH_RETIRE     1
+#define BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE  2
+#define BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE   3
+
 #endif //GUARD_CONSTANTS_BATTLE_TOWER_H

include/constants/field_specials.h

@@ -7,7 +7,7 @@
 #define PC_LOCATION_MAYS_HOUSE      2
 
 // SS Tidal Locations
-#define SS_TIDAL_LOCATION_OTHER     0
+#define SS_TIDAL_LOCATION_CURRENTS  0
 #define SS_TIDAL_LOCATION_SLATEPORT 1
 #define SS_TIDAL_LOCATION_LILYCOVE  2
 #define SS_TIDAL_LOCATION_ROUTE124  3

include/constants/flags.h

@@ -1641,13 +1641,13 @@
 #define DAILY_FLAGS_END                             FLAG_UNUSED_0x95F
 
 // Special Flags (Stored in EWRAM (gSpecialFlags), not in the SaveBlock)
-#define SPECIAL_FLAGS_START                                        0x4000
+#define SPECIAL_FLAGS_START                     0x4000
-#define FLAG_HIDE_MAP_NAME_POPUP                                   (SPECIAL_FLAGS_START + 0x0)
+#define FLAG_HIDE_MAP_NAME_POPUP                (SPECIAL_FLAGS_START + 0x0)
-#define FLAG_DONT_TRANSITION_MUSIC                                 (SPECIAL_FLAGS_START + 0x1)
+#define FLAG_DONT_TRANSITION_MUSIC              (SPECIAL_FLAGS_START + 0x1)
-#define FLAG_SPECIAL_FLAG_0x4002                                   (SPECIAL_FLAGS_START + 0x2)
+#define FLAG_ENABLE_MULTI_CORRIDOR_DOOR         (SPECIAL_FLAGS_START + 0x2)
-#define FLAG_SPECIAL_FLAG_UNUSED_0x4003                            (SPECIAL_FLAGS_START + 0x3) // Unused Flag
+#define FLAG_SPECIAL_FLAG_UNUSED_0x4003         (SPECIAL_FLAGS_START + 0x3) // Unused Flag
-#define FLAG_STORING_ITEMS_IN_PYRAMID_BAG                          (SPECIAL_FLAGS_START + 0x4)
+#define FLAG_STORING_ITEMS_IN_PYRAMID_BAG       (SPECIAL_FLAGS_START + 0x4)
 // FLAG_SPECIAL_FLAG_0x4005 - 0x407F also exist and are unused
-#define SPECIAL_FLAGS_END                                          (SPECIAL_FLAGS_START + 0x7F)
+#define SPECIAL_FLAGS_END                       (SPECIAL_FLAGS_START + 0x7F)
 
 #endif // GUARD_CONSTANTS_FLAGS_H

include/constants/frontier_util.h

@@ -42,7 +42,7 @@
 #define FRONTIER_DATA_PAUSED             3
 #define FRONTIER_DATA_SELECTED_MON_ORDER 4
 #define FRONTIER_DATA_BATTLE_OUTCOME     5
-#define FRONTIER_DATA_6                  6
+#define FRONTIER_DATA_RECORD_DISABLED    6
 #define FRONTIER_DATA_HEARD_BRAIN_SPEECH 7
 
 #define STREAK_TOWER_SINGLES_50       (1 << 0)

include/constants/item_effects.h

@@ -3,7 +3,7 @@
 
 // field 0 masks
 #define ITEM0_X_ATTACK          0x0F
-#define ITEM0_HIGH_CRIT         0x30 // For Dire Hit, works the same way as move Focus Energy.
+#define ITEM0_DIRE_HIT          0x30 // Works the same way as the move Focus Energy.
 #define ITEM0_SACRED_ASH        0x40
 #define ITEM0_INFATUATION       0x80
 
@@ -23,7 +23,7 @@
 #define ITEM3_POISON            0x10
 #define ITEM3_SLEEP             0x20
 #define ITEM3_LEVEL_UP          0x40
-#define ITEM3_MIST              0x80 // For Guard Specs, works the same way as move Mist.
+#define ITEM3_GUARD_SPEC        0x80 // Works the same way as the move Mist.   
 
 #define ITEM3_STATUS_ALL        (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP)
 

include/constants/layouts.h

@@ -390,8 +390,8 @@
 #define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387
 #define LAYOUT_MIRAGE_TOWER_4F 388
 #define LAYOUT_DESERT_UNDERPASS 389
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM 390
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR 391
 #define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392
 #define LAYOUT_UNION_ROOM 393
 #define LAYOUT_SAFARI_ZONE_NORTHEAST 394

include/constants/map_groups.h

@@ -461,95 +461,95 @@
 #define MAP_UNION_ROOM                      (60 | (25 << 8))
 
 // Map Group 26
-#define MAP_SAFARI_ZONE_NORTHWEST                          (0 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHWEST                           (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTH                              (1 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTH                               (1 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHWEST                          (2 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHWEST                           (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTH                              (3 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTH                               (3 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST                   (4 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST                    (4 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY             (5 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY              (5 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR          (6 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR           (6 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR          (7 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR           (7 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM       (8 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM        (8 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_EXTERIOR                       (9 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_EXTERIOR                        (9 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_INTERIOR                       (10 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_INTERIOR                        (10 | (26 << 8))
-#define MAP_SAFARI_ZONE_REST_HOUSE                         (11 | (26 << 8))
+#define MAP_SAFARI_ZONE_REST_HOUSE                          (11 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTHEAST                          (12 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHEAST                           (12 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST                          (13 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHEAST                           (13 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                   (14 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                    (14 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM (15 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2         (16 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR     (16 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2      (17 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM  (17 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY              (18 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY               (18 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR           (19 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR            (19 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM    (20 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM     (20 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM        (21 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM         (21 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY            (22 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY             (22 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR         (23 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR          (23 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM      (24 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM       (24 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY           (25 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY            (25 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR           (26 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR            (26 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP             (27 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP              (27 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY             (28 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY              (28 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR          (29 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR           (29 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM       (30 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM        (30 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY           (31 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY            (31 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM  (32 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM     (33 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM      (33 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY              (34 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY               (34 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR           (35 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR            (35 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM    (36 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM     (36 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL        (37 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL         (37 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL         (38 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL          (38 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS     (39 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS      (39 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RANKING_HALL                   (40 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RANKING_HALL                    (40 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE1                        (41 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE1                         (41 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER        (42 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER         (42 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE2                        (43 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE2                         (43 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE3                        (44 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE3                         (44 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE4                        (45 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE4                         (45 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                   (46 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                    (46 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE5                        (47 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE5                         (47 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE6                        (48 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE6                         (48 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE7                        (49 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE7                         (49 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                 (50 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                  (50 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE8                        (51 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE8                         (51 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE9                        (52 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE9                         (52 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F              (53 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F               (53 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F              (54 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F               (54 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_MART                           (55 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_MART                            (55 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_ENTRANCE                        (56 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_ENTRANCE                         (56 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_INTERIOR                        (57 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_INTERIOR                         (57 | (26 << 8))
-#define MAP_BIRTH_ISLAND_EXTERIOR                          (58 | (26 << 8))
+#define MAP_BIRTH_ISLAND_EXTERIOR                           (58 | (26 << 8))
-#define MAP_BIRTH_ISLAND_HARBOR                            (59 | (26 << 8))
+#define MAP_BIRTH_ISLAND_HARBOR                             (59 | (26 << 8))
-#define MAP_TRAINER_HILL_ENTRANCE                          (60 | (26 << 8))
+#define MAP_TRAINER_HILL_ENTRANCE                           (60 | (26 << 8))
-#define MAP_TRAINER_HILL_1F                                (61 | (26 << 8))
+#define MAP_TRAINER_HILL_1F                                 (61 | (26 << 8))
-#define MAP_TRAINER_HILL_2F                                (62 | (26 << 8))
+#define MAP_TRAINER_HILL_2F                                 (62 | (26 << 8))
-#define MAP_TRAINER_HILL_3F                                (63 | (26 << 8))
+#define MAP_TRAINER_HILL_3F                                 (63 | (26 << 8))
-#define MAP_TRAINER_HILL_4F                                (64 | (26 << 8))
+#define MAP_TRAINER_HILL_4F                                 (64 | (26 << 8))
-#define MAP_TRAINER_HILL_ROOF                              (65 | (26 << 8))
+#define MAP_TRAINER_HILL_ROOF                               (65 | (26 << 8))
-#define MAP_NAVEL_ROCK_EXTERIOR                            (66 | (26 << 8))
+#define MAP_NAVEL_ROCK_EXTERIOR                             (66 | (26 << 8))
-#define MAP_NAVEL_ROCK_HARBOR                              (67 | (26 << 8))
+#define MAP_NAVEL_ROCK_HARBOR                               (67 | (26 << 8))
-#define MAP_NAVEL_ROCK_ENTRANCE                            (68 | (26 << 8))
+#define MAP_NAVEL_ROCK_ENTRANCE                             (68 | (26 << 8))
-#define MAP_NAVEL_ROCK_B1F                                 (69 | (26 << 8))
+#define MAP_NAVEL_ROCK_B1F                                  (69 | (26 << 8))
-#define MAP_NAVEL_ROCK_FORK                                (70 | (26 << 8))
+#define MAP_NAVEL_ROCK_FORK                                 (70 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP1                                 (71 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP1                                  (71 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP2                                 (72 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP2                                  (72 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP3                                 (73 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP3                                  (73 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP4                                 (74 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP4                                  (74 | (26 << 8))
-#define MAP_NAVEL_ROCK_TOP                                 (75 | (26 << 8))
+#define MAP_NAVEL_ROCK_TOP                                  (75 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN01                              (76 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN01                               (76 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN02                              (77 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN02                               (77 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN03                              (78 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN03                               (78 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN04                              (79 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN04                               (79 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN05                              (80 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN05                               (80 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN06                              (81 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN06                               (81 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN07                              (82 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN07                               (82 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN08                              (83 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN08                               (83 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN09                              (84 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN09                               (84 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN10                              (85 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN10                               (85 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN11                              (86 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN11                               (86 | (26 << 8))
-#define MAP_NAVEL_ROCK_BOTTOM                              (87 | (26 << 8))
+#define MAP_NAVEL_ROCK_BOTTOM                               (87 | (26 << 8))
-#define MAP_TRAINER_HILL_ELEVATOR                          (88 | (26 << 8))
+#define MAP_TRAINER_HILL_ELEVATOR                           (88 | (26 << 8))
 
 // Map Group 27
 #define MAP_ROUTE104_PROTOTYPE                          (0 | (27 << 8))

include/constants/opponents.h

@@ -33,8 +33,8 @@
 #define TRAINER_FREDRICK                     29
 #define TRAINER_MATT                         30
 #define TRAINER_ZANDER                       31
-#define TRAINER_SHELLY_1                     32
+#define TRAINER_SHELLY_WEATHER_INSTITUTE     32
-#define TRAINER_SHELLY_2                     33
+#define TRAINER_SHELLY_SEAFLOOR_CAVERN       33
 #define TRAINER_ARCHIE                       34
 #define TRAINER_LEAH                         35
 #define TRAINER_DAISY                        36
@@ -515,30 +515,30 @@
 #define TRAINER_CONOR                       511
 #define TRAINER_EDWIN_1                     512
 #define TRAINER_HECTOR                      513
-#define TRAINER_TABITHA_1                   514
+#define TRAINER_TABITHA_MOSSDEEP            514
 #define TRAINER_EDWIN_2                     515
 #define TRAINER_EDWIN_3                     516
 #define TRAINER_EDWIN_4                     517
 #define TRAINER_EDWIN_5                     518
-#define TRAINER_WALLY_1                     519
+#define TRAINER_WALLY_VR_1                  519
-#define TRAINER_BRENDAN_1                   520
+#define TRAINER_BRENDAN_ROUTE_103_MUDKIP    520
-#define TRAINER_BRENDAN_2                   521
+#define TRAINER_BRENDAN_ROUTE_110_MUDKIP    521
-#define TRAINER_BRENDAN_3                   522
+#define TRAINER_BRENDAN_ROUTE_119_MUDKIP    522
-#define TRAINER_BRENDAN_4                   523
+#define TRAINER_BRENDAN_ROUTE_103_TREECKO   523
-#define TRAINER_BRENDAN_5                   524
+#define TRAINER_BRENDAN_ROUTE_110_TREECKO   524
-#define TRAINER_BRENDAN_6                   525
+#define TRAINER_BRENDAN_ROUTE_119_TREECKO   525
-#define TRAINER_BRENDAN_7                   526
+#define TRAINER_BRENDAN_ROUTE_103_TORCHIC   526
-#define TRAINER_BRENDAN_8                   527
+#define TRAINER_BRENDAN_ROUTE_110_TORCHIC   527
-#define TRAINER_BRENDAN_9                   528
+#define TRAINER_BRENDAN_ROUTE_119_TORCHIC   528
-#define TRAINER_MAY_1                       529
+#define TRAINER_MAY_ROUTE_103_MUDKIP        529
-#define TRAINER_MAY_2                       530
+#define TRAINER_MAY_ROUTE_110_MUDKIP        530
-#define TRAINER_MAY_3                       531
+#define TRAINER_MAY_ROUTE_119_MUDKIP        531
-#define TRAINER_MAY_4                       532
+#define TRAINER_MAY_ROUTE_103_TREECKO       532
-#define TRAINER_MAY_5                       533
+#define TRAINER_MAY_ROUTE_110_TREECKO       533
-#define TRAINER_MAY_6                       534
+#define TRAINER_MAY_ROUTE_119_TREECKO       534
-#define TRAINER_MAY_7                       535
+#define TRAINER_MAY_ROUTE_103_TORCHIC       535
-#define TRAINER_MAY_8                       536
+#define TRAINER_MAY_ROUTE_110_TORCHIC       536
-#define TRAINER_MAY_9                       537
+#define TRAINER_MAY_ROUTE_119_TORCHIC       537
 #define TRAINER_ISAAC_1                     538
 #define TRAINER_DAVIS                       539
 #define TRAINER_MITCHELL                    540
@@ -593,17 +593,17 @@
 #define TRAINER_GRUNT_SPACE_CENTER_6        589
 #define TRAINER_GRUNT_SPACE_CENTER_7        590
 #define TRAINER_MACEY                       591
-#define TRAINER_BRENDAN_10                  592
+#define TRAINER_BRENDAN_RUSTBORO_TREECKO    592
-#define TRAINER_BRENDAN_11                  593
+#define TRAINER_BRENDAN_RUSTBORO_MUDKIP     593
 #define TRAINER_PAXTON                      594
 #define TRAINER_ISABELLA                    595
 #define TRAINER_GRUNT_WEATHER_INST_5        596
-#define TRAINER_TABITHA_2                   597
+#define TRAINER_TABITHA_MT_CHIMNEY          597
 #define TRAINER_JONATHAN                    598
-#define TRAINER_BRENDAN_12                  599
+#define TRAINER_BRENDAN_RUSTBORO_TORCHIC    599
-#define TRAINER_MAY_10                      600
+#define TRAINER_MAY_RUSTBORO_MUDKIP         600
-#define TRAINER_MAXIE_1                     601
+#define TRAINER_MAXIE_MAGMA_HIDEOUT         601
-#define TRAINER_MAXIE_2                     602
+#define TRAINER_MAXIE_MT_CHIMNEY            602
 #define TRAINER_TIANA                       603
 #define TRAINER_HALEY_1                     604
 #define TRAINER_JANICE                      605
@@ -657,17 +657,17 @@
 #define TRAINER_RILEY                       653
 #define TRAINER_FLINT                       654
 #define TRAINER_ASHLEY                      655
-#define TRAINER_WALLY_2                     656
+#define TRAINER_WALLY_MAUVILLE              656
-#define TRAINER_WALLY_3                     657
+#define TRAINER_WALLY_VR_2                  657
-#define TRAINER_WALLY_4                     658
+#define TRAINER_WALLY_VR_3                  658
-#define TRAINER_WALLY_5                     659
+#define TRAINER_WALLY_VR_4                  659
-#define TRAINER_WALLY_6                     660
+#define TRAINER_WALLY_VR_5                  660
-#define TRAINER_BRENDAN_13                  661
+#define TRAINER_BRENDAN_LILYCOVE_MUDKIP     661
-#define TRAINER_BRENDAN_14                  662
+#define TRAINER_BRENDAN_LILYCOVE_TREECKO    662
-#define TRAINER_BRENDAN_15                  663
+#define TRAINER_BRENDAN_LILYCOVE_TORCHIC    663
-#define TRAINER_MAY_11                      664
+#define TRAINER_MAY_LILYCOVE_MUDKIP         664
-#define TRAINER_MAY_12                      665
+#define TRAINER_MAY_LILYCOVE_TREECKO        665
-#define TRAINER_MAY_13                      666
+#define TRAINER_MAY_LILYCOVE_TORCHIC        666
 #define TRAINER_JONAH                       667
 #define TRAINER_HENRY                       668
 #define TRAINER_ROGER                       669
@@ -733,9 +733,9 @@
 #define TRAINER_GRUNT_MAGMA_HIDEOUT_14      729
 #define TRAINER_GRUNT_MAGMA_HIDEOUT_15      730
 #define TRAINER_GRUNT_MAGMA_HIDEOUT_16      731
-#define TRAINER_TABITHA_3                   732
+#define TRAINER_TABITHA_MAGMA_HIDEOUT       732
 #define TRAINER_DARCY                       733
-#define TRAINER_MAXIE_3                     734
+#define TRAINER_MAXIE_MOSSDEEP              734
 #define TRAINER_PETE                        735
 #define TRAINER_ISABELLE                    736
 #define TRAINER_ANDRES_1                    737
@@ -769,8 +769,8 @@
 #define TRAINER_MYLES                       765
 #define TRAINER_PAT                         766
 #define TRAINER_CRISTIN_1                   767
-#define TRAINER_MAY_14                      768
+#define TRAINER_MAY_RUSTBORO_TREECKO        768
-#define TRAINER_MAY_15                      769
+#define TRAINER_MAY_RUSTBORO_TORCHIC        769
 #define TRAINER_ROXANNE_2                   770
 #define TRAINER_ROXANNE_3                   771
 #define TRAINER_ROXANNE_4                   772
@@ -854,8 +854,8 @@
 #define TRAINER_EVERETT                     850
 #define TRAINER_RED                         851
 #define TRAINER_LEAF                        852
-#define TRAINER_BRENDAN_16                  853
+#define TRAINER_BRENDAN_PLACEHOLDER         853
-#define TRAINER_MAY_16                      854
+#define TRAINER_MAY_PLACEHOLDER             854
 
 // NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
 //       More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled

include/constants/vars.h

@@ -273,7 +273,9 @@
 #define VAR_UNUSED_0x40FE                    0x40FE // Unused Var
 #define VAR_UNUSED_0x40FF                    0x40FF // Unused Var
 
-#define SPECIAL_VARS_START 0x8000
+#define VARS_END                             0x40FF
+
+#define SPECIAL_VARS_START            0x8000
 // special vars
 // They are commonly used as parameters to commands, or return values from commands.
 #define VAR_0x8000                    0x8000
@@ -299,4 +301,6 @@
 #define VAR_UNUSED_0x8014             0x8014
 #define VAR_TRAINER_BATTLE_OPPONENT_A 0x8015 // Alias of gTrainerBattleOpponent_A
 
+#define SPECIAL_VARS_END              0x8015
+
 #endif // GUARD_CONSTANTS_VARS_H

include/event_scripts.h

@@ -582,4 +582,9 @@ extern const u8 SecretBase_EventScript_ShrubUseSecretPower[];
 // trainer hill
 extern const u8 TrainerHill_EventScript_TrainerBattle[];
 
+// Item Use
+extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
+extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
+extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
+
 #endif // GUARD_EVENT_SCRIPTS_H

include/field_effect.h

@@ -34,17 +34,17 @@ bool8 FieldEffectCmd_end(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val);
-void sub_80B6B68(void);
+void FieldCB_FallWarpExit(void);
-void sub_80B6E4C(u8 a0, u8 priority);
+void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
-void sub_80B75D8(u8 priority);
+void StartLavaridgeGymB1FWarp(u8 priority);
-void sub_80B7A74(u8 priority);
+void StartLavaridgeGym1FWarp(u8 priority);
 
 void sub_80B9C28(s16*, u8);
 void sub_80B9C54(s16*, u8);
 void sub_80B9CDC(s16*, u8);
 
-void sub_80B7CAC(struct Sprite*);
+void SpriteCB_PopOutOfAsh(struct Sprite*);
-void sub_80B7A58(struct Sprite*);
+void SpriteCB_LavaridgeGymWarp(struct Sprite*);
 
 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);

include/field_player_avatar.h

@@ -61,7 +61,8 @@ void sub_808D194(void);
 void sub_808D1C8(void);
 bool32 sub_808D1B4(void);
 bool32 sub_808D1E8(void);
-void sub_808C0A8(u8 a);
+void SetPlayerInvisibility(bool8 invisible);
 u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y);
+void StartFishing(u8 taskId);
 
 #endif // GUARD_FIELD_PLAYER_AVATAR_H

include/field_screen_effect.h

@@ -1,37 +1,35 @@
 #ifndef GUARD_FIELD_SCREEN_EFFECT_H
 #define GUARD_FIELD_SCREEN_EFFECT_H
 
-void pal_fill_for_maplights(void);
+void WarpFadeInScreen(void);
-void pal_fill_black(void);
+void WarpFadeOutScreen(void);
-void WarpFadeScreen(void);
+void FadeInFromBlack(void);
-void sub_80AF128(void);
+void FadeInFromWhite(void);
-void FieldCallback_ReturnToEventScript2(void);
+void FieldCB_ContinueScriptUnionRoom(void);
-void sub_80AF188(void);
+void FieldCB_ContinueScriptHandleMusic(void);
-void sub_80AF214(void);
+void FieldCB_ContinueScript(void);
-void sub_80AF2B4(u8 taskId);
+void Task_ReturnToFieldRecordMixing(u8 taskId);
-void sub_80AF314(void);
+void FieldCB_ReturnToFieldCableLink(void);
-void mapldr_default(void);
+void FieldCB_ReturnToFieldWirelessLink(void);
-void sub_80AF3B0(void);
+void FieldCB_DefaultWarpExit(void);
-void sub_80AF3C8(void);
+void FieldCB_WarpExitFadeFromBlack(void);
-void sub_80AF3E8(void);
+void FieldCB_WarpExitFadeFromWhite(void);
-void sub_80AF40C(void);
+bool8 FieldCB_ReturnToFieldOpenStartMenu(void);
-void sub_80AF688(void);
+void ReturnToFieldOpenStartMenu(void);
-bool8 sub_80AF6A4(void);
 void sub_80AF6D4(void);
 void sub_80AF6F0(void);
 void DoWarp(void);
 void DoDiveWarp(void);
-void sub_80AF79C(void);
+void DoSootopolisLegendWarp(void);
 void DoDoorWarp(void);
 void DoFallWarp(void);
-void sub_80AF80C(u8 metatileBehavior);
+void DoEscalatorWarp(u8 metatileBehavior);
-void sub_80AF828(void);
+void DoLavaridgeGymB1FWarp(void);
-void sub_80AF838(void);
+void DoLavaridgeGym1FWarp(void);
-void sub_80AF848(void);
+void DoTeleportWarp(void);
 void DoMossdeepGymWarp(void);
-void sub_80AF8B8(void);
+void DoPortholeWarp(void);
-void sub_80AF948(void);
+void DoCableClubWarp(void);
-void sub_80AF9F8(void);
 void DoContestHallWarp(void);
 void AnimateFlash(u8 flashLevel);
 void WriteBattlePyramidViewScanlineEffectBuffer(void);
@@ -41,6 +39,6 @@ void DoOrbEffect(void);
 void FadeOutOrbEffect(void);
 void sub_80B05B4(void);
 void WriteFlashScanlineEffectBuffer(u8 flashLevel);
-bool8 walkrun_is_standing_still(void);
+bool8 IsPlayerStandingStill(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H

include/field_special_scene.h

@@ -10,6 +10,6 @@ void Task_HandleTruckSequence(u8 taskId);
 void ExecuteTruckSequence(void);
 void EndTruckSequence(u8);
 void sub_80C791C(void);
-void sub_80FB768(void);
+void FieldCB_ShowPortholeView(void);
 
 #endif // GUARD_FIELD_SPECIAL_SCENE_H

include/field_specials.h

@@ -7,7 +7,7 @@ extern u8 gBikeCollisions;
 u8 GetLeadMonIndex(void);
 u8 IsDestinationBoxFull(void);
 u16 GetPCBoxToSendMon(void);
-bool8 InMultiBattleRoom(void);
+bool8 InMultiPartnerRoom(void);
 void UpdateTrainerFansAfterLinkBattle(void);
 void IncrementBirthIslandRockStepCount(void);
 bool8 AbnormalWeatherHasExpired(void);

include/fieldmap.h

@@ -42,7 +42,7 @@ void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
 void copy_map_tileset1_to_vram(const struct MapLayout *);
 void copy_map_tileset2_to_vram(const struct MapLayout *);
 struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection);
-struct MapConnection *sub_8088A8C(s16 x, s16 y);
+struct MapConnection *GetConnectionAtCoords(s16 x, s16 y);
 
 void SpriteCB_PokeballGlow(struct Sprite *);
 void SpriteCB_PokecenterMonitor(struct Sprite *);

include/global.fieldmap.h

@@ -143,6 +143,16 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
+// Flags for gMapHeader.flags, as defined in the map_header_flags macro
+#define MAP_ALLOW_BIKE         (1 << 0)
+#define MAP_ALLOW_ESCAPE_ROPE  (1 << 1)
+#define MAP_ALLOW_RUN          (1 << 2)
+#define MAP_SHOW_MAP_NAME      (1 << 3)
+#define UNUSED_MAP_FLAGS       (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7)
+
+#define SHOW_MAP_NAME_ENABLED  ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME)
+
+
 struct EventObject
 {
     /*0x00*/ u32 active:1;

include/global.h

@@ -332,7 +332,7 @@ struct BattleFrontier
     /*0xCA8*/ u8 challengeStatus;
     /*0xCA9*/ u8 lvlMode:2;
     /*0xCA9*/ u8 challengePaused:1;
-    /*0xCA9*/ u8 field_CA9_b:1;
+    /*0xCA9*/ u8 disableRecordBattle:1;
     /*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE];
     /*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid)
     /*0xCB4*/ u16 trainerIds[20];

include/item_menu.h

@@ -74,7 +74,7 @@ void QuizLadyOpenBagMenu(void);
 void ApprenticeOpenBagMenu(void);
 void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
-void bag_menu_mail_related(void);
+void CB2_ReturnToBagMenuPocket(void);
 void CB2_BagMenuFromStartMenu(void);
 u8 GetItemListPosition(u8 pocketId);
 bool8 UseRegisteredKeyItemOnField(void);
@@ -84,9 +84,13 @@ void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
 void ChooseBerrySetCallback(void (*callback)(void));
 void CB2_ChooseBerry(void);
-void unknown_ItemMenu_Confirm(u8 taskId);
+void Task_FadeAndCloseBagMenu(u8 taskId);
 void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
-void sub_81AB9A8(u8 pocketId);
+void BagMenu_InitListsMenu(u8 taskId);
+void UpdatePocketItemList(u8 pocketId);
+void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId));
+void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
+
 
 
 #endif //GUARD_item_menu_H

include/item_use.h

@@ -3,27 +3,13 @@
 
 void ItemUseOutOfBattle_Mail(u8);
 void ItemUseOutOfBattle_Bike(u8);
-void ItemUseOnFieldCB_Bike(u8);
 void ItemUseOutOfBattle_Rod(u8);
-void ItemUseOnFieldCB_Rod(u8);
 void ItemUseOutOfBattle_Itemfinder(u8);
-void ItemUseOnFieldCB_Itemfinder(u8);
-void RunItemfinderResults(u8);
-void ExitItemfinder(u8);
-bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8);
-void sub_80C9720(u8);
-void sub_80C9838(u8, s16, s16);
-u8 GetPlayerDirectionTowardsHiddenItem(s16, s16);
-void SetPlayerDirectionTowardsItem(u8);
-void DisplayItemRespondingMessageAndExitItemfinder(u8);
-void RotatePlayerAndExitItemfinder(u8);
 void ItemUseOutOfBattle_PokeblockCase(u8);
 void ItemUseOutOfBattle_CoinCase(u8);
 void ItemUseOutOfBattle_PowderJar(u8);
 void ItemUseOutOfBattle_SSTicket(u8);
-void sub_80C9D00(u8);
 void ItemUseOutOfBattle_WailmerPail(u8);
-void sub_80C9D74(u8);
 void ItemUseOutOfBattle_Medicine(u8);
 void ItemUseOutOfBattle_ReduceEV(u8);
 void ItemUseOutOfBattle_SacredAsh(u8);
@@ -31,25 +17,21 @@ void ItemUseOutOfBattle_PPRecovery(u8);
 void ItemUseOutOfBattle_PPUp(u8);
 void ItemUseOutOfBattle_RareCandy(u8);
 void ItemUseOutOfBattle_TMHM(u8);
-void sub_80C9EE4(u8);
-void sub_80C9F10(u8);
-void sub_80C9F80(u8);
-void sub_80C9FC0(u8);
 void ItemUseOutOfBattle_Repel(u8);
-void ItemUseOutOfBattle_BlackWhiteFlute(u8);
-void task08_080A1C44(u8);
-u8 CanUseEscapeRopeOnCurrMap(void);
 void ItemUseOutOfBattle_EscapeRope(u8);
+void ItemUseOutOfBattle_BlackWhiteFlute(u8);
 void ItemUseOutOfBattle_EvolutionStone(u8);
+void ItemUseOutOfBattle_Berry(u8);
+void ItemUseOutOfBattle_EnigmaBerry(u8);
+void ItemUseOutOfBattle_CannotUse(u8);
 void ItemUseInBattle_PokeBall(u8);
 void ItemUseInBattle_StatIncrease(u8);
 void ItemUseInBattle_Medicine(u8);
 void ItemUseInBattle_PPRecovery(u8);
 void ItemUseInBattle_Escape(u8);
-void ItemUseOutOfBattle_EnigmaBerry(u8);
 void ItemUseInBattle_EnigmaBerry(u8);
-void ItemUseOutOfBattle_CannotUse(u8);
+void Task_UseDigEscapeRopeOnField(u8 taskId);
+u8 CanUseEscapeRopeOnCurrMap(void);
 u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
-void ItemUseOutOfBattle_Berry(u8);
 
 #endif // GUARD_ITEM_USE_H

include/menu.h

@@ -28,7 +28,6 @@ void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
 void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
 u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
 void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
-void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
 void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram);
 void DisplayYesNoMenuDefaultYes(void);

include/overworld.h

@@ -136,7 +136,7 @@ void CB2_NewGame(void);
 void CB2_WhiteOut(void);
 void CB2_LoadMap(void);
 void sub_8086024(void);
-void sub_8086074(void);
+void CB2_ReturnToFieldCableClub(void);
 void CB2_ReturnToField(void);
 void CB2_ReturnToFieldLocal(void);
 void CB2_ReturnToFieldLink(void);

include/pokemon.h

@@ -342,7 +342,7 @@ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex,
 bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e);
 bool8 HealStatusConditions(struct Pokemon *mon, u32 battlePartyId, u32 healMask, u8 battlerId);
 u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
-u8 *sub_806CF78(u16 itemId);
+u8 *UseStatIncreaseItem(u16 itemId);
 u8 GetNature(struct Pokemon *mon);
 u8 GetNatureFromPersonality(u32 personality);
 u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem);

include/start_menu.h

@@ -3,7 +3,7 @@
 
 extern bool8 (*gMenuCallback)(void);
 
-void sub_809FA18(void);
+void ShowReturnToFieldStartMenu(void);
 void Task_ShowStartMenu(u8 taskId);
 void ShowStartMenu(void);
 void ShowBattlePyramidStartMenu(void);

include/strings.h

@@ -1373,336 +1373,336 @@ extern const u8 gText_LucyDefeatGold[];
 extern const u8 gText_BrandonDefeatGold[];
 
 // Battle Tower.
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Intro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Reject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[]; 
 
 // Battle Dome.
 extern const u8 BattleDome_Text_Potential1[];
@@ -2024,7 +2024,7 @@ extern const u8 gText_JustOnePkmn[];
 
 // battle main
 extern const u8 gText_LinkStandby3[];
-extern const u8 gText_BattleRecordCouldntBeSaved[];
+extern const u8 BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved[];
 extern const u8 gText_Poison[];
 extern const u8 gText_Sleep[];
 extern const u8 gText_Paralysis[];

sound/direct_sound_data.inc

@@ -23,8 +23,8 @@ DirectSoundWaveData_sc88_timpani::
 	.incbin "sound/direct_sound_samples/sc88_timpani.bin"
 
 	.align 2
-DirectSoundWaveData_advanced_orchestra_voice_ahhs::
+DirectSoundWaveData_classical_choir_voice_ahhs::
-	.incbin "sound/direct_sound_samples/advanced_orchestra_voice_ahhs.bin"
+	.incbin "sound/direct_sound_samples/classical_choir_voice_ahhs.bin"
 
 	.align 2
 DirectSoundWaveData_sd90_classical_oboe::
@@ -59,16 +59,16 @@ DirectSoundWaveData_sc88_standard_kick::
 	.incbin "sound/direct_sound_samples/sc88_standard_kick.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard_snare1::
+DirectSoundWaveData_sc88_standard3_snare::
-	.incbin "sound/direct_sound_samples/sc88_standard_snare1.bin"
+	.incbin "sound/direct_sound_samples/sc88_standard3_snare.bin"
 
 	.align 2
 DirectSoundWaveData_sc88_standard_hand_clap::
 	.incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard_snare2::
+DirectSoundWaveData_sc88_orchestra_snare::
-	.incbin "sound/direct_sound_samples/sc88_standard_snare2.bin"
+	.incbin "sound/direct_sound_samples/sc88_orchestra_snare.bin"
 
 	.align 2
 DirectSoundWaveData_unknown_tom::
@@ -91,12 +91,12 @@ DirectSoundWaveData_unknown_tambourine::
 	.incbin "sound/direct_sound_samples/unknown_tambourine.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_cymbal_crash::
+DirectSoundWaveData_trinity_cymbal_crash::
-	.incbin "sound/direct_sound_samples/unknown_cymbal_crash.bin"
+	.incbin "sound/direct_sound_samples/trinity_cymbal_crash.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard_cymbal_crash::
+DirectSoundWaveData_sc88_orchestra_cymbal_crash::
-	.incbin "sound/direct_sound_samples/sc88_standard_cymbal_crash.bin"
+	.incbin "sound/direct_sound_samples/sc88_orchestra_cymbal_crash.bin"
 
 	.align 2
 DirectSoundWaveData_sc88_bongo::
@@ -251,20 +251,20 @@ DirectSoundWaveData_emu_ii_pipe_organ::
 	.incbin "sound/direct_sound_samples/emu_ii_pipe_organ.bin"
 
 	.align 2
-DirectSoundWaveData_unused_unknown_female_voice::
+DirectSoundWaveData_unknown_female_voice::
-	.incbin "sound/direct_sound_samples/unused_unknown_female_voice.bin"
+	.incbin "sound/direct_sound_samples/unknown_female_voice.bin"
 
 	.align 2
 DirectSoundWaveData_unused_unknown_male_voice::
 	.incbin "sound/direct_sound_samples/unused_unknown_male_voice.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_e_piano_low::
+DirectSoundWaveData_sd90_classical_detuned_ep1_low::
-	.incbin "sound/direct_sound_samples/unknown_e_piano_low.bin"
+	.incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_low.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_e_piano_high::
+DirectSoundWaveData_sd90_classical_detuned_ep1_high::
-	.incbin "sound/direct_sound_samples/unknown_e_piano_high.bin"
+	.incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_high.bin"
 
 	.align 2
 DirectSoundWaveData_sc88_timpani_with_snare::
@@ -275,8 +275,8 @@ DirectSoundWaveData_unknown_synth_snare::
 	.incbin "sound/direct_sound_samples/unknown_synth_snare.bin"
 
 	.align 2
-DirectSoundWaveData_unused_sc88_square::
+DirectSoundWaveData_sc88_square_wave::
-	.incbin "sound/direct_sound_samples/unused_sc88_square.bin"
+	.incbin "sound/direct_sound_samples/sc88_square_wave.bin"
 
 	.align 2
 DirectSoundWaveData_bicycle_bell::
@@ -1951,8 +1951,8 @@ DirectSoundWaveData_sc88_nylon_str_guitar::
 	.incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin"
 
 	.align 2
-DirectSoundWaveData_sd90_classical_guitar_harmonics::
+DirectSoundWaveData_sd90_special_scream_drive::
-	.incbin "sound/direct_sound_samples/sd90_classical_guitar_harmonics.bin"
+	.incbin "sound/direct_sound_samples/sd90_special_scream_drive.bin"
 
 	.align 2
 DirectSoundWaveData_88DBBC0::