Merge master into ObjEvent rename

author: GriffinR <griffin.richards@comcast.net> 2019-11-25 20:00:04 -0500
committer: GriffinR <griffin.richards@comcast.net> 2019-11-25 20:00:04 -0500
commit: f559fa3fe26910056e84315370cb13ec8501af18 (patch)
tree: 498c7ed00243cf03420451fdde3e04ac36add55c /data/maps
parent: 4c52cf9ed15f01f949fbf2139444f674694e446d (diff)
parent: 6efa51f8ad7b62a3a12c81f1d0bf299be31718b0 (diff)
49 files changed, 1828 insertions, 2678 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index c598ec3d8..60f4428c9 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -10,8 +10,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
 	end
 
 BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
-	special CallFrontierUtilFunc
+	frontier_settrainers
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
 	end
 
@@ -40,18 +39,13 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
 	showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
 	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
@@ -109,23 +103,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
 	waitstate
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7
@@ -138,22 +124,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
+	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870
 	compare VAR_RESULT, 2
@@ -195,7 +176,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA
@@ -224,10 +205,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
 	delay 60
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
 	waitstate
 
@@ -270,8 +248,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
@@ -303,7 +280,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_242170
+	call BattleFrontier_EventScript_SetBrainObjectGfx
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
 	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
 	waitmovement 0
@@ -327,19 +304,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
 	waitmovement 0
 	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
-	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
-	case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, MSGBOX_DEFAULT
@@ -357,8 +330,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -368,22 +340,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
 	message BattleFrontier_BattleArenaBattleRoom_Text_25819C
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, MSGBOX_DEFAULT
@@ -401,8 +368,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -412,8 +378,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
 	message BattleFrontier_BattleArenaBattleRoom_Text_25835B
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 
@@ -426,20 +391,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C
 FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
 	closemessage
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
-	special CallFrontierUtilFunc
+	frontier_restorehelditems
 	special HealPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
-	special CallFrontierUtilFunc
+	frontier_resetsketch
 	return
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
@@ -453,7 +413,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, MSGBOX_DEFAULT
 	closemessage
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA
+	call BattleFrontier_EventScript_IncrementWinStreak
 	return
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index cf21c3c13..cd7ec75be 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -14,15 +14,14 @@ BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
 
 BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleArenaLobby_EventScript_255C88
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_255DC0
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleArenaLobby_EventScript_255CCF
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_255D2B
 	.2byte 0
 
 BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
@@ -37,18 +36,14 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleArenaFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
 BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
 	msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT
@@ -59,8 +54,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0
 
 BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
 	msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleArenaLobby_Text_256931
 	waitmessage
@@ -87,8 +81,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
 	end
 
 BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 3
@@ -108,8 +101,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255DBF
 
 BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA
-	call BattleFrontier_BattleArenaLobby_EventScript_23E8B4
-
+	call BattleFrontier_EventScript_SaveBattle
 BattleFrontier_BattleArenaLobby_EventScript_255DBF:: @ 8255DBF
 	return
 
@@ -122,18 +114,15 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0
 	special CallBattleArenaFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattleArenaLobby_EventScript_255F54
 
 BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 3
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleArenaLobby_Text_256166, MSGBOX_DEFAULT
 
@@ -152,19 +141,15 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleArenaLobby_EventScript_255FFB
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleArenaLobby_Text_256573, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattleArenaLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 3
 	special sub_80F9490
@@ -179,23 +164,15 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 
 BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, 0
 	special CallBattleArenaFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleArenaFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -206,17 +183,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 
 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_LVL_MODE
+	compare VAR_RESULT, FRONTIER_LVL_50
 	call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256005
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FRONTIER_LVL_OPEN
 	call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256050
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
 	setvar VAR_TEMP_0, 0
@@ -229,8 +202,8 @@ BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F
 
 BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_255FC7
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4
+	case FRONTIER_LVL_50, BattleFrontier_BattleArenaLobby_EventScript_255FC7
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattleArenaLobby_EventScript_255FD4
 
 BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7
 	msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, MSGBOX_DEFAULT
@@ -241,18 +214,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4
 	goto BattleFrontier_BattleArenaLobby_EventScript_256003
 
 BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleArenaLobby_EventScript_255FFB
 
 BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8
 	special LoadPlayerParty
-
 BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB
 	msgbox BattleFrontier_BattleArenaLobby_Text_25621F, MSGBOX_DEFAULT
-
 BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003
 	release
 	end
@@ -344,9 +312,7 @@ BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088
 
 BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 3
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_ARENA
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index e501efcd8..35b082c76 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -8,9 +8,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
 	setvar VAR_0x8004, 10
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
@@ -51,7 +49,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
 	showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
 	compare VAR_TEMP_F, 3
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
-	compare VAR_TEMP_E, 0
+	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E
@@ -67,7 +65,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
 	waitmovement 0
 	compare VAR_TEMP_F, 3
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
-	compare VAR_TEMP_E, 0
+	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
@@ -134,25 +132,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
 	special CallBattleDomeFunction
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
 @ 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME
-	setvar VAR_0x8005, 1
-	special CallFrontierUtilFunc
+	frontier_gettrainername 1
 	message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
 	waitmessage
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME
-	setvar VAR_0x8005, 0
-	special CallFrontierUtilFunc
+	frontier_gettrainername 0
 	message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
 	waitmessage
 	return
@@ -177,14 +168,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
 	setvar VAR_0x8004, 12
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
 	setvar VAR_0x8006, 1
@@ -194,11 +180,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
 	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_LVL_MODE
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E
 
@@ -210,10 +194,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
 	playse SE_W227B
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
 	delay 60
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3
@@ -305,10 +286,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9
 	compare VAR_TEMP_F, 3
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
 	switch VAR_TEMP_E
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
+	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
@@ -377,17 +358,15 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB
 	switch VAR_TEMP_E
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
+	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, MSGBOX_DEFAULT
@@ -423,19 +402,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
 	waitse
 	switch VAR_TEMP_E
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, MSGBOX_DEFAULT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
@@ -444,11 +418,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
+	setvar VAR_0x8004, 12
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
 	closemessage
@@ -459,22 +432,16 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, MSGBOX_DEFAULT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
@@ -486,8 +453,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	setvar VAR_0x8004, 12
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
 	closemessage
@@ -498,8 +464,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	message BattleFrontier_BattleDomeBattleRoom_Text_24D522
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
 
@@ -524,10 +489,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_DOME
 	setvar VAR_0x8005, 0
@@ -552,17 +514,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
 	setvar VAR_TEMP_1, 1
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 3
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
+	frontier_getbrainstatus
 	copyvar VAR_TEMP_E, VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_242170
+	call BattleFrontier_EventScript_SetBrainObjectGfx
 	setobjectxyperm 15, 13, 9
 	removeobject 15
 	addobject 15
@@ -951,7 +910,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
 	waitstate
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
index 2a97e2ae7..3208efe4b 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
@@ -9,10 +9,8 @@ BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
 BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
 	delay 16
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	frontier_get FRONTIER_DATA_LVL_MODE
+	compare VAR_RESULT, FRONTIER_LVL_OPEN
 	goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
 	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
@@ -37,7 +35,6 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
 	waitmovement 0
 	closedoor 37, 3
 	waitdooranim
-
 BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
 	waitmovement 0
 	setvar VAR_0x8006, 0
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index df167314a..1608f414f 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -21,15 +21,14 @@ BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
 
 BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleDomeLobby_EventScript_249842
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleDomeLobby_EventScript_249940
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_249842
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_2499F9
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_24989B
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_249940
 	.2byte 0
 
 BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
@@ -48,19 +47,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
-	call BattleFrontier_BattleDomeLobby_EventScript_241EBA
+	call BattleFrontier_EventScript_IncrementWinStreak
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT
@@ -71,17 +66,13 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
 
 BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
+	frontier_checkairshow
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
@@ -104,11 +95,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
+	frontier_checkairshow
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
@@ -138,8 +126,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_2499E9
 
 BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4
-	call BattleFrontier_BattleDomeLobby_EventScript_23E8B4
-
+	call BattleFrontier_EventScript_SaveBattle
 BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9
 	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT
 	closemessage
@@ -157,40 +144,37 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
 	special CallBattleDomeFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattleDomeLobby_EventScript_249BC2
 
 BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 1
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 1
-	setvar VAR_FRONTIER_BATTLE_MODE, 1
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
 	special SavePlayerParty
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06
 
 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
@@ -205,19 +189,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_249C64
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattleDomeLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 3
 	special sub_80F9490
@@ -232,19 +212,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 
 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, 0
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -257,9 +229,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 
 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_0x8004, 15
 	special CallBattleDomeFunction
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
@@ -272,16 +242,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24
 	goto BattleFrontier_BattleDomeLobby_EventScript_249A72
 
 BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249C30
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D
+	case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_249C30
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_249C3D
 
 BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT
@@ -292,10 +262,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D
 	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
 
 BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleDomeLobby_EventScript_249C64
 
 BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
@@ -309,26 +276,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45
 	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33
 	waitdooranim
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E
 	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F
 	waitdooranim
 	return
@@ -410,10 +377,7 @@ BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
 
 BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -421,10 +385,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
 
 BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 9b9fb4537..3fb94a075 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -19,10 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	setvar VAR_TEMP_0, 1
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
 	waitmovement 0
@@ -65,7 +62,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349
@@ -99,8 +96,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
@@ -120,9 +116,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452
@@ -151,13 +145,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	waitmessage
 	waitbuttonpress
 	fadescreen 1
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 2
 	special sub_80F9490
 	waitstate
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
-	special CallFrontierUtilFunc
+	frontier_resetsketch
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 	setvar VAR_0x8004, 2
@@ -185,9 +178,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540
@@ -208,13 +199,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
 	return
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
+	frontier_getbrainstatus
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
-	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
+	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3
 	return
 
@@ -242,9 +232,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	setvar VAR_TEMP_0, 1
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT
 	special LoadPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
@@ -256,9 +244,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634
 	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index d3cecf3bb..5e41c7ddb 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -5,22 +5,20 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
 	.byte 0
 
 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
-	special CallFrontierUtilFunc
+	frontier_settrainers
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
 	compare VAR_RESULT, FEMALE
 	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
+	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
 	end
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_242170
+	call BattleFrontier_EventScript_SetBrainObjectGfx
 	setobjectxyperm 2, 7, 9
 	end
 
@@ -85,10 +83,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
 	setvar VAR_0x8005, 0
@@ -99,10 +94,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
 @ 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
 
@@ -110,54 +102,38 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 3
 	special CallBattleFactoryFunction
-	compare VAR_RESULT, 9999
+	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 3
 	special CallBattleFactoryFunction
-
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA
-
+	call BattleFrontier_EventScript_IncrementWinStreak
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
 	setvar VAR_0x8006, 1
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
 	waitstate
-
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
 	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051
-	case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
-	case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
@@ -166,8 +142,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT
@@ -178,22 +153,16 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
 	message BattleFrontier_BattleFactoryBattleRoom_Text_25B460
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
@@ -202,8 +171,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT
@@ -214,17 +182,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
 	message BattleFrontier_BattleFactoryBattleRoom_Text_25B640
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
 	setvar VAR_0x8005, 0
