adds constants, cleans up callstd and msgbox code

* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants

1 files changed, 67 insertions, 67 deletions

diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index fe07de8dc..3652f7685 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -31,7 +31,7 @@ Route110_EventScript_1EF2A1:: @ 81EF2A1
 Route110_EventScript_1EF2AA:: @ 81EF2AA
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFB5D, 4
+	msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
 	waitmovement 0
 	release
@@ -40,7 +40,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA
 Route110_EventScript_1EF2C0:: @ 81EF2C0
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFB93, 4
+	msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
 	waitmovement 0
 	release
@@ -49,7 +49,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0
 Route110_EventScript_1EF2D6:: @ 81EF2D6
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFBCA, 4
+	msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
 	waitmovement 0
 	release
@@ -58,74 +58,74 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6
 Route110_EventScript_1EF2EC:: @ 81EF2EC
 	lock
 	faceplayer
-	msgbox Route110_Text_1EFC0D, 4
+	msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
 	waitmovement 0
 	release
 	end
 
 Route110_EventScript_1EF302:: @ 81EF302
-	msgbox Route110_Text_1EFFC3, 2
+	msgbox Route110_Text_1EFFC3, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF30B:: @ 81EF30B
-	msgbox Route110_Text_1F0006, 2
+	msgbox Route110_Text_1F0006, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF314:: @ 81EF314
-	msgbox Route110_Text_1F006A, 2
+	msgbox Route110_Text_1F006A, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF31D:: @ 81EF31D
-	msgbox Route110_Text_1F0261, 2
+	msgbox Route110_Text_1F0261, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF326:: @ 81EF326
-	msgbox Route110_Text_1F02CA, 2
+	msgbox Route110_Text_1F02CA, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF32F:: @ 81EF32F
-	msgbox Route110_Text_1F030E, 2
+	msgbox Route110_Text_1F030E, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF338:: @ 81EF338
-	msgbox Route110_Text_1F0390, 2
+	msgbox Route110_Text_1F0390, MSGBOX_NPC
 	end
 
 Route110_EventScript_1EF341:: @ 81EF341
-	msgbox Route110_Text_1F0812, 3
+	msgbox Route110_Text_1F0812, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF34A:: @ 81EF34A
-	msgbox Route110_Text_1F082D, 3
+	msgbox Route110_Text_1F082D, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF353:: @ 81EF353
-	msgbox Route110_Text_1F0842, 3
+	msgbox Route110_Text_1F0842, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF35C:: @ 81EF35C
-	msgbox Route110_Text_1F08CD, 3
+	msgbox Route110_Text_1F08CD, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF365:: @ 81EF365
-	msgbox Route110_Text_1F08E3, 3
+	msgbox Route110_Text_1F08E3, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF36E:: @ 81EF36E
-	msgbox Route110_Text_1F08F3, 3
+	msgbox Route110_Text_1F08F3, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF377:: @ 81EF377
-	msgbox Route110_Text_1F090D, 3
+	msgbox Route110_Text_1F090D, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF380:: @ 81EF380
-	msgbox Route110_Text_1F0992, 3
+	msgbox Route110_Text_1F0992, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF389:: @ 81EF389
-	msgbox Route110_Text_1F09DB, 3
+	msgbox Route110_Text_1F09DB, MSGBOX_SIGN
 	end
 
 Route110_EventScript_1EF392:: @ 81EF392
@@ -133,12 +133,12 @@ Route110_EventScript_1EF392:: @ 81EF392
 	specialvar VAR_RESULT, GetRecordedCyclingRoadResults
 	compare VAR_RESULT, 0
 	goto_eq Route110_EventScript_1EF3AD
-	msgbox Route110_Text_1F0A1E, 4
+	msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_EventScript_1EF3AD:: @ 81EF3AD
-	msgbox Route110_Text_1F0A5E, 4
+	msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -150,28 +150,28 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7
 	goto_eq Route110_EventScript_1EF3E8
 	compare VAR_CYCLING_CHALLENGE_STATE, 0
 	goto_eq Route110_EventScript_1EF3DE
