Merge branch 'master' into fldeff

1 files changed, 33 insertions, 33 deletions

diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 352d92d83..13caaab1e 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -43,7 +43,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	call_if 1, MtPyre_Summit_EventScript_2320EB
 	compare VAR_0x8008, 2
 	call_if 1, MtPyre_Summit_EventScript_2320EC
-	msgbox MtPyre_Summit_Text_23281A, 4
+	msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT
 	closemessage
 	fadescreen 1
 	removeobject 2
@@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	call_if 1, MtPyre_Summit_EventScript_23210C
 	compare VAR_0x8008, 2
 	call_if 1, MtPyre_Summit_EventScript_232117
-	msgbox MtPyre_Summit_Text_23290E, 4
+	msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT
 	giveitem_std ITEM_MAGMA_EMBLEM
 	setflag FLAG_0x0D4
 	setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
@@ -133,7 +133,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C
 	faceplayer
 	checkflag FLAG_0x09E
 	goto_eq MtPyre_Summit_EventScript_232167
-	msgbox MtPyre_Summit_Text_232E0C, 5
+	msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	call_if 1, MtPyre_Summit_EventScript_232187
 	compare VAR_RESULT, 0
@@ -142,7 +142,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C
 	end
 
 MtPyre_Summit_EventScript_232167:: @ 8232167
-	msgbox MtPyre_Summit_Text_2331A6, 5
+	msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	call_if 1, MtPyre_Summit_EventScript_232199
 	compare VAR_RESULT, 0
@@ -151,15 +151,15 @@ MtPyre_Summit_EventScript_232167:: @ 8232167
 	end
 
 MtPyre_Summit_EventScript_232187:: @ 8232187
-	msgbox MtPyre_Summit_Text_232F27, 4
+	msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT
 	return
 
 MtPyre_Summit_EventScript_232190:: @ 8232190
-	msgbox MtPyre_Summit_Text_233162, 4
+	msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT
 	return
 
 MtPyre_Summit_EventScript_232199:: @ 8232199
-	msgbox MtPyre_Summit_Text_23325D, 4
+	msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT
 	return
 
 MtPyre_Summit_EventScript_2321A2:: @ 82321A2
@@ -171,23 +171,23 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2
 	call_if 4, MtPyre_Summit_EventScript_2321CB
 	checkflag FLAG_0x081
 	goto_eq MtPyre_Summit_EventScript_2321D8
-	msgbox MtPyre_Summit_Text_232AD8, 4
+	msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
 	release
 	end
 
 MtPyre_Summit_EventScript_2321CB:: @ 82321CB
-	msgbox MtPyre_Summit_Text_232CA6, 4
+	msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT
 	setflag FLAG_0x103
 	release
 	end
 
 MtPyre_Summit_EventScript_2321D8:: @ 82321D8
-	msgbox MtPyre_Summit_Text_232B4F, 4
+	msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT
 	release
 	end
 
 MtPyre_Summit_EventScript_2321E2:: @ 82321E2
-	msgbox MtPyre_Summit_Text_232D1E, 4
+	msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT
 	release
 	end
 
@@ -231,7 +231,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	call_if 1, MtPyre_Summit_EventScript_232328
 	compare VAR_0x8008, 2
 	call_if 1, MtPyre_Summit_EventScript_232341
-	msgbox MtPyre_Summit_Text_233183, 4
+	msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
 	call_if 1, MtPyre_Summit_EventScript_23235A
@@ -425,29 +425,29 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8
 	step_end
 
 MtPyre_Summit_EventScript_2323FD:: @ 82323FD
-	trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
-	msgbox MtPyre_Summit_Text_2324E0, 6
+	trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
+	msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_Summit_EventScript_232414:: @ 8232414
-	trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
-	msgbox MtPyre_Summit_Text_2325E4, 6
+	trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
+	msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_Summit_EventScript_23242B:: @ 823242B
-	trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
-	msgbox MtPyre_Summit_Text_2326B3, 6
+	trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
+	msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_Summit_EventScript_232442:: @ 8232442
-	trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
-	msgbox MtPyre_Summit_Text_2327D8, 6
+	trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
+	msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_Summit_Text_232459: @ 8232459
 	.string "No! Those TEAM MAGMA goons got\n"
 	.string "here ahead of us!\p"