@@ -236,7 +200,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 3
 	special CallBattleFactoryFunction
-	compare VAR_RESULT, 9999
+	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
@@ -246,16 +210,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
 	special CallBattleFactoryFunction
-	compare VAR_RESULT, 9999
+	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
 	addvar VAR_RESULT, 1
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
 	end
@@ -292,7 +254,7 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
 	waitstate
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index 9bb3a9313..42b0cbef0 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -14,15 +14,14 @@ BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
 
 BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleFactoryLobby_EventScript_25843A
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleFactoryLobby_EventScript_258592
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleFactoryLobby_EventScript_25849B
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleFactoryLobby_EventScript_258506
 	.2byte 0
 
 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
@@ -43,18 +42,14 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
 BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT
@@ -67,13 +62,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
 
 BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
 	msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleFactoryLobby_Text_259323
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
@@ -87,8 +80,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_258CC7
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
@@ -113,8 +105,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_258582
 
 BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D
-	call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4
-
+	call BattleFrontier_EventScript_SaveBattle
 BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT
 	closemessage
@@ -131,10 +122,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
 	special CallBattleFactoryFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	setvar VAR_0x8006, 2
 	goto BattleFrontier_BattleFactoryLobby_EventScript_25871A
@@ -142,28 +130,28 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
 BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 4
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
 	end
 
 BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
-	setvar VAR_FRONTIER_FACILITY, 4
-	setvar VAR_FRONTIER_BATTLE_MODE, 1
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
 	end
 
 BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
 	special SavePlayerParty
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA
 
 BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
@@ -178,12 +166,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleFactoryLobby_EventScript_25879D
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleFactoryLobby_EventScript_25879A
@@ -194,18 +179,12 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, 0
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	closemessage
 	delay 2
 	call Common_EventScript_SaveGame
@@ -218,9 +197,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT
 	closemessage
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762
 	applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC
@@ -239,22 +218,18 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
 	return
 
 BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8
 	goto BattleFrontier_BattleFactoryLobby_EventScript_258606
 
 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
 
 BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
 	special LoadPlayerParty
-
 BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT
 	release
@@ -300,10 +275,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8
 
 BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -311,10 +283,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
 
 BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index 92bd2e9bd..ed4346fb6 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -54,7 +54,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT
 	closemessage
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
 	compare VAR_RESULT, 1
@@ -73,11 +73,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_getbrainstatus
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
-	playse 263
+	playse SE_TOREEYE
 	waitse
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT
 	closemessage
@@ -94,15 +93,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_getbrainstatus
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
 	compare VAR_RESULT, 2
@@ -144,7 +140,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38
@@ -231,8 +227,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
@@ -240,10 +235,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
 	setvar VAR_0x8004, 10
 	setvar VAR_0x8005, 0
 	special CallBattleFactoryFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	special CalculatePlayerPartyCount
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index aff551837..c3061b8cf 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -5,8 +5,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
 	.byte 0
 
 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
-	special CallFrontierUtilFunc
+	frontier_settrainers
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
 	end
 
@@ -34,19 +33,14 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
 	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
 	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
 	waitmovement 0
 	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
@@ -68,22 +62,14 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	call BattleFrontier_EventScript_IncrementWinStreak
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7
@@ -95,22 +81,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
+	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
 	compare VAR_RESULT, 2
@@ -152,7 +133,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4
@@ -178,10 +159,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
@@ -193,8 +171,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
@@ -226,7 +203,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170
+	call BattleFrontier_EventScript_SetBrainObjectGfx
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
@@ -241,19 +218,14 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2
 	waitmovement 0
 	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A
-	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
-	case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
@@ -264,8 +236,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	setvar VAR_0x8004, 6
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT
@@ -276,8 +247,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	applymovement 2, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
@@ -287,16 +257,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
@@ -307,8 +272,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	setvar VAR_0x8004, 6
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT
@@ -319,8 +283,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	message BattleFrontier_BattlePalaceBattleRoom_Text_250699
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	applymovement 2, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
@@ -333,20 +296,15 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7
 VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
 	closemessage
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
-	special CallFrontierUtilFunc
+	frontier_restorehelditems
 	special HealPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
-	special CallFrontierUtilFunc
+	frontier_resetsketch
 	return
 
 BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34
@@ -460,7 +418,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
 	waitstate
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
index a6116d3dc..d9ef07f14 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -25,10 +25,8 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
 	compare VAR_RESULT, 4
 	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 1
+	frontier_get FRONTIER_DATA_LVL_MODE
+	compare VAR_RESULT, FRONTIER_LVL_OPEN
 	goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
 	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 7da76531d..2d48199e5 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -14,15 +14,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
 
 BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePalaceLobby_EventScript_24D908
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePalaceLobby_EventScript_24D817
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePalaceLobby_EventScript_24D873
 	.2byte 0
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
@@ -37,18 +36,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT
@@ -59,8 +54,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePalaceLobby_Text_24E4F7
 	waitmessage
@@ -87,8 +81,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 7
@@ -108,8 +101,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24D907
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902
-	call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4
-
+	call BattleFrontier_EventScript_SaveBattle
 BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907
 	return
 
@@ -123,26 +115,23 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
 	special CallBattlePalaceFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 2
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 2
-	setvar VAR_FRONTIER_BATTLE_MODE, 1
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
 	end
 
@@ -153,15 +142,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
 	special SavePlayerParty
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
@@ -176,19 +165,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 3
 	special sub_80F9490
@@ -203,23 +188,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, 0
 	special CallBattlePalaceFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattlePalaceFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -230,9 +207,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC
@@ -242,7 +217,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
@@ -253,8 +228,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB60
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D
+	case FRONTIER_LVL_50, BattleFrontier_BattlePalaceLobby_EventScript_24DB60
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, MSGBOX_DEFAULT
@@ -265,10 +240,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
@@ -298,24 +270,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
 	return
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC23
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29
 	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47
 	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35
 	waitdooranim
 	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
 	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC41
 	waitdooranim
 	return
@@ -361,10 +333,7 @@ BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_SINGLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -372,10 +341,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index cef06f1be..7597fa0ef 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -9,29 +9,21 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
 
 BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
 	delay 16
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, 1
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
-	setvar VAR_0x8005, 1
-	special CallBattlePikeFunction
+	battlepike_nohealing TRUE
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
 	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
 	waitmovement 0
 	lockall
-	msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 99
-	special CallFrontierUtilFunc
-	call BattleFrontier_BattlePikeCorridor_EventScript_25BB49
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
+	call BattleFrontier_BattlePike_EventScript_CloseCurtain
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
 	waitstate
 	end
@@ -63,7 +55,7 @@ BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817
+BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun: @ 825C817
 	.string "Your Battle Choice challenge\n"
 	.string "has now begun…$"
 
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index b06d90200..af2fa0125 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -5,9 +5,9 @@ BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
 
 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_25B710
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_25B762
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_25B806
 	.2byte 0
 
 BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
@@ -20,8 +20,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
@@ -31,26 +30,19 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
 	lockall
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattlePikeFunction
+	battlepike_setstreak 0
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT
@@ -63,11 +55,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
 
 BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattlePikeFunction
@@ -97,12 +87,8 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	lockall
 	message BattleFrontier_BattlePikeLobby_Text_25C146
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_checkairshow
+	frontier_set FRONTIER_DATA_BATTLE_NUM, 0
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
@@ -125,8 +111,8 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 5
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PIKE
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, MSGBOX_DEFAULT
 
@@ -145,19 +131,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_25BA76
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C094, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattlePikeLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 3
 	special sub_80F9490
@@ -173,25 +155,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	setvar VAR_TEMP_0, 0
 	setvar VAR_TEMP_1, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 1
 	special CallBattlePikeFunction
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -202,16 +176,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
-	special CallFrontierUtilFunc
+	frontier_settrainers
 	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
 	special HealPlayerParty
-	call BattleFrontier_BattlePikeLobby_EventScript_25BB49
+	call BattleFrontier_BattlePike_EventScript_CloseCurtain
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
@@ -223,8 +194,8 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA42
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F
+	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_25BA42
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_25BA4F
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42
 	msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, MSGBOX_DEFAULT
@@ -235,27 +206,20 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F
 	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
 	special LoadPlayerParty
-
 BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76
 	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
-
 BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E
 	release
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 5
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_PIKE
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -325,10 +289,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47
 	releaseall
 	end
 
-BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49
-BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49
+BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
 	playse SE_CURTAIN
 	special CloseBattlePikeCurtain
 	waitstate
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
deleted file mode 100644
index 51dc3fcaf..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+++ /dev/null
@@ -1,895 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
-	.byte 0
-
-BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
-	special CallBattlePikeFunction
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E
-	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605
-	case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231
-	case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E
-	case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
-	lockall
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
-	setvar VAR_0x8005, 0
-	special CallBattlePikeFunction
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	closemessage
-	releaseall
-	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
-	setvar VAR_0x8005, 0
-	special DoSpecialTrainerBattle
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
-	lockall
-	delay 16
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, MSGBOX_DEFAULT
-	waitmessage
-	closemessage
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
-	setvar VAR_0x8005, 0
-	special CallBattlePikeFunction
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	closemessage
-	releaseall
-	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
-	setvar VAR_0x8005, 0
-	special DoSpecialTrainerBattle
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6
-	waitmovement 0
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, MSGBOX_DEFAULT
-	closemessage
-	release
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
-	delay 22
-	lockall
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
-	special CallBattlePikeFunction
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA
-	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT
-	closemessage
-	special SpawnCameraObject
-	applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2
-	waitmovement 0
-	playse 267
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D
-	delay 4
-	waitse
-	delay 60
-	playse 268
-	delay 65
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4
-	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A
-	waitse
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
-	special CallBattlePikeFunction
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
-	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
-	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT
-	waitmessage
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT
-	closemessage
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT
-	waitmessage
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25E118
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT
-	closemessage
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA
-	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
-	setvar VAR_0x8005, 1
-	special CallBattlePikeFunction
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallBattlePikeFunction
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E
-	lockall
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
-	waitmovement 0
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6
-	waitmessage
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, MSGBOX_DEFAULT
-	closemessage
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	releaseall
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
-	lockall
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA
-	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
-	setvar VAR_0x8005, 0
-	special CallBattlePikeFunction
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	closemessage
-	delay 16
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
-	setvar VAR_0x8005, 1
-	special CallBattlePikeFunction
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	closemessage
-	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE
-	setvar VAR_0x8005, 0
-	special DoSpecialTrainerBattle
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4
-	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
-	lockall
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA
-	waitmovement 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
-	special CallBattlePikeFunction
-	copyvar VAR_0x8004, VAR_RESULT
-	compare VAR_0x8004, 0
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
-	compare VAR_0x8004, 1
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT
-	closemessage
-	releaseall
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, MSGBOX_DEFAULT
-	closemessage
-	waitse
-	playmoncry SPECIES_KIRLIA, 0
-	waitmoncry
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
-	special CallBattlePikeFunction
-	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
-	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758
-	compare VAR_RESULT, 3
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
-	compare VAR_RESULT, 4
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
-	special CallBattlePikeFunction
-	waitstate
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KIRLIA, 0
-	waitmoncry
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT
-	waitse
-	playmoncry SPECIES_KIRLIA, 0
-	waitmoncry
-	closemessage
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
-	waitmovement 0
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, MSGBOX_DEFAULT
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, MSGBOX_DEFAULT
-	closemessage
-	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
-	waitmoncry
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
-	special CallBattlePikeFunction
-	compare VAR_RESULT, 0
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
-	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
-	special CallBattlePikeFunction
-	waitstate
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
-	waitmoncry
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT
-	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
-	waitmoncry
-	closemessage
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
-	waitmovement 0
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, MSGBOX_DEFAULT
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC20
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758:: @ 825D758
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC63
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F:: @ 825D75F
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC49
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766:: @ 825D766
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC33
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D:: @ 825D76D
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC97
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
-	waitmovement 0
-	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
-	setvar VAR_0x8005, 0
-	special DoSpecialTrainerBattle
-	waitstate
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4
-	walk_down
-	face_left
-	delay_16
-	delay_16
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_left
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1
-	face_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3
-	walk_left
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6
-	walk_down
-	walk_down
-	walk_right
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB
-	face_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF
-	face_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1
-	walk_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3
-	walk_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA
-	face_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7
-	set_visible
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
-	walk_left
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
-	special CallBattlePikeFunction
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B
-	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831
-	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
-	lock
-	faceplayer
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
-	special CallBattlePikeFunction
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	closemessage
-	release
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, MSGBOX_DEFAULT
-	closemessage
-	release
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
-	special CallBattlePikeFunction
-	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
-	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT
-	closemessage
-	release
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, MSGBOX_DEFAULT
-	closemessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, MSGBOX_DEFAULT
-	closemessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, MSGBOX_DEFAULT
-	closemessage
-	release
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4
-	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
-	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
-	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
-	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1
-	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1
-	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0
-	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7
-	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
-	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
-	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
-	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1
-	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1
-	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0
-	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A
-	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
-	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
-	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
-	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1
-	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1
-	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0
-	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D
-	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
-	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
-	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
-	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1
-	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1
-	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0
-	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6
-	.string "Welcome…\n"
-	.string "You must be commended for your luck…\p"
-	.string "Your POKéMON shall be restored\n"
-	.string "to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13
-	.string "I urge you to enjoy the rest of your\n"
-	.string "Battle Choice challenge…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51
-	.string "Ah, you're a lucky one.\n"
-	.string "I'm in somewhat-good spirits now.\p"
-	.string "I will restore one of your POKéMON\n"
-	.string "to full health.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE
-	.string "The best of luck to you.\n"
-	.string "Farewell.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1
-	.string "Excuse me…\p"
-	.string "Would you care for a battle?\n"
-	.string "I'll restore your POKéMON if you win.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F
-	.string "Very well…\n"
-	.string "Now, shall we?$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DB49: @ 825DB49
-	.string "I see…\n"
-	.string "How unsporting of you…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DB67: @ 825DB67
-	.string "Magnificent…\p"
-	.string "As promised, I shall restore your\n"
-	.string "POKéMON to full health.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DBAE: @ 825DBAE
-	.string "The best of luck to you.\n"
-	.string "Farewell.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1: @ 825DBD1
-	.string "Oh, my!\p"
-	.string "Watch out!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4: @ 825DBE4
-	.string "Now, now!\n"
-	.string "KIRLIA, stop that!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC01: @ 825DC01
-	.string "Now, now!\n"
-	.string "DUSCLOPS, stop that!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC20: @ 825DC20
-	.string "KIRLIA used TOXIC!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC33: @ 825DC33
-	.string "KIRLIA used HYPNOSIS!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC49: @ 825DC49
-	.string "KIRLIA used THUNDER WAVE!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC63: @ 825DC63
-	.string "KIRLIA used WILL-O-WISP!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C: @ 825DC7C
-	.string "DUSCLOPS used WILL-O-WISP!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97
-	.string "DUSCLOPS used ICE BEAM!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF
-	.string "Look here!\n"
-	.string "That's quite enough!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF
-	.string "I must apologize to you…\p"
-	.string "My KIRLIA has a TIMID nature…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DD06: @ 825DD06
-	.string "I must apologize to you…\p"
-	.string "My DUSCLOPS has a TIMID nature…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F: @ 825DD3F
-	.string "It attacks without warning if it is\n"
-	.string "startled by another person…\p"
-	.string "Are you and your POKéMON all right?$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3: @ 825DDA3
-	.string "I do apologize for what happened…\n"
-	.string "I do hope your POKéMON are fine.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6: @ 825DDE6
-	.string "… … … … … …\n"
-	.string "… … … … … …$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE: @ 825DDFE
-	.string "Welcome…\p"
-	.string "Here, we will have you battle\n"
-	.string "a somewhat-tough TRAINER…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F: @ 825DE3F
-	.string "How wonderful…\p"
-	.string "To honor your victory, your POKéMON\n"
-	.string "shall be restored to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DE94: @ 825DE94
-	.string "I urge you to enjoy the rest of your\n"
-	.string "Battle Choice challenge…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2
-	.string "I am LUCY…\n"
-	.string "I am the law here…\l"
-	.string "For I am the PIKE QUEEN…\p"
-	.string "You already know it, but to advance,\n"
-	.string "you must defeat me…\p"
-	.string "…I'm not one for idle chatter.\n"
-	.string "Hurry. Come on…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71
-	.string "Your luck…\n"
-	.string "I hope you didn't use it all up here…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2
-	.string "LUCY: … … … … … …\n"
-	.string "Show me your FRONTIER PASS…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0
-	.string "The Luck Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003
-	.string "…That's all there is…\n"
-	.string "Disappear already…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C
-	.string "LUCY: …You again…\p"
-	.string "… … … … … …\p"
-	.string "…I've trampled flowers and braved\n"
-	.string "storms to get to where I am…\p"
-	.string "I don't feel any compulsion to keep\n"
-	.string "losing to the same opponent…\p"
-	.string "… … … … … …\n"
-	.string "Fine… I'll do it…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8
-	.string "Now!\n"
-	.string "Come on!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6: @ 825E0F6
-	.string "LUCY: … … … … … …\p"
-	.string "…FRONTIER PASS…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118
-	.string "The Luck Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140
-	.string "…You, I won't forget…\n"
-	.string "…Ever…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D
-	.string "I welcome you…\p"
-	.string "Giggle…\n"
-	.string "You seem to be bereft of luck…\p"
-	.string "If only you hadn't chosen this room,\n"
-	.string "your POKéMON could have been healed…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD
-	.string "I welcome you…\p"
-	.string "Since you have chosen this room, I will\n"
-	.string "restore one POKéMON to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E238: @ 825E238
-	.string "I welcome you…\p"
-	.string "Since you have chosen this room, I will\n"
-	.string "restore two POKéMON to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E293: @ 825E293
-	.string "I welcome you…\p"
-	.string "Giggle…\n"
-	.string "You should thank your lucky stars…\p"
-	.string "Since you have chosen this room,\n"
-	.string "all your POKéMON will be restored…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311
-	.string "I shall go fetch our master…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E
-	.string "Ah, you're a lucky one!\n"
-	.string "I'm in good spirits now.\p"
-	.string "I will restore two of your POKéMON\n"
-	.string "to full health!$"
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
deleted file mode 100644
index 1480ec530..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
-	.byte 0
-
-BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB
-	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
-	lockall
-	msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, MSGBOX_DEFAULT
-	closemessage
-	releaseall
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
-	setvar VAR_TEMP_4, 1
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
-	end
-
-BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2
-	.string "Congratulations…\n"
-	.string "Now, this way, please…$"
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
deleted file mode 100644
index 59731f74d..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
-	.byte 0
-
-BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C
-	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
-	special CallBattlePikeFunction
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
-	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
-	setvar VAR_TEMP_4, 1
-	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
-	call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 5
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
-	compare VAR_RESULT, 3
-	goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3
-	setvar VAR_TEMP_1, 1
-	end
-
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json
index 1ae60e075..3b44e85fe 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2",
-  "name": "BattleFrontier_BattlePikeRandomRoom2",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2",
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
+  "name": "BattleFrontier_BattlePikeRoomFinal",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
   "music": "MUS_B_TUBE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
new file mode 100644
index 000000000..2863ea072
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
@@ -0,0 +1,40 @@
+BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomFinal_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomFinal_OnWarp
+	.byte 0
+
+BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7
+	.2byte 0
+
+BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB
+	waitmovement 0
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
+	lockall
+	msgbox BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease, MSGBOX_DEFAULT
+	closemessage
+	releaseall
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB: @ 825E3DB
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth
+	.2byte 0
+
+BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8
+	setvar VAR_TEMP_4, 1
+	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	end
+
+BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2
+	.string "Congratulations…\n"
+	.string "Now, this way, please…$"
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
index 339a2ab09..11cbd866e 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1",
-  "name": "BattleFrontier_BattlePikeRandomRoom1",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1",
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
+  "name": "BattleFrontier_BattlePikeRoomNormal",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
   "music": "MUS_B_TUBE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED",
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D",
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D",
       "flag": "0"
     }
   ],