-	msgbox Route110_Text_1F06FB, 4
+	msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF3DE:: @ 81EF3DE
-	msgbox Route110_Text_1F0661, 4
+	msgbox Route110_Text_1F0661, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF3E8:: @ 81EF3E8
-	msgbox Route110_Text_1F0755, 4
+	msgbox Route110_Text_1F0755, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF3F2:: @ 81EF3F2
 	trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064
-	msgbox Route110_Text_29808A, 6
+	msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF409:: @ 81EF409
 	trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5
-	msgbox Route110_Text_2980F8, 6
+	msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF420:: @ 81EF420
@@ -179,39 +179,39 @@ Route110_EventScript_1EF420:: @ 81EF420
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF46B
-	msgbox Route110_Text_2981B3, 4
+	msgbox Route110_Text_2981B3, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF44C:: @ 81EF44C
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route110_Text_298201, 4
+	msgbox Route110_Text_298201, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 512
 	special SetMatchCallRegisteredFlag
 	setorcopyvar VAR_0x8000, 512
-	callstd 8
+	callstd STD_REGISTER_MATCH_CALL
 	release
 	end
 
 Route110_EventScript_1EF46B:: @ 81EF46B
 	trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288
-	msgbox Route110_Text_2982A2, 6
+	msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF482:: @ 81EF482
 	trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5
-	msgbox Route110_Text_298303, 6
+	msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF499:: @ 81EF499
 	trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77
-	msgbox Route110_Text_297B8F, 6
+	msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF4B0:: @ 81EF4B0
 	trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F
-	msgbox Route110_Text_297C1F, 6
+	msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF4C7:: @ 81EF4C7
@@ -219,29 +219,29 @@ Route110_EventScript_1EF4C7:: @ 81EF4C7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF512
-	msgbox Route110_Text_297CB4, 4
+	msgbox Route110_Text_297CB4, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF4F3:: @ 81EF4F3
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route110_Text_297CFE, 4
+	msgbox Route110_Text_297CFE, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 353
 	special SetMatchCallRegisteredFlag
 	setorcopyvar VAR_0x8000, 353
-	callstd 8
+	callstd STD_REGISTER_MATCH_CALL
 	release
 	end
 
 Route110_EventScript_1EF512:: @ 81EF512
 	trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E
-	msgbox Route110_Text_297DB0, 6
+	msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF529:: @ 81EF529
 	trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0
-	msgbox Route110_Text_297FF1, 6
+	msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF540:: @ 81EF540
@@ -249,24 +249,24 @@ Route110_EventScript_1EF540:: @ 81EF540
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF58B
-	msgbox Route110_Text_297E88, 4
+	msgbox Route110_Text_297E88, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF56C:: @ 81EF56C
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route110_Text_297ECD, 4
+	msgbox Route110_Text_297ECD, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 358
 	special SetMatchCallRegisteredFlag
 	setorcopyvar VAR_0x8000, 358
-	callstd 8
+	callstd STD_REGISTER_MATCH_CALL
 	release
 	end
 
 Route110_EventScript_1EF58B:: @ 81EF58B
 	trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37
-	msgbox Route110_Text_297F58, 6
+	msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF5A2:: @ 81EF5A2
@@ -274,29 +274,29 @@ Route110_EventScript_1EF5A2:: @ 81EF5A2
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF5ED
-	msgbox Route110_Text_2983A2, 4
+	msgbox Route110_Text_2983A2, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_1EF5CE:: @ 81EF5CE
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route110_Text_2983EE, 4
+	msgbox Route110_Text_2983EE, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 302
 	special SetMatchCallRegisteredFlag
 	setorcopyvar VAR_0x8000, 302
-	callstd 8
+	callstd STD_REGISTER_MATCH_CALL
 	release
 	end
 
 Route110_EventScript_1EF5ED:: @ 81EF5ED
 	trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF
-	msgbox Route110_Text_2984C8, 6
+	msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF604:: @ 81EF604
 	trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559