-	.string "We can’t fall behind!$"
+	.string "We can't fall behind!$"
 
 MtPyre_Summit_Text_2324A0: @ 82324A0
 	.string "I thought you were one of the MAGMAS\n"
@@ -455,36 +455,36 @@ MtPyre_Summit_Text_2324A0: @ 82324A0
 
 MtPyre_Summit_Text_2324E0: @ 82324E0
 	.string "Yeah, so you are strong…\n"
-	.string "But there’re a lot of us!$"
+	.string "But there're a lot of us!$"
 
 MtPyre_Summit_Text_232513: @ 8232513
 	.string "Hah!\n"
 	.string "Too bad for you!\p"
-	.string "If you came earlier, you only would’ve\n"
+	.string "If you came earlier, you only would've\n"
 	.string "had to battle the wimpy TEAM MAGMA.\p"
 	.string "But since you arrived now, you have\n"
 	.string "to take on us toughies!$"
 
 MtPyre_Summit_Text_2325B0: @ 82325B0
-	.string "Urgh… I should’ve let you take on\n"
+	.string "Urgh… I should've let you take on\n"
 	.string "TEAM MAGMA first…$"
 
 MtPyre_Summit_Text_2325E4: @ 82325E4
-	.string "You don’t know anything!\n"
+	.string "You don't know anything!\n"
 	.string "So why are you messing with us?$"
 
 MtPyre_Summit_Text_23261D: @ 823261D
 	.string "You…\n"
 	.string "We saw you at MT. CHIMNEY.\p"
-	.string "You don’t belong to either TEAM,\n"
+	.string "You don't belong to either TEAM,\n"
 	.string "so why would you be here?$"
 
 MtPyre_Summit_Text_232678: @ 8232678
-	.string "If you’re going to mess with anyone,\n"
+	.string "If you're going to mess with anyone,\n"
 	.string "let it be TEAM MAGMA…$"
 
 MtPyre_Summit_Text_2326B3: @ 82326B3
-	.string "Heh, it doesn’t matter!\n"
+	.string "Heh, it doesn't matter!\n"
 	.string "We bought ourselves some time!\p"
 	.string "The BOSS should have snatched what\n"
 	.string "he was after!$"
@@ -492,8 +492,8 @@ MtPyre_Summit_Text_2326B3: @ 82326B3
 MtPyre_Summit_Text_23271B: @ 823271B
 	.string "Oh, I know!\n"
 	.string "You tried to join TEAM MAGMA,\l"
-	.string "but they wouldn’t have you!\p"
-	.string "Well, don’t think that we’ll let you\n"
+	.string "but they wouldn't have you!\p"
+	.string "Well, don't think that we'll let you\n"
 	.string "join our TEAM AQUA!$"
 
 MtPyre_Summit_Text_23279A: @ 823279A
@@ -505,14 +505,14 @@ MtPyre_Summit_Text_2327D8: @ 82327D8
 	.string "with us members and our leader.$"
 
 MtPyre_Summit_Text_23281A: @ 823281A
-	.string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n"
+	.string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n"
 	.string "of us, but we also got what we wanted.\p"
 	.string "The RED ORB preserved at MT. PYRE…\n"
 	.string "I, ARCHIE, now have it in my possession!\p"
 	.string "Fufufu… Now we can bring our ultimate\n"
 	.string "objective to fruition!\p"
 	.string "Okay, TEAM!\n"
-	.string "We’re pulling out!$"
+	.string "We're pulling out!$"
 
 MtPyre_Summit_Text_23290E: @ 823290E
 	.string "Oh, no…\n"
@@ -529,7 +529,7 @@ MtPyre_Summit_Text_23290E: @ 823290E
 	.string "and took the BLUE ORB first?\p"
 	.string "Well, in their haste, they left this\n"
 	.string "behind.\p"
-	.string "I couldn’t imagine what exactly it\n"
+	.string "I couldn't imagine what exactly it\n"
 	.string "could be.\p"
 	.string "I would like you to have it.\n"
 	.string "Perhaps it will be useful in some way.$"