@@ -50,7 +50,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_Exit"
     },
     {
       "type": "trigger",
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
     },
     {
       "type": "trigger",
@@ -77,7 +77,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
     },
     {
       "type": "trigger",
@@ -86,7 +86,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
     },
     {
       "type": "trigger",
@@ -95,7 +95,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
     },
     {
       "type": "trigger",
@@ -104,7 +104,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
new file mode 100644
index 000000000..05331d07d
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -0,0 +1,870 @@
+BattleFrontier_BattlePikeRoomNormal_MapScripts:: @ 825D152
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomNormal_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
+	.byte 0
+
+BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D171
+	.2byte 0
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D171:: @ 825D171
+	setvar VAR_TEMP_0, 1
+	battlepike_getroomtype
+	switch VAR_RESULT
+	case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6
+	case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E
+	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D605
+	case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D231
+	case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E
+	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6
+	lockall
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
+	setvar VAR_0x8005, 0
+	special CallBattlePikeFunction
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	waitmessage
+	closemessage
+	releaseall
+	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
+	setvar VAR_0x8005, 0
+	special DoSpecialTrainerBattle
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D226
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A:: @ 825D20A
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D226:: @ 825D226
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D231:: @ 825D231
+	lockall
+	delay 16
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDFE, MSGBOX_DEFAULT
+	waitmessage
+	closemessage
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
+	setvar VAR_0x8005, 0
+	special CallBattlePikeFunction
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	waitmessage
+	closemessage
+	releaseall
+	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
+	setvar VAR_0x8005, 0
+	special DoSpecialTrainerBattle
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D285
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D285:: @ 825D285
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B6
+	waitmovement 0
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DE3F, MSGBOX_DEFAULT
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DE94, MSGBOX_DEFAULT
+	closemessage
+	release
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF:: @ 825D2BF
+	delay 22
+	lockall
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
+	special CallBattlePikeFunction
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA
+	case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4FC
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E311, MSGBOX_DEFAULT
+	closemessage
+	special SpawnCameraObject
+	applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2
+	waitmovement 0
+	playse 267
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7
+	delay 4
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4
+	delay 4
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D
+	delay 4
+	waitse
+	delay 60
+	playse 268
+	delay 65
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4
+	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
+	delay 4
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7
+	delay 4
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A
+	waitse
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
+	special CallBattlePikeFunction
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416
+	case 3, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
+	case 4, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
+	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DED2, MSGBOX_DEFAULT
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD:: @ 825D3BD
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DF71, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B
+	compare VAR_RESULT, 1
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D3DA
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D3DA:: @ 825D3DA
+	frontier_getsymbols
+	compare VAR_RESULT, 0
+	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DFA2, MSGBOX_DEFAULT
+	waitmessage
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DFD0
+	waitmessage
+	waitfanfare
+	frontier_givesymbol
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E003, MSGBOX_DEFAULT
+	closemessage
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D416:: @ 825D416
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
+	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D443
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E02C, MSGBOX_DEFAULT
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D443:: @ 825D443
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E0E8, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B
+	compare VAR_RESULT, 1
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D460
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D460:: @ 825D460
+	frontier_getsymbols
+	compare VAR_RESULT, 2
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E0F6, MSGBOX_DEFAULT
+	waitmessage
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePikeRoomNormal_Text_25E118
+	waitmessage
+	waitfanfare
+	frontier_givesymbol
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E140, MSGBOX_DEFAULT
+	closemessage
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA
+	waitmovement 0
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC
+	waitmovement 0
+	battlepike_getstreak
+	addvar VAR_RESULT, 1
+	battlepike_setstreak VAR_RESULT
+	call BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC:: @ 825D4DC
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E15D, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA:: @ 825D4EA
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E1DD, MSGBOX_DEFAULT
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D4FC:: @ 825D4FC
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E238, MSGBOX_DEFAULT
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E:: @ 825D50E
+	lockall
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
+	waitmovement 0
+	message BattleFrontier_BattlePikeRoomNormal_Text_25D9B6
+	waitmessage
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DA13, MSGBOX_DEFAULT
+	closemessage
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+	waitmovement 0
+	releaseall
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E
+	lockall
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C1
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C3
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA
+	waitmovement 0
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
+	setvar VAR_0x8005, 0
+	special CallBattlePikeFunction
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	closemessage
+	delay 16
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
+	setvar VAR_0x8005, 1
+	special CallBattlePikeFunction
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	closemessage
+	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE
+	setvar VAR_0x8005, 0
+	special DoSpecialTrainerBattle
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC:: @ 825D5DC
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4
+	waitmovement 0
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D605:: @ 825D605
+	lockall
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DBD1
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA
+	waitmovement 0
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
+	special CallBattlePikeFunction
+	copyvar VAR_0x8004, VAR_RESULT
+	compare VAR_0x8004, 0
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D643
+	compare VAR_0x8004, 1
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD3F, MSGBOX_DEFAULT
+	closemessage
+	releaseall
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D643:: @ 825D643
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DBE4, MSGBOX_DEFAULT
+	closemessage
+	waitse
+	playmoncry SPECIES_KIRLIA, 0
+	waitmoncry
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
+	special CallBattlePikeFunction
+	compare VAR_RESULT, 2
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D751
+	compare VAR_RESULT, 1
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D758
+	compare VAR_RESULT, 3
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F
+	compare VAR_RESULT, 4
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D766
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
+	special CallBattlePikeFunction
+	waitstate
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KIRLIA, 0
+	waitmoncry
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCAF, MSGBOX_DEFAULT
+	waitse
+	playmoncry SPECIES_KIRLIA, 0
+	waitmoncry
+	closemessage
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4
+	waitmovement 0
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCCF, MSGBOX_DEFAULT
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5:: @ 825D6D5
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DC01, MSGBOX_DEFAULT
+	closemessage
+	waitse
+	playmoncry SPECIES_DUSCLOPS, 0
+	waitmoncry
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
+	special CallBattlePikeFunction
+	compare VAR_RESULT, 0
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D
+	compare VAR_RESULT, 1
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D774
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
+	special CallBattlePikeFunction
+	waitstate
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_DUSCLOPS, 0
+	waitmoncry
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCAF, MSGBOX_DEFAULT
+	waitse
+	playmoncry SPECIES_DUSCLOPS, 0
+	waitmoncry
+	closemessage
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4
+	waitmovement 0
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD06, MSGBOX_DEFAULT
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D751:: @ 825D751
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DC20
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D758:: @ 825D758
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DC63
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F:: @ 825D75F
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DC49
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D766:: @ 825D766
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DC33
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D:: @ 825D76D
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DC97
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D774:: @ 825D774
+	message BattleFrontier_BattlePikeRoomNormal_Text_25DC7C
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B:: @ 825D77B
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC
+	waitmovement 0
+	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
+	setvar VAR_0x8005, 0
+	special DoSpecialTrainerBattle
+	waitstate
+	return
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D795: @ 825D795
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D798: @ 825D798
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D79E: @ 825D79E
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2: @ 825D7A2
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4: @ 825D7A4
+	walk_down
+	face_left
+	delay_16
+	delay_16
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA: @ 825D7AA
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_left
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1: @ 825D7B1
+	face_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3: @ 825D7B3
+	walk_left
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7B4: @ 825D7B4
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7B6: @ 825D7B6
+	walk_down
+	walk_down
+	walk_right
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB: @ 825D7BB
+	face_left
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD: @ 825D7BD
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF: @ 825D7BF
+	face_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7C1: @ 825D7C1
+	walk_right
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7C3: @ 825D7C3
+	walk_left
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5: @ 825D7C5
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8: @ 825D7C8
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA: @ 825D7CA
+	face_left
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC: @ 825D7CC
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4: @ 825D7D4
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC: @ 825D7DC
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF: @ 825D7DF
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2: @ 825D7E2
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7: @ 825D7E7
+	set_visible
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA: @ 825D7EA
+	walk_left
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED
+	battlepike_getroomtype
+	switch VAR_RESULT
+	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B
+	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D831
+	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B:: @ 825D81B
+	lock
+	faceplayer
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
+	special CallBattlePikeFunction
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	waitmessage
+	closemessage
+	release
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D831:: @ 825D831
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDA3, MSGBOX_DEFAULT
+	closemessage
+	release
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E:: @ 825D83E
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
+	special CallBattlePikeFunction
+	compare VAR_RESULT, 2
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D881
+	compare VAR_RESULT, 1
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D875
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DABE, MSGBOX_DEFAULT
+	closemessage
+	release
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D79E
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D875:: @ 825D875
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DA51, MSGBOX_DEFAULT
+	closemessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D881:: @ 825D881
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E32E, MSGBOX_DEFAULT
+	closemessage
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D:: @ 825D88D
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDE6, MSGBOX_DEFAULT
+	closemessage
+	release
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B4
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4:: @ 825D8A4
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7:: @ 825D8E7
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A:: @ 825D92A
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D:: @ 825D96D
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0: @ 825D9B0
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Movement_25D9B3: @ 825D9B3
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRoomNormal_Text_25D9B6: @ 825D9B6
+	.string "Welcome…\n"
+	.string "You must be commended for your luck…\p"
+	.string "Your POKéMON shall be restored\n"
+	.string "to full health…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DA13: @ 825DA13
+	.string "I urge you to enjoy the rest of your\n"
+	.string "Battle Choice challenge…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DA51: @ 825DA51
+	.string "Ah, you're a lucky one.\n"
+	.string "I'm in somewhat-good spirits now.\p"
+	.string "I will restore one of your POKéMON\n"
+	.string "to full health.$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DABE: @ 825DABE
+	.string "The best of luck to you.\n"
+	.string "Farewell.$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DAE1: @ 825DAE1
+	.string "Excuse me…\p"
+	.string "Would you care for a battle?\n"
+	.string "I'll restore your POKéMON if you win.$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DB2F: @ 825DB2F
+	.string "Very well…\n"
+	.string "Now, shall we?$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DB49: @ 825DB49
+	.string "I see…\n"
+	.string "How unsporting of you…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DB67: @ 825DB67
+	.string "Magnificent…\p"
+	.string "As promised, I shall restore your\n"
+	.string "POKéMON to full health.$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DBAE: @ 825DBAE
+	.string "The best of luck to you.\n"
+	.string "Farewell.$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DBD1: @ 825DBD1
+	.string "Oh, my!\p"
+	.string "Watch out!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DBE4: @ 825DBE4
+	.string "Now, now!\n"
+	.string "KIRLIA, stop that!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC01: @ 825DC01
+	.string "Now, now!\n"
+	.string "DUSCLOPS, stop that!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC20: @ 825DC20
+	.string "KIRLIA used TOXIC!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC33: @ 825DC33
+	.string "KIRLIA used HYPNOSIS!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC49: @ 825DC49
+	.string "KIRLIA used THUNDER WAVE!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC63: @ 825DC63
+	.string "KIRLIA used WILL-O-WISP!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC7C: @ 825DC7C
+	.string "DUSCLOPS used WILL-O-WISP!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DC97: @ 825DC97
+	.string "DUSCLOPS used ICE BEAM!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DCAF: @ 825DCAF
+	.string "Look here!\n"
+	.string "That's quite enough!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DCCF: @ 825DCCF
+	.string "I must apologize to you…\p"
+	.string "My KIRLIA has a TIMID nature…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DD06: @ 825DD06
+	.string "I must apologize to you…\p"
+	.string "My DUSCLOPS has a TIMID nature…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DD3F: @ 825DD3F
+	.string "It attacks without warning if it is\n"
+	.string "startled by another person…\p"
+	.string "Are you and your POKéMON all right?$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DDA3: @ 825DDA3
+	.string "I do apologize for what happened…\n"
+	.string "I do hope your POKéMON are fine.$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DDE6: @ 825DDE6
+	.string "… … … … … …\n"
+	.string "… … … … … …$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DDFE: @ 825DDFE
+	.string "Welcome…\p"
+	.string "Here, we will have you battle\n"
+	.string "a somewhat-tough TRAINER…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DE3F: @ 825DE3F
+	.string "How wonderful…\p"
+	.string "To honor your victory, your POKéMON\n"
+	.string "shall be restored to full health…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DE94: @ 825DE94
+	.string "I urge you to enjoy the rest of your\n"
+	.string "Battle Choice challenge…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DED2: @ 825DED2
+	.string "I am LUCY…\n"
+	.string "I am the law here…\l"
+	.string "For I am the PIKE QUEEN…\p"
+	.string "You already know it, but to advance,\n"
+	.string "you must defeat me…\p"
+	.string "…I'm not one for idle chatter.\n"
+	.string "Hurry. Come on…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DF71: @ 825DF71
+	.string "Your luck…\n"
+	.string "I hope you didn't use it all up here…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DFA2: @ 825DFA2
+	.string "LUCY: … … … … … …\n"
+	.string "Show me your FRONTIER PASS…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25DFD0: @ 825DFD0
+	.string "The Luck Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E003: @ 825E003
+	.string "…That's all there is…\n"
+	.string "Disappear already…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E02C: @ 825E02C
+	.string "LUCY: …You again…\p"
+	.string "… … … … … …\p"
+	.string "…I've trampled flowers and braved\n"
+	.string "storms to get to where I am…\p"
+	.string "I don't feel any compulsion to keep\n"
+	.string "losing to the same opponent…\p"
+	.string "… … … … … …\n"
+	.string "Fine… I'll do it…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E0E8: @ 825E0E8
+	.string "Now!\n"
+	.string "Come on!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E0F6: @ 825E0F6
+	.string "LUCY: … … … … … …\p"
+	.string "…FRONTIER PASS…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E118: @ 825E118
+	.string "The Luck Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E140: @ 825E140
+	.string "…You, I won't forget…\n"
+	.string "…Ever…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E15D: @ 825E15D
+	.string "I welcome you…\p"
+	.string "Giggle…\n"
+	.string "You seem to be bereft of luck…\p"
+	.string "If only you hadn't chosen this room,\n"
+	.string "your POKéMON could have been healed…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E1DD: @ 825E1DD
+	.string "I welcome you…\p"
+	.string "Since you have chosen this room, I will\n"
+	.string "restore one POKéMON to full health…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E238: @ 825E238
+	.string "I welcome you…\p"
+	.string "Since you have chosen this room, I will\n"
+	.string "restore two POKéMON to full health…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E293: @ 825E293
+	.string "I welcome you…\p"
+	.string "Giggle…\n"
+	.string "You should thank your lucky stars…\p"
+	.string "Since you have chosen this room,\n"
+	.string "all your POKéMON will be restored…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E311: @ 825E311
+	.string "I shall go fetch our master…$"
+
+BattleFrontier_BattlePikeRoomNormal_Text_25E32E: @ 825E32E
+	.string "Ah, you're a lucky one!\n"
+	.string "I'm in good spirits now.\p"
+	.string "I will restore two of your POKéMON\n"
+	.string "to full health!$"
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
index a2a00a3a9..078ccd1df 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
-  "name": "BattleFrontier_BattlePikeRandomRoom3",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
+  "name": "BattleFrontier_BattlePikeRoomWildMons",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
   "music": "MUS_B_TUBE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174"
     },
     {
       "type": "trigger",
@@ -32,7 +32,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
     },
     {
       "type": "trigger",
@@ -41,7 +41,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
     },
     {
       "type": "trigger",
@@ -50,7 +50,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
     },
     {
       "type": "trigger",
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
     },
     {
       "type": "trigger",
@@ -77,7 +77,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
new file mode 100644
index 000000000..e12e51188
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
@@ -0,0 +1,45 @@
+BattleFrontier_BattlePikeRoomWildMons_MapScripts:: @ 825E41A
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466
+	.byte 0
+
+BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C
+	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A
+	.2byte 0
+
+BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C
+	setvar VAR_TEMP_0, 1
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
+	special CallBattlePikeFunction
+	end
+
+BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466: @ 825E466
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470
+	.2byte 0
+
+BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470:: @ 825E470
+	setvar VAR_TEMP_4, 1
+	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
+	end
+
+BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A: @ 825E47A
+	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
+	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
+	compare VAR_RESULT, B_OUTCOME_LOST
+	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3
+	compare VAR_RESULT, B_OUTCOME_DREW
+	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3
+	end
+
+BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3:: @ 825E4A3
+	setvar VAR_TEMP_1, 1
+	end
+
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
index eb8a3ce27..ca84f402b 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver",
       "flag": "0"
     }
   ],
