more script command renaming

1 files changed, 26 insertions, 26 deletions

diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index 2fec004e4..f83c5cf23 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A
 
 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550
 	setflag 2116
-	compare 0x40be, 1
+	compare_var_to_imm 0x40be, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_16355F
 	end
 
@@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_16355F:: @ 816355F
 Route113_GlassWorkshop_EventScript_163565:: @ 8163565
 	lock
 	faceplayer
-	compare 0x40be, 10
+	compare_var_to_imm 0x40be, 10
 	goto_if 4, Route113_GlassWorkshop_EventScript_1638D2
-	compare 0x40be, 2
+	compare_var_to_imm 0x40be, 2
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635B5
-	compare 0x40be, 1
+	compare_var_to_imm 0x40be, 1
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635AB
 	msgbox Route113_GlassWorkshop_Text_19E4E6, 4
 	giveitem ITEM_SOOT_SACK
@@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB
 
 Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5
 	checkitem ITEM_SOOT_SACK, 1
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635E4
 	msgbox Route113_GlassWorkshop_Text_19E65B, 4
-	compare 0x4048, 250
+	compare_var_to_imm 0x4048, 250
 	goto_if 0, Route113_GlassWorkshop_EventScript_163818
 	message Route113_GlassWorkshop_Text_19E757
 	waittext
@@ -70,10 +70,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660
 	setvar 0x8008, 39
 	bufferitem 0, 0x8008
 	setvar 0x800a, 250
-	compare 0x4048, 250
+	compare_var_to_imm 0x4048, 250
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 10
 	subvar 0x4048, 250
@@ -84,10 +84,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C
 	setvar 0x8008, 40
 	bufferitem 0, 0x8008
 	setvar 0x800a, 500
-	compare 0x4048, 500
+	compare_var_to_imm 0x4048, 500
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 11
 	subvar 0x4048, 500
@@ -98,10 +98,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8
 	setvar 0x8008, 41
 	bufferitem 0, 0x8008
 	setvar 0x800a, 500
-	compare 0x4048, 500
+	compare_var_to_imm 0x4048, 500
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 12
 	subvar 0x4048, 500
@@ -112,10 +112,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714
 	setvar 0x8008, 43
 	bufferitem 0, 0x8008
 	setvar 0x800a, 1000
-	compare 0x4048, 1000
+	compare_var_to_imm 0x4048, 1000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 13
 	subvar 0x4048, 1000
@@ -126,10 +126,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750
 	setvar 0x8008, 42
 	bufferitem 0, 0x8008
 	setvar 0x800a, 1000
-	compare 0x4048, 1000
+	compare_var_to_imm 0x4048, 1000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 14
 	subvar 0x4048, 1000
@@ -141,10 +141,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C
 	setvar 0x8008, 13
 	bufferdecor 0, 0x8008
 	setvar 0x800a, 6000
-	compare 0x4048, 6000
+	compare_var_to_imm 0x4048, 6000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 15
 	subvar 0x4048, 6000
@@ -156,10 +156,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD
 	setvar 0x8008, 6
 	bufferdecor 0, 0x8008
 	setvar 0x800a, 8000
-	compare 0x4048, 8000
+	compare_var_to_imm 0x4048, 8000
 	goto_if 0, Route113_GlassWorkshop_EventScript_163830
 	msgbox Route113_GlassWorkshop_Text_19E7CD, 5
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_163845
 	setvar 0x40be, 16
 	subvar 0x4048, 8000
@@ -201,9 +201,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851
 	pause 30
 	fadescreen 0
 	msgbox Route113_GlassWorkshop_Text_19E9D7, 4
-	compare 0x8009, 0
+	compare_var_to_imm 0x8009, 0
 	call_if 1, Route113_GlassWorkshop_EventScript_163889
-	compare 0x8009, 1
+	compare_var_to_imm 0x8009, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_1638A1
 	setvar 0x40be, 2
 	release
@@ -211,13 +211,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851
 
 Route113_GlassWorkshop_EventScript_163889:: @ 8163889
 	giveitem 0x8008
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1638B4
 	return
 
 Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1
 	givedecoration 0x8008
-	compare RESULT, 0
+	compare_var_to_imm RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1638C3
 	return
 
@@ -295,9 +295,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D
 
 Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1
 	msgbox Route113_GlassWorkshop_Text_19E9D7, 4
-	compare 0x8009, 0
+	compare_var_to_imm 0x8009, 0
 	call_if 1, Route113_GlassWorkshop_EventScript_163889
-	compare 0x8009, 1
+	compare_var_to_imm 0x8009, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_1638A1
 	setvar 0x40be, 2
 	release