fixing merge conflicts

1 files changed, 83 insertions, 83 deletions

diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index ccc7b1032..9b5ea145e 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
 
 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
 	setvar VAR_0x8004, 0
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
@@ -35,15 +35,15 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
@@ -51,14 +51,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
 	lockall
 	setvar VAR_0x8004, 10
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA
 
 BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT
 
 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	special sub_81B95E0
@@ -66,29 +66,29 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB
 	clearflag FLAG_SPECIAL_FLAG_0x4004
 	setvar VAR_0x8004, 8
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, 14
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special HealPlayerParty
 	message BattleFrontier_BattlePyramidLobby_Text_2519F8
 	waitmessage
 	playse SE_EXPMAX
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 11
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
 	setvar VAR_0x8004, 4
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -96,10 +96,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 
 BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	setvar VAR_0x8004, 8
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, 14
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special HealPlayerParty
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_251B5A
@@ -111,13 +111,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -132,7 +132,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
 	setvar VAR_FRONTIER_FACILITY, 6
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
 	special SavePlayerParty
-	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT
 
 BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8
 	message BattleFrontier_BattlePyramidLobby_Text_250FA7
@@ -152,14 +152,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 	setvar VAR_0x8004, 15
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	compare VAR_0x8004, 1
 	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
 	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4
+	special CallFrontierUtilFunc
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT
 	fadescreen 1
 	call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7
 	copyvar VAR_0x8004, VAR_RESULT
@@ -168,7 +168,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 	waitstate
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5
@@ -178,25 +178,25 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 4
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 6
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 9
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -209,14 +209,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
 	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4
+	special CallFrontierUtilFunc
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattlePyramidLobby_EventScript_250D56
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	setvar VAR_RESULT, 0
 	special HealPlayerParty
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
@@ -225,7 +225,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75
@@ -234,25 +234,25 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75
 	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
 	special LoadPlayerParty
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4
-	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT
 
 BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
 	release
@@ -262,9 +262,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
 	lockall
 	applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidLobby_EventScript_250AF0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252461, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -281,10 +281,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 5
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53
 	setvar VAR_RESULT, 0
@@ -294,15 +294,15 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
 BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 3
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 6
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91
 	setvar VAR_RESULT, 0
@@ -312,7 +312,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
 BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 4
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
@@ -343,90 +343,90 @@ BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252068, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252158, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252206, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252364, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252403, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
 	lockall
 	setvar VAR_0x8004, 7
 	setvar VAR_0x8005, 6
-	special sub_81A1780
+	special CallFrontierUtilFunc
 	waitbuttonpress
 	special RemoveRecordsWindow
 	releaseall
@@ -436,24 +436,24 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
 	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4
 	applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT
 
 BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
 	message BattleFrontier_BattlePyramidLobby_Text_25161E
 	waitmessage
 	playse SE_EXPMAX
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251647, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5
 	waitmovement 0
@@ -493,7 +493,7 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
 	step_end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT
 	setflag FLAG_SPECIAL_FLAG_0x4004
 	special sub_81C6A94
 	compare VAR_RESULT, 0
@@ -504,7 +504,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251881, MSGBOX_DEFAULT
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09
@@ -539,23 +539,23 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePyramidLobby_Text_25197E
 	waitmessage
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, MSGBOX_NPC
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252595, MSGBOX_NPC
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95
 	lockall
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
 	end
 
@@ -573,22 +573,22 @@ BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
 	end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252924, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
 	end