-	msgbox Route110_Text_298579, 6
+	msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF61B:: @ 81EF61B
@@ -304,17 +304,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B
 
 Route110_EventScript_1EF61C:: @ 81EF61C
 	trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735
-	msgbox Route110_Text_298755, 6
+	msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF633:: @ 81EF633
 	trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686
-	msgbox Route110_Text_2986A9, 6
+	msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF64A:: @ 81EF64A
 	trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9
-	msgbox Route110_Text_298612, 6
+	msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_1EF661:: @ 81EF661
@@ -327,7 +327,7 @@ Route110_EventScript_1EF661:: @ 81EF661
 
 Route110_EventScript_1EF673:: @ 81EF673
 	special FinishCyclingRoadChallenge
-	msgbox Route110_Text_1F03FF, 4
+	msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT
 	switch VAR_RESULT
 	case 10, Route110_EventScript_1EF6FD
 	case 9, Route110_EventScript_1EF70B
@@ -343,27 +343,27 @@ Route110_EventScript_1EF673:: @ 81EF673
 	end
 
 Route110_EventScript_1EF6FD:: @ 81EF6FD
-	msgbox Route110_Text_1F0431, 4
+	msgbox Route110_Text_1F0431, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF743
 	end
 
 Route110_EventScript_1EF70B:: @ 81EF70B
-	msgbox Route110_Text_1F04A4, 4
+	msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF743
 	end
 
 Route110_EventScript_1EF719:: @ 81EF719
-	msgbox Route110_Text_1F0500, 4
+	msgbox Route110_Text_1F0500, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF743
 	end
 
 Route110_EventScript_1EF727:: @ 81EF727
-	msgbox Route110_Text_1F0567, 4
+	msgbox Route110_Text_1F0567, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF743
 	end
 
 Route110_EventScript_1EF735:: @ 81EF735
-	msgbox Route110_Text_1F05CE, 4
+	msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF743
 	end
 
@@ -425,7 +425,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6
 	return
 
 Route110_EventScript_1EF7EB:: @ 81EF7EB
-	msgbox Route110_Text_1EFC48, 4
+	msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_1EF81A
 	case 1, Route110_EventScript_1EF82A
@@ -448,14 +448,14 @@ Route110_EventScript_1EF83A:: @ 81EF83A
 	end
 
 Route110_EventScript_1EF84A:: @ 81EF84A
-	msgbox Route110_Text_1EFCF1, 4
+	msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT
 	call Route110_EventScript_1EF8DF
-	msgbox Route110_Text_1EFD58, 4
+	msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF8EC
 	end
 
 Route110_EventScript_1EF865:: @ 81EF865
-	msgbox Route110_Text_1EFE3F, 4
+	msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_1EF894
 	case 1, Route110_EventScript_1EF8A4
@@ -478,9 +478,9 @@ Route110_EventScript_1EF8B4:: @ 81EF8B4
 	end
 
 Route110_EventScript_1EF8C4:: @ 81EF8C4
-	msgbox Route110_Text_1EFECD, 4
+	msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT
 	call Route110_EventScript_1EF8DF
-	msgbox Route110_Text_1EFF1C, 4
+	msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT
 	goto Route110_EventScript_1EF8EC
 	end
 
@@ -640,7 +640,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	call_if 1, Route110_EventScript_1EFAEE
 	compare VAR_0x8008, 4
 	call_if 1, Route110_EventScript_1EFAF9
-	msgbox Route110_Text_1F0AB5, 4
+	msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	applymovement 36, Route110_Movement_2725A4
@@ -652,16 +652,16 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	applymovement 36, Route110_Movement_2725AA
 	waitmovement 0
 	delay 30
-	msgbox Route110_Text_1F0AFF, 4
+	msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route110_Text_1F0C0C, 4
+	msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_0x119
-	msgbox Route110_Text_1F0C33, 4
+	msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 1
 	call_if 1, Route110_EventScript_1EFB04