@@ -50,7 +50,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp"
     },
     {
       "type": "trigger",
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp"
     },
     {
       "type": "trigger",
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index 49a5e58fb..e1d9da3de 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -1,18 +1,18 @@
 BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4
+BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4
 	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78
 	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
+BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887
 	.2byte 0
 
@@ -21,49 +21,37 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus:: @ 825C891
+	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: @ 825C89A
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	lockall
-	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75
+	message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
 	waitmessage
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
 	setvar VAR_0x8005, 1
 	special CallBattlePikeFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 99
-	special CallFrontierUtilFunc
+	frontier_settrainers
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Room number
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
 	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
@@ -77,54 +65,54 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
@@ -132,9 +120,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6
-	special CallFrontierUtilFunc
-	message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
+	frontier_saveparty
+	message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
 	waitmessage
 	special LoadPlayerParty
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
@@ -143,12 +130,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit, MSGBOX_YESNO
 	switch VAR_RESULT
 	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
 	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
@@ -157,7 +143,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
-	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C
+	message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
@@ -181,88 +167,86 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
 	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE
 	waitmovement 0
 	lockall
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent, MSGBOX_DEFAULT
 	releaseall
 	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5
 	waitmovement 0
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
-	special CallBattlePikeFunction
-	compare VAR_RESULT, 4
-	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
+	battlepike_gethint
+	compare VAR_RESULT, PIKE_HINT_BRAIN
+	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose, MSGBOX_YESNO
 	switch VAR_RESULT
-	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A
-	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
+	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID
 	special CallBattlePikeFunction
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46
-	case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53
+	case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint
+	case PIKE_ROOM_CENTER, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint
+	case PIKE_ROOM_RIGHT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint:: @ 825CB39
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint:: @ 825CB46
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
-	special CallBattlePikeFunction
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
+	battlepike_gethint
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4
-	case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE
-	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8
+	case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia
+	case PIKE_HINT_WHISPERING, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering
+	case PIKE_HINT_POKEMON, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon
+	case PIKE_HINT_PEOPLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia:: @ 825CB9A
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering:: @ 825CBA4
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon:: @ 825CBAE
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople:: @ 825CBB8
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint:: @ 825CBC2
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence, MSGBOX_DEFAULT
 	release
 	end
 
@@ -285,109 +269,107 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1: @ 825CBDD
 	.string "You are currently in\n"
 	.string "the 1st room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC00: @ 825CC00
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3: @ 825CC00
 	.string "You are currently in\n"
 	.string "the 3rd room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC23: @ 825CC23
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5: @ 825CC23
 	.string "You are currently in\n"
 	.string "the 5th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC46: @ 825CC46
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7: @ 825CC46
 	.string "You are currently in\n"
 	.string "the 7th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC69: @ 825CC69
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9: @ 825CC69
 	.string "You are currently in\n"
 	.string "the 9th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C: @ 825CC8C
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11: @ 825CC8C
 	.string "You are currently in\n"
 	.string "the 11th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0: @ 825CCB0
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13: @ 825CCB0
 	.string "You are currently in\n"
 	.string "the 13th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4: @ 825CCD4
+BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge: @ 825CCD4
 	.string "Will you continue with\n"
 	.string "your challenge?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB: @ 825CCFB
+BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit: @ 825CCFB
 	.string "Would you like to save your challenge\n"
 	.string "and quit the game for now?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C
+BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge: @ 825CD3C
 	.string "Do you wish to retire from your\n"
 	.string "Battle Choice challenge?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75
+BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume: @ 825CD75
 	.string "We've been awaiting your return…\p"
 	.string "Before resuming your Battle Choice\n"
 	.string "challenge, let me save the game…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA: @ 825CDDA
+BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge: @ 825CDDA
 	.string "Please do enjoy your Battle Choice\n"
 	.string "challenge…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CE08: @ 825CE08
+BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData: @ 825CE08
 	.string "I am saving your data…\n"
 	.string "A little time, please…$"
 
-BattleFrontier_BattlePikeRandomRoom1_Text_25CE36: @ 825CE36
-BattleFrontier_BattlePikeRandomRoom3_Text_25CE36: @ 825CE36
-BattleFrontier_BattlePikeThreePathRoom_Text_25CE36: @ 825CE36
+BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack: @ 825CE36
 	.string "The path is blocked!\n"
 	.string "And there is no turning back…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CE69: @ 825CE69
+BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose: @ 825CE69
 	.string "I beg your pardon, but…\p"
 	.string "Are you perhaps finding it difficult\n"
 	.string "to choose your path?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB: @ 825CEBB
+BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence: @ 825CEBB
 	.string "I see…\n"
 	.string "I apologize for my impertinence…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3: @ 825CEE3
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath: @ 825CEE3
 	.string "Ah, let me see… There is something\n"
 	.string "about the path on the right…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CF23: @ 825CF23
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath: @ 825CF23
 	.string "Ah, let me see… There is something\n"
 	.string "about the path in the center…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CF64: @ 825CF64
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath: @ 825CF64
 	.string "Ah, let me see… There is something\n"
 	.string "about the path on the left…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3: @ 825CFA3
+BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon: @ 825CFA3
 	.string "It seems to have the distinct aroma\n"
 	.string "of POKéMON wafting around it…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5: @ 825CFE5
+BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople: @ 825CFE5
 	.string "Is it… A TRAINER?\n"
 	.string "I sense the presence of people…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25D017: @ 825D017
+BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering: @ 825D017
 	.string "I seem to have heard something…\n"
 	.string "It may have been whispering…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25D054: @ 825D054
+BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga: @ 825D054
 	.string "For some odd reason, I felt a wave\n"
 	.string "of nostalgia coming from it…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25D094: @ 825D094
+BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent: @ 825D094
 	.string "I am sorry to say…\p"
 	.string "A terrifying event, yes, a horrible one,\n"
 	.string "is about to befall you…\p"
 	.string "I urge you to pay the utmost care\n"
 	.string "and prepare for the worst…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_25D125: @ 825D125
+BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence: @ 825D125
 	.string "From every path I sense a dreadful\n"
 	.string "presence…$"
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 1bcf1814a..02384c332 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -17,7 +17,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
 	setvar VAR_0x8006, 1
 	setvar VAR_0x8007, 55
 	setvar VAR_RESULT, 0
-
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
 	special CallBattlePyramidFunction
 	delay 2
@@ -40,32 +39,26 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	switch VAR_TEMP_0
 	case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
-	case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
-	case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 5
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 4
+	case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
+	case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
+	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
+	compare VAR_RESULT, B_OUTCOME_RAN
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
-	compare VAR_RESULT, 5
+	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
-	compare VAR_RESULT, 2
+	compare VAR_RESULT, B_OUTCOME_LOST
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	compare VAR_RESULT, 3
+	compare VAR_RESULT, B_OUTCOME_DREW
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	compare VAR_RESULT, 9
+	compare VAR_RESULT, B_OUTCOME_FORFEITED
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE
-	setvar VAR_0x8005, BATTLE_TYPE_TRAINER
-	special CallFrontierUtilFunc
+	frontier_isbattletype BATTLE_TYPE_TRAINER  @ VAR_RESULT seems to be ignored here
 	setvar VAR_TEMP_D, 1
-
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
 	special CallBattlePyramidFunction
@@ -73,10 +66,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
 BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 7
 	setvar VAR_0x8006, 255
@@ -100,15 +90,10 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_TEMP_F, 1
 	end
 
@@ -125,23 +110,15 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
 	return
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	call BattleFrontier_EventScript_IncrementWinStreak
+	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Floor number
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	compare VAR_RESULT, 7
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
 	waitstate
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 9f5560bfe..f3ae7137c 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -14,15 +14,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
 
 BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_250768
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_2508AC
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePyramidLobby_EventScript_2507B1
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_250852
 	.2byte 0
 
 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
@@ -40,18 +39,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT
@@ -59,14 +54,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
 
 BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT
-
 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
 	call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB
 	clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
 	special CallBattlePyramidFunction
@@ -76,8 +69,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	playse SE_EXPMAX
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
@@ -95,8 +87,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
 	special CallBattlePyramidFunction
@@ -129,8 +120,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC
 BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 6
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PYRAMID
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT
 
@@ -151,17 +142,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 3
 	special sub_80F9490
@@ -176,23 +163,15 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 
 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
 	special CallBattlePyramidFunction
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
 	special CallBattlePyramidFunction
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
@@ -207,16 +186,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattlePyramidLobby_EventScript_250D56
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
 	special HealPlayerParty
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
@@ -230,8 +204,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250A90
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D
+	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_250A90
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_250A9D
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT
@@ -242,18 +216,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
 	special LoadPlayerParty
-
 BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4
 	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT
-
 BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
 	release
 	end
@@ -424,9 +393,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 6
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_PYRAMID
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -447,7 +414,6 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT
-
 BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
 	message BattleFrontier_BattlePyramidLobby_Text_25161E
 	waitmessage
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 1d0bcf395..00a30b0e7 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -28,28 +28,23 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
 	end
 
 BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_getbrainstatus
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
-	call BattleFrontier_BattlePyramidTop_EventScript_242170
-
+	call BattleFrontier_EventScript_SetBrainObjectGfx
 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
 	copyvar VAR_TEMP_C, VAR_RESULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	switch VAR_TEMP_0
 	case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
-	case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
-	case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 5
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 2
+	case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidTop_EventScript_252B66
+	case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_255193
+	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
+	compare VAR_RESULT, B_OUTCOME_LOST
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	compare VAR_RESULT, 3
+	compare VAR_RESULT, B_OUTCOME_DREW
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	compare VAR_RESULT, 9
+	compare VAR_RESULT, B_OUTCOME_FORFEITED
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
 	end
 
@@ -73,15 +68,10 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
 	setvar VAR_0x8005, 1
 	special CallBattlePyramidFunction
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
 	special CallBattlePyramidFunction
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_TEMP_F, 1
 	end
 
@@ -90,7 +80,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
 	faceplayer
 	compare VAR_TEMP_D, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236
-	compare VAR_TEMP_C, 0
+	compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240
 	msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT
 	closemessage
@@ -107,10 +97,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
 	closemessage
 
 BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
 	end
@@ -130,22 +117,18 @@ BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240
 BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
 	lockall
 	switch VAR_TEMP_C
-	case 2, BattleFrontier_BattlePyramidTop_EventScript_255335
-	case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0
-	case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_255335
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_2552D0
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_255388
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT
@@ -165,8 +148,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
 	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
 
 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A
 	msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT
@@ -174,25 +156,20 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
 	message BattleFrontier_BattlePyramidTop_Text_2558E9
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
 
 BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT
@@ -212,8 +189,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
 	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
 
 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
 	msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT
@@ -221,8 +197,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
 	message BattleFrontier_BattlePyramidTop_Text_255B59
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
 
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index 446ec7702..4334eb223 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -20,9 +20,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
 	setvar VAR_TEMP_0, 1
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
 	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
@@ -30,10 +28,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
 	waitmovement 0
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
@@ -49,14 +44,10 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
 	waitmessage
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F
-
+	case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
@@ -65,7 +56,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
+	call BattleFrontier_EventScript_IncrementWinStreak
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
 	special CallBattleTowerFunc
 	switch VAR_RESULT
@@ -73,9 +64,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
 	waitmovement 0
 	removeobject 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_getbrainstatus
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
 	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
 	waitmovement 0
@@ -87,14 +77,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	special HealPlayerParty
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9
-	special CallFrontierUtilFunc
+	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
@@ -125,7 +112,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C
@@ -153,10 +140,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
@@ -168,13 +152,12 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
 	message BattleFrontier_BattleTowerBattleRoom_Text_242426
 	waitmessage
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
 	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44
@@ -217,14 +200,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleDomeLobby_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_17
-	special CallFrontierUtilFunc
+BattleFrontier_EventScript_IncrementWinStreak:: @ 8241EBA
+	frontier_incrementstreak
 	return
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
@@ -273,7 +250,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_242170
+	call BattleFrontier_EventScript_SetBrainObjectGfx
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180
 	waitmovement 0
@@ -283,19 +260,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2
 	waitmovement 0
 	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
-	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_242085
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
@@ -304,9 +276,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	call BattleFrontier_EventScript_IncrementWinStreak
+	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT
@@ -314,22 +285,16 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
 	message BattleFrontier_BattleTowerBattleRoom_Text_24270E
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
+	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
-
+	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
 BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
@@ -338,9 +303,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS
-	special CallFrontierUtilFunc
+	call BattleFrontier_EventScript_IncrementWinStreak
+	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT
@@ -348,8 +312,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
 	message BattleFrontier_BattleTowerBattleRoom_Text_242932
 	waitmessage
 	waitfanfare
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL
-	special CallFrontierUtilFunc
+	frontier_givesymbol
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 
@@ -357,40 +320,26 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E
 BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	closemessage
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
 	copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
-	compare VAR_0x8004, 3
+	compare VAR_0x8004, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18
-	special CallFrontierUtilFunc
+	frontier_restorehelditems
 	special HealPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21
-	special CallFrontierUtilFunc
-
+	frontier_resetsketch
 BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_15
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 5
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattleDomeBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170
-BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT
-	special CallFrontierUtilFunc
+BattleFrontier_EventScript_SetBrainObjectGfx:: @ 8242170
+	frontier_setbrainobj
 	return
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
@@ -485,11 +434,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
-	compare VAR_RESULT, 2
+	compare VAR_RESULT, FRONTIER_MODE_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2
-	compare VAR_RESULT, 3
+	compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
 	waitstate
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index 4a0c26e20..380a53dad 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -5,9 +5,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
 	.byte 0
 
 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
 	end
 
@@ -45,9 +45,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
 	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
 	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
 	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
@@ -56,10 +54,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
 	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
 	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
@@ -70,7 +65,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
 	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
@@ -114,10 +109,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
@@ -126,7 +118,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA
+	call BattleFrontier_EventScript_IncrementWinStreak
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
 	special CallBattleTowerFunc
 	switch VAR_RESULT
@@ -142,7 +134,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
 	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
 	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
 	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
 	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
@@ -154,21 +146,17 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
 	special LoadPlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
 	compare VAR_RESULT, 1
@@ -199,7 +187,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
@@ -231,10 +219,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
@@ -246,17 +231,16 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
 	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
 	waitmessage
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
 	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
 	copyvar VAR_TEMP_F, VAR_RESULT
 	switch VAR_TEMP_F
@@ -385,7 +369,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
+	call BattleFrontier_EventScript_SaveBattle
 	setflag FLAG_TEMP_2
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 	end
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
index 7c4933816..4ae755b37 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
@@ -5,9 +5,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
 	.byte 0
 
 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91
 	end
 
@@ -87,13 +87,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
 	end
 
 BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
 	return
 
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
index 29081f82a..e66004ba9 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
@@ -24,13 +24,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
 	end
 
 BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72
 	return
 
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json
index 41a07eeb8..9160d37e7 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.json
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EventScript_Apprentice",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Apprentice",
       "flag": "FLAG_HIDE_APPRENTICE"
     },
     {
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index ee6ff15a8..32229f724 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -1,54 +1,49 @@
 BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
+BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
 	special sub_81653CC
 	end
 
-BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
+BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
 	call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
-	setvar VAR_0x8004, 10
-	special CallApprenticeFunction
-	compare VAR_0x8004, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
-	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
+	apprentice_shouldcheckgone
+	compare VAR_0x8004, FALSE  @ Always TRUE here
+	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice
+	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_HideApprentice
+BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice:: @ 823E6B5
 	clearflag FLAG_HIDE_APPRENTICE
-	setvar VAR_0x8004, 23
-	special CallApprenticeFunction
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
+	apprentice_setgfx
+BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice:: @ 823E6C0
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1
+BattleFrontier_BattleTowerLobby_EventScript_HideApprentice:: @ 823E6C1
 	setflag FLAG_HIDE_APPRENTICE
-	goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0
+	goto BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice
 
-BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3
+BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
+BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
+BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleTowerLobby_EventScript_23E710
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleTowerLobby_EventScript_23E8EE
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleTowerLobby_EventScript_23E758
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleTowerLobby_EventScript_23E7F2
 	.2byte 0
 
 BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
@@ -64,10 +59,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	release
 	end
@@ -75,8 +67,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
 	lock
 	faceplayer
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN
-	special CallFrontierUtilFunc
+	frontier_isbrain
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
 	message BattleFrontier_BattleTowerLobby_Text_23F60D
@@ -99,8 +90,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
 
 BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
 	msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
-	special CallFrontierUtilFunc
+	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
@@ -118,7 +108,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
@@ -148,8 +138,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
 BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	message BattleFrontier_BattleTowerLobby_Text_23F70F
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
-	special CallFrontierUtilFunc
+	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
@@ -165,31 +154,19 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4
+	case 0, BattleFrontier_EventScript_SaveBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleDomeLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleFactoryLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_19
-	special CallFrontierUtilFunc
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
+BattleFrontier_EventScript_SaveBattle:: @ 823E8B4
+	frontier_savebattle
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_EventScript_BattleSaveFailed
 	playse SE_SAVE
 	msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF
 
-BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7
+BattleFrontier_EventScript_BattleSaveFailed:: @ 823E8D7
 	msgbox gText_BattleRecordCouldntBeSaved, MSGBOX_DEFAULT
-
 BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF
 	return
 
@@ -204,15 +181,13 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0
 BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0
 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
 BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 6
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_6
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	lock
 	faceplayer
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930
 	message BattleFrontier_BattleTowerLobby_Text_23F737
 	waitmessage
@@ -223,10 +198,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -237,7 +209,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
 BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240537, MSGBOX_DEFAULT
 
@@ -252,24 +224,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 3
 	special sub_80F9490
@@ -283,9 +251,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
 	special CallBattleTowerFunc
@@ -293,10 +259,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -317,7 +280,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91
 BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, MSGBOX_DEFAULT
 
@@ -332,24 +295,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
-	setvar VAR_FRONTIER_BATTLE_MODE, 1
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 4
 	special sub_80F9490
@@ -363,9 +322,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
 	special CallBattleTowerFunc
@@ -373,10 +330,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -397,7 +351,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA
 BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	clearflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT
@@ -413,24 +367,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
-	setvar VAR_FRONTIER_BATTLE_MODE, 2
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 2
 	special sub_80F9490
@@ -444,9 +394,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
 	special CallBattleTowerFunc
@@ -454,10 +402,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -478,7 +423,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66
 BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74
 	lock
 	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240E15, MSGBOX_DEFAULT
 
@@ -493,24 +438,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 
 BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
-	setvar VAR_FRONTIER_BATTLE_MODE, 3
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	message BattleFrontier_BattleTowerLobby_Text_23FD3B
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT
 	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 2
 	special sub_80F9490
@@ -524,9 +465,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
 
 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
 	special CallBattleTowerFunc
@@ -534,10 +473,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -629,10 +565,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE
 
 BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_SINGLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -640,10 +573,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
 
 BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -651,10 +581,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
 
 BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 2
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_MULTIS
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -662,10 +589,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
 
 BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_LINK_MULTIS
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -673,13 +597,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
 
 BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F046
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B
+	case FRONTIER_LVL_50, BattleFrontier_BattleTowerLobby_EventScript_23F046
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattleTowerLobby_EventScript_23F08B
 
 BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046
 	switch VAR_FRONTIER_BATTLE_MODE
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D
+	case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_23F06F
+	case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_23F07D
 	msgbox BattleFrontier_BattleTowerLobby_Text_24038B, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
 	end
@@ -696,8 +620,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D
 
 BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B
 	switch VAR_FRONTIER_BATTLE_MODE
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2
+	case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_23F0B4
+	case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_23F0C2
 	msgbox BattleFrontier_BattleTowerLobby_Text_24046B, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
 	end
@@ -713,27 +637,23 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS  @ No status provided, so it relies on VAR_0x8006 being 0 already
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3
 	special LoadPlayerParty
-
 BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6
 	special CloseLink
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT
-
 BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
 	release
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	call BattleFrontier_BattleTowerLobby_EventScript_23F272
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_PARTY_ORDER
+	call BattleFrontier_BattleTowerLobby_EventScript_GetPartySize
 	special CallFrontierUtilFunc
 	setvar VAR_RESULT, 0
 
@@ -752,7 +672,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
 
 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135
 	call BattleFrontier_BattleTowerLobby_EventScript_23F1A7
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F152
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F15B
@@ -805,13 +725,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
 	step_end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3
 	return
 
@@ -832,13 +752,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227
 	return
 
@@ -859,13 +779,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
-	compare VAR_FRONTIER_BATTLE_MODE, 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A
-	compare VAR_FRONTIER_BATTLE_MODE, 1
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260
-	compare VAR_FRONTIER_BATTLE_MODE, 2
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266
-	compare VAR_FRONTIER_BATTLE_MODE, 3
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C
 	return
 
@@ -885,44 +805,35 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
 	setvar VAR_0x8004, 18
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
-	compare VAR_FRONTIER_BATTLE_MODE, 0
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F29F
-	compare VAR_FRONTIER_BATTLE_MODE, 1
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2A5
-	compare VAR_FRONTIER_BATTLE_MODE, 2
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2AB
-	compare VAR_FRONTIER_BATTLE_MODE, 3
-	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2B1
+BattleFrontier_BattleTowerLobby_EventScript_GetPartySize:: @ 823F272
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
+	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
+	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoublesPartySize
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
+	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetMultisPartySize
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
+BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize:: @ 823F29F
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5
-	setvar VAR_0x8005, 4
+BattleFrontier_BattleTowerLobby_EventScript_GetDoublesPartySize:: @ 823F2A5
+	setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_23F2AB:: @ 823F2AB
-	setvar VAR_0x8005, 2
+BattleFrontier_BattleTowerLobby_EventScript_GetMultisPartySize:: @ 823F2AB
+	setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_23F2B1:: @ 823F2B1
-	setvar VAR_0x8005, 2
+BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize:: @ 823F2B1
+	setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
 	return
 
-BattleFrontier_BattleArenaLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleDomeLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallFrontierUtilFunc
+BattleFrontier_EventScript_GetLvlMode:: @ 823F2B7
+	frontier_get FRONTIER_DATA_LVL_MODE
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index 4692264e7..160e67ef6 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -94,10 +94,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_6, 1
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03
 	end
 
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index c2f7b3fbc..f30e194aa 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -88,12 +88,12 @@ BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
 	end
 
 BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	frontier_setlvlmode FRONTIER_LVL_50
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	battletower_getstreak
 	compare VAR_RESULT, 50
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
-	frontier_setlvlmode FRONTIER_LVL_OPEN
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
 	battletower_getstreak
 	compare VAR_RESULT, 50
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
@@ -121,12 +121,12 @@ BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
 	end
 
 BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	frontier_setlvlmode FRONTIER_LVL_50
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	battletower_getstreak
 	compare VAR_RESULT, 100
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
-	frontier_setlvlmode FRONTIER_LVL_OPEN
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
 	battletower_getstreak
 	compare VAR_RESULT, 100
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index 5526ad92f..a1b30c3a4 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -35,9 +35,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
 	showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73
 
@@ -53,7 +51,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	waitmovement 0
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 4
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call FallarborTown_BattleTentBattleRoom_EventScript_257B6C
@@ -64,14 +62,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	waitse
 	waitmovement 0
 	setvar VAR_0x8004, 6
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT
 
 FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
@@ -85,14 +80,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
 	closemessage
 
 FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3
 	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E
@@ -105,17 +95,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43
 	compare VAR_RESULT, 2
@@ -153,17 +139,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8
 
 FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
 	delay 60
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
 	special CallBattleArenaFunction
-	compare VAR_RESULT, 9999
+	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3
 	addvar VAR_RESULT, 1
 	setvar VAR_0x8004, 2
@@ -186,12 +169,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
 	waitmessage
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 2
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index b4842109a..dbc692410 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -14,30 +14,23 @@ FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
 
 FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
 	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF
-	map_script_2 VAR_TEMP_0, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8
-	map_script_2 VAR_TEMP_0, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD
-	map_script_2 VAR_TEMP_0, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED
-	map_script_2 VAR_TEMP_0, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, FallarborTown_BattleTentLobby_EventScript_1FFEB8
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, FallarborTown_BattleTentLobby_EventScript_1FFFCD
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, FallarborTown_BattleTentLobby_EventScript_1FFEED
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, FallarborTown_BattleTentLobby_EventScript_1FFF93
 	.2byte 0
 
 FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
 	lockall
 	msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	releaseall
 	end
 
@@ -47,27 +40,21 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
 	message FallarborTown_BattleTentLobby_Text_2C4EFF
 	waitmessage
 	setvar VAR_0x8004, 4
-	special sub_81B9B80
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	special CallFallarborTentFunction
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	playse SE_SAVE
 	waitse
 
 FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
 	msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 5
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	message FallarborTown_BattleTentLobby_Text_2C4F69
 	waitmessage
 	playfanfare MUS_FANFA4
@@ -96,13 +83,10 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
 	lockall
 	message FallarborTown_BattleTentLobby_Text_2C4FD7
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	playse SE_SAVE
 	waitse
 	msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
@@ -117,13 +101,10 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
 	waitmessage
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 1
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	goto FallarborTown_BattleTentLobby_EventScript_20013C
 
@@ -131,7 +112,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
 	lock
 	faceplayer
 	setvar VAR_0x8004, 1
-	special sub_81B9B80
+	special CallFallarborTentFunction
 	compare VAR_RESULT, 0
 	goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84
 	special SavePlayerParty
@@ -148,17 +129,13 @@ FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
 	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C5
 
 FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
-	setvar VAR_FRONTIER_FACILITY, 3
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	setvar VAR_RESULT, 2
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
 	msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT
 	fadescreen 1
 	setvar VAR_0x8004, 2
@@ -175,19 +152,11 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
 
 FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, 0
-	special sub_81B9B80
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	special CallFallarborTentFunction
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -198,9 +167,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 
 FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT
 	closemessage
 	call FallarborTown_BattleTentLobby_EventScript_2001CF
@@ -215,8 +182,8 @@ FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169
 
 FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_200191
-	case 1, FallarborTown_BattleTentLobby_EventScript_20019E
+	case FRONTIER_LVL_50, FallarborTown_BattleTentLobby_EventScript_200191
+	case FRONTIER_LVL_OPEN, FallarborTown_BattleTentLobby_EventScript_20019E
 
 FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191
 	msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT
@@ -227,10 +194,7 @@ FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E
 	goto FallarborTown_BattleTentLobby_EventScript_2001CD
 
 FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto FallarborTown_BattleTentLobby_EventScript_2001C5
 
 FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index ff79dd53a..9aa9e6790 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -562,9 +562,7 @@ LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
 
 LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
 	lockall
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
-	setvar VAR_0x8005, 7
-	special CallFrontierUtilFunc
+	frontier_results FACILITY_LINK_CONTEST
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 97ae9c044..c2793df16 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -258,15 +258,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C
 
 MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032
 	special ReducePlayerPartyToSelectedMons
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
 	setvar VAR_0x8005, 0
 	special DoSpecialTrainerBattle
 	waitstate
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6
-	special CallFrontierUtilFunc
+	frontier_saveparty
 	special LoadPlayerParty
 	switch VAR_RESULT
 	case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index c95f53fd9..54e917003 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -49,7 +49,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
 	applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
 	waitmovement 0
 	setvar VAR_0x8004, 4
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	lockall
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
@@ -63,23 +63,15 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
 	case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39
 
 SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
 SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B
 @ 	case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
@@ -89,10 +81,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
 
 SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B
 SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index 542e97d4f..1ee11598c 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -32,15 +32,14 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
 	compare VAR_0x8006, 2
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044
 	setvar VAR_0x8004, 9
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	setvar VAR_0x8004, 8
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT
 	fadescreen 1
 	setvar VAR_0x8004, 6
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	waitstate
-
 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
 	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
 	closemessage
@@ -66,11 +65,8 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-
 SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014
 	compare VAR_RESULT, 2
@@ -99,7 +95,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
 
 SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
 	setvar VAR_0x8004, 8
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4
@@ -109,7 +105,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
 SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
 	fadescreen 1
 	setvar VAR_0x8004, 7
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	waitstate
 	compare VAR_RESULT, 1
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
@@ -131,12 +127,11 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
 	waitmessage
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 2
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index 182a45d5e..9ea3423f8 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -14,30 +14,23 @@ SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
 
 SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
 	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779
-	map_script_2 VAR_TEMP_0, 1, SlateportCity_BattleTentLobby_EventScript_208782
-	map_script_2 VAR_TEMP_0, 2, SlateportCity_BattleTentLobby_EventScript_208871
-	map_script_2 VAR_TEMP_0, 3, SlateportCity_BattleTentLobby_EventScript_2087B7
-	map_script_2 VAR_TEMP_0, 4, SlateportCity_BattleTentLobby_EventScript_208837
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, SlateportCity_BattleTentLobby_EventScript_208782
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, SlateportCity_BattleTentLobby_EventScript_208871
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, SlateportCity_BattleTentLobby_EventScript_2087B7
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, SlateportCity_BattleTentLobby_EventScript_208837
 	.2byte 0
 
 SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
 	lockall
 	msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	releaseall
 	end
 
@@ -46,27 +39,20 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
 	message SlateportCity_BattleTentLobby_Text_2C5C6F
 	waitmessage
 	setvar VAR_0x8004, 4
-	special sub_81B9D08
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	special CallSlateportTentFunction
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	playse SE_SAVE
 	waitse
-
 SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
 	msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 5
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	switch VAR_RESULT
 	case 0, SlateportCity_BattleTentLobby_EventScript_20882A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	message SlateportCity_BattleTentLobby_Text_23F68C
 	waitmessage
 	playfanfare MUS_FANFA4
@@ -81,13 +67,10 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
 	lockall
 	message SlateportCity_BattleTentLobby_Text_2C5BA2
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	playse SE_SAVE
 	waitse
 
@@ -104,13 +87,10 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
 	waitmessage
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 1
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	setvar VAR_0x8006, 2
 	goto SlateportCity_BattleTentLobby_EventScript_2089AC
@@ -119,7 +99,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
 	lock
 	faceplayer
 	setvar VAR_0x8004, 1
-	special sub_81B9D08
+	special CallSlateportTentFunction
 	compare VAR_RESULT, 0
 	goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9
 	special SavePlayerParty
@@ -136,12 +116,9 @@ SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
 	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2E
 
 SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
-	setvar VAR_FRONTIER_FACILITY, 4
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special CallFrontierUtilFunc
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
 	msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, SlateportCity_BattleTentLobby_EventScript_208A2B
@@ -150,19 +127,11 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
 
 SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, 0
-	special sub_81B9D08
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	special CallSlateportTentFunction
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	closemessage
 	delay 2
 	call Common_EventScript_SaveGame
@@ -170,7 +139,6 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14
 	setvar VAR_0x8006, 0
-
 SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC
 	msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT
 	closemessage
@@ -221,10 +189,7 @@ SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
 	goto SlateportCity_BattleTentLobby_EventScript_2088CA
 
 SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto SlateportCity_BattleTentLobby_EventScript_208A2E
 
 SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index fee1c07a4..6b0e42148 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -4,8 +4,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_1F_OnTransition: @ 822795E
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER
-	special CallFrontierUtilFunc
+	frontier_checkvisittrainer
 	compare VAR_RESULT, 0
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
@@ -74,8 +73,7 @@ SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer: @ 8227A21
 SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan:: @ 8227A24
 	lock
 	faceplayer
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER
-	special CallFrontierUtilFunc
+	frontier_checkvisittrainer
 	compare VAR_RESULT, 1
 	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer
 	compare VAR_TEMP_1, 1
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 714c72674..15aecc9d9 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -16,11 +16,9 @@ TrainerHill_Entrance_OnWarp: @ 82680CF
 	end
 
 TrainerHill_Entrance_OnResume: @ 82680D0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
-	special CallTrainerHillFunction
+	trainerhill_resumetimer
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
-	special CallTrainerHillFunction
+	trainerhill_clearresult
 	compare VAR_RESULT, 0  @ VAR_RESULT always 0 here
 	goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
 	setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6
@@ -28,8 +26,7 @@ TrainerHill_Entrance_OnResume: @ 82680D0
 	end
 
 TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_WON
-	special CallTrainerHillFunction
+	trainerhill_getwon
 	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
@@ -75,8 +72,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 
 TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
-	special CallTrainerHillFunction
+	trainerhill_getstatus
 	switch VAR_RESULT
 	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_ExitChallengeLost
 	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
@@ -113,8 +109,7 @@ TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
 TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
-	special CallTrainerHillFunction
+	trainerhill_inchallenge
 	compare VAR_RESULT, FALSE
 	goto_if_eq TrainerHill_Entrance_EventScript_ThanksForPlaying
 	msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
@@ -131,12 +126,10 @@ TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
 	msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_getsaved
 	compare VAR_RESULT, FALSE
 	call_if_eq TrainerHill_Entrance_EventScript_SaveGame
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED
-	special CallTrainerHillFunction
+	trainerhill_allfloorsused
 	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_Entrance_EventScript_AllFloorsUsed
 	msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
@@ -165,15 +158,12 @@ TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
 	switch VAR_RESULT
 	case 4, TrainerHill_Entrance_EventScript_CancelEntry
 	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
-	copyvar VAR_0x8005, VAR_RESULT
-	special CallTrainerHillFunction
+	trainerhill_settag VAR_RESULT
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
 	msgbox TrainerHill_Entrance_Text_TimeProgessGetSetGo, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
-	special CallTrainerHillFunction
+	trainerhill_start
 	releaseall
 	end
 
@@ -188,19 +178,16 @@ TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
 
 TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
 	msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_setsaved
 	setvar VAR_TEMP_5, 1
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, FALSE
 	goto_if_eq TrainerHill_Entrance_EventScript_SaveFailed
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_setsaved
 	return
 
 TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_GAME_SAVED
-	special CallTrainerHillFunction
+	trainerhill_clearsaved
 	goto TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index af4c9ea5a..e4e2cbb49 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -4,12 +4,10 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7
 	.byte 0
 
 TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
-	special CallTrainerHillFunction
+	trainerhill_settrainerflags
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_OWNER_STATE
-	special CallTrainerHillFunction
+	trainerhill_getownerstate
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_Arrived
 	case 1, TrainerHill_Roof_EventScript_GivePrize
@@ -17,8 +15,7 @@ TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
 TrainerHill_Roof_EventScript_Arrived:: @ 8268FEA
 	msgbox TrainerHill_Roof_Text_YouFinallyCameBravo, MSGBOX_DEFAULT
 TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_GIVE_PRIZE
-	special CallTrainerHillFunction
+	trainerhill_giveprize
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_ReceivePrize
 	case 1, TrainerHill_Roof_EventScript_NoRoomForPrize
@@ -38,8 +35,7 @@ TrainerHill_Roof_EventScript_NoRoomForPrize:: @ 8269037
 	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
 TrainerHill_Roof_EventScript_CheckFinalTime:: @ 8269054
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_CHECK_FINAL_TIME
-	special CallTrainerHillFunction
+	trainerhill_finaltime
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_NewRecord
 	case 1, TrainerHill_Roof_EventScript_NoNewRecord
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index ee3269ca8..ae3d78707 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -34,9 +34,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
 	showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
 	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575
 	waitmovement 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
 
@@ -47,7 +45,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
 	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
 	waitmovement 0
 	setvar VAR_0x8004, 4
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
@@ -55,23 +53,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
 	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
 	case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501
 	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
@@ -83,17 +73,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
 	msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
-	setvar VAR_0x8005, 2
-	special CallFrontierUtilFunc
+	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565
 	compare VAR_RESULT, 2
@@ -128,10 +114,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA
 	goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
@@ -141,12 +124,11 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
 	waitmessage
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 2
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	playse SE_SAVE
 	waitse
 	fadescreen 1
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET
-	special CallFrontierUtilFunc
+	frontier_reset
 	end
 
 VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index 933029bff..0df04f247 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -14,30 +14,23 @@ VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
 
 VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
 	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719
-	map_script_2 VAR_TEMP_0, 1, VerdanturfTown_BattleTentLobby_EventScript_201722
-	map_script_2 VAR_TEMP_0, 2, VerdanturfTown_BattleTentLobby_EventScript_201837
-	map_script_2 VAR_TEMP_0, 3, VerdanturfTown_BattleTentLobby_EventScript_201757
-	map_script_2 VAR_TEMP_0, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, VerdanturfTown_BattleTentLobby_EventScript_201722
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, VerdanturfTown_BattleTentLobby_EventScript_201837
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, VerdanturfTown_BattleTentLobby_EventScript_201757
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, VerdanturfTown_BattleTentLobby_EventScript_2017FD
 	.2byte 0
 
 VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0
-	special CallFrontierUtilFunc
+	frontier_getstatus
 	end
 
 VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
 	lockall
 	msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	releaseall
 	end
 
@@ -47,27 +40,21 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
 	message VerdanturfTown_BattleTentLobby_Text_2C5791
 	waitmessage
 	setvar VAR_0x8004, 6
-	special sub_81B99B4
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	special CallVerdanturfTentFunction
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 0
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	playse SE_SAVE
 	waitse
 
 VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 7
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	switch VAR_RESULT
 	case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	message VerdanturfTown_BattleTentLobby_Text_24A554
 	waitmessage
 	playfanfare MUS_FANFA4
@@ -96,13 +83,10 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
 	lockall
 	message VerdanturfTown_BattleTentLobby_Text_2C56B8
 	waitmessage
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 0
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	playse SE_SAVE
 	waitse
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
@@ -118,13 +102,10 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
 	waitmessage
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 1
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	playse SE_SAVE
 	waitse
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	goto VerdanturfTown_BattleTentLobby_EventScript_2019AE
 
@@ -132,7 +113,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
 	lock
 	faceplayer
 	setvar VAR_0x8004, 1
-	special sub_81B99B4
+	special CallVerdanturfTentFunction
 	compare VAR_RESULT, 0
 	goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE
 	special SavePlayerParty
@@ -149,17 +130,13 @@ VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893
 	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A37
 
 VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
-	setvar VAR_FRONTIER_FACILITY, 2
-	setvar VAR_FRONTIER_BATTLE_MODE, 0
+	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
+	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	setvar VAR_RESULT, 2
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15
-	special CallFrontierUtilFunc
-	compare VAR_0x8004, 1
+	frontier_checkineligible
+	compare VAR_0x8004, TRUE
 	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT
 	fadescreen 1
 	setvar VAR_0x8004, 1
@@ -176,19 +153,11 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
 
 VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 4
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, 0
-	special sub_81B99B4
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	special CallVerdanturfTentFunction
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
+	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -199,9 +168,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 
 VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
 	special SavePlayerParty
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY
-	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
-	special CallFrontierUtilFunc
+	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT
 	closemessage
 	call VerdanturfTown_BattleTentLobby_EventScript_201A41
@@ -216,8 +183,8 @@ VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB
 
 VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_201A03
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10
+	case FRONTIER_LVL_50, VerdanturfTown_BattleTentLobby_EventScript_201A03
+	case FRONTIER_LVL_OPEN, VerdanturfTown_BattleTentLobby_EventScript_201A10
 
 VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT
@@ -228,18 +195,13 @@ VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10
 	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
 
 VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto VerdanturfTown_BattleTentLobby_EventScript_201A37
 
 VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
 	special LoadPlayerParty
-
 VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
-
 VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F
 	release
 	end
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index f9c614a9b..585166dda 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -532,9 +532,9 @@
     "BattleFrontier_BattlePikeLobby",
     "BattleFrontier_BattlePikeCorridor",
     "BattleFrontier_BattlePikeThreePathRoom",
-    "BattleFrontier_BattlePikeRandomRoom1",
-    "BattleFrontier_BattlePikeRandomRoom2",
-    "BattleFrontier_BattlePikeRandomRoom3",
+    "BattleFrontier_BattlePikeRoomNormal",
+    "BattleFrontier_BattlePikeRoomFinal",
+    "BattleFrontier_BattlePikeRoomWildMons",
     "BattleFrontier_RankingHall",
     "BattleFrontier_Lounge1",
     "BattleFrontier_ExchangeServiceCorner",
author	GriffinR <griffin.richards@comcast.net>	2019-11-25 20:00:04 -0500
committer	GriffinR <griffin.richards@comcast.net>	2019-11-25 20:00:04 -0500
commit	f559fa3fe26910056e84315370cb13ec8501af18 (patch)
tree	498c7ed00243cf03420451fdde3e04ac36add55c /data/maps
parent	4c52cf9ed15f01f949fbf2139444f674694e446d (diff)
parent	6efa51f8ad7b62a3a12c81f1d0bf299be31718b0 (diff)