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, 38 insertions, 38 deletions

diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index bf3abf9f8..6c5e8b504 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -79,7 +79,7 @@ Route119_EventScript_1F4506:: @ 81F4506
 	return
 
 Route119_EventScript_1F450B:: @ 81F450B
-	msgbox Route119_Text_1F49FD, 4
+	msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_1F453A
 	case 1, Route119_EventScript_1F454A
@@ -102,14 +102,14 @@ Route119_EventScript_1F455A:: @ 81F455A
 	end
 
 Route119_EventScript_1F456A:: @ 81F456A
-	msgbox Route119_Text_1F4AF3, 4
+	msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT
 	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4B56, 4
+	msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT
 	goto Route119_EventScript_1F460F
 	end
 
 Route119_EventScript_1F4585:: @ 81F4585
-	msgbox Route119_Text_1F4C9A, 4
+	msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_1F45B4
 	case 1, Route119_EventScript_1F45C4
@@ -132,9 +132,9 @@ Route119_EventScript_1F45D4:: @ 81F45D4
 	end
 
 Route119_EventScript_1F45E4:: @ 81F45E4
-	msgbox Route119_Text_1F4D4B, 4
+	msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT
 	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4DB5, 4
+	msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT
 	goto Route119_EventScript_1F460F
 	end
 
@@ -169,7 +169,7 @@ Route119_EventScript_1F460F:: @ 81F460F
 	applymovement 43, Route119_Movement_1F4752
 	waitmovement 0
 	addvar VAR_0x40D1, 1
-	msgbox Route119_Text_1F4E60, 4
+	msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
 	call_if 1, Route119_EventScript_1F46B0
@@ -325,45 +325,45 @@ Route119_Movement_1F4763: @ 81F4763
 	step_end
 
 Route119_EventScript_1F476B:: @ 81F476B
-	msgbox Route119_Text_1F5261, 2
+	msgbox Route119_Text_1F5261, MSGBOX_NPC
 	end
 
 Route119_EventScript_1F4774:: @ 81F4774
-	msgbox Route119_Text_1F530E, 3
+	msgbox Route119_Text_1F530E, MSGBOX_SIGN
 	end
 
 Route119_EventScript_1F477D:: @ 81F477D
-	msgbox Route119_Text_1F5327, 3
+	msgbox Route119_Text_1F5327, MSGBOX_SIGN
 	end
 
 Route119_EventScript_1F4786:: @ 81F4786
 	trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0
-	msgbox Route119_Text_29D902, 6
+	msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F479D:: @ 81F479D
 	trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C
-	msgbox Route119_Text_29D993, 6
+	msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F47B4:: @ 81F47B4
 	trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14
-	msgbox Route119_Text_29DA2C, 6
+	msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F47CB:: @ 81F47CB
 	trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC
-	msgbox Route119_Text_29DADB, 6
+	msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F47E2:: @ 81F47E2
 	trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66
-	msgbox Route119_Text_29DB7C, 6
+	msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F47F9:: @ 81F47F9
 	trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20
-	msgbox Route119_Text_29DC2B, 6
+	msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4810:: @ 81F4810
@@ -371,24 +371,24 @@ Route119_EventScript_1F4810:: @ 81F4810
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route119_EventScript_1F485B
-	msgbox Route119_Text_29DCC6, 4
+	msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_EventScript_1F483C:: @ 81F483C
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route119_Text_29DD1C, 4
+	msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 552
 	special SetMatchCallRegisteredFlag
 	setorcopyvar VAR_0x8000, 552
-	callstd 8
+	callstd STD_REGISTER_MATCH_CALL
 	release
 	end
 
 Route119_EventScript_1F485B:: @ 81F485B
 	trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5
-	msgbox Route119_Text_29DDBD, 6
+	msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4872:: @ 81F4872
@@ -396,75 +396,75 @@ Route119_EventScript_1F4872:: @ 81F4872
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route119_EventScript_1F48BD
-	msgbox Route119_Text_29DE88, 4
+	msgbox Route119_Text_29DE88, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_EventScript_1F489E:: @ 81F489E
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route119_Text_29DEF7, 4
+	msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 559
 	special SetMatchCallRegisteredFlag
 	setorcopyvar VAR_0x8000, 559
-	callstd 8
+	callstd STD_REGISTER_MATCH_CALL
 	release
 	end
 
 Route119_EventScript_1F48BD:: @ 81F48BD
 	trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92
-	msgbox Route119_Text_29DFAF, 6
+	msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F48D4:: @ 81F48D4
 	trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063
-	msgbox Route119_Text_29E071, 6
+	msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F48EB:: @ 81F48EB
 	trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1
-	msgbox Route119_Text_29E0F6, 6
+	msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4902:: @ 81F4902
 	trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D
-	msgbox Route119_Text_29E19D, 6
+	msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4919:: @ 81F4919
 	trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B
-	msgbox Route119_Text_29E245, 6
+	msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4930:: @ 81F4930
 	trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288
-	msgbox Route119_Text_29E2A3, 6
+	msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4947:: @ 81F4947
 	trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372
-	msgbox Route119_Text_29E3A2, 6
+	msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F495E:: @ 81F495E
 	trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F
-	msgbox Route119_Text_29E492, 6
+	msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F4975:: @ 81F4975
 	trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513
-	msgbox Route119_Text_29E532, 6
+	msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F498C:: @ 81F498C
 	trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1
-	msgbox Route119_Text_29E5CB, 6
+	msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1F49A3:: @ 81F49A3
 	lock
 	faceplayer
-	msgbox Route119_Text_1F50EB, 4
+	msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
 	waitmovement 0
@@ -474,7 +474,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3
 Route119_EventScript_1F49BA:: @ 81F49BA
 	lock
 	faceplayer
-	msgbox Route119_Text_1F5147, 4
+	msgbox Route119_Text_1F5147, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
 	waitmovement 0
@@ -482,15 +482,15 @@ Route119_EventScript_1F49BA:: @ 81F49BA
 	end
 
 Route119_EventScript_1F49D1:: @ 81F49D1
-	msgbox Route119_Text_1F51A2, 2
+	msgbox Route119_Text_1F51A2, MSGBOX_NPC
 	end
 
 Route119_EventScript_1F49DA:: @ 81F49DA
-	msgbox Route119_Text_1F52B9, 2
+	msgbox Route119_Text_1F52B9, MSGBOX_NPC
 	end
 
 Route119_EventScript_1F49E3:: @ 81F49E3
-	msgbox Route119_Text_1F5339, 3
+	msgbox Route119_Text_1F5339, MSGBOX_SIGN
 	end
 
 Route119_EventScript_1F49EC:: @ 81F49EC