Merge branch 'master' into add-localids

data/maps/UnionRoom/scripts.inc

@@ -29,7 +29,7 @@ UnionRoom_OnResume: @ 823D1B1
 	removeobject LOCALID_UR_PLAYER_6
 	removeobject LOCALID_UR_PLAYER_7
 	removeobject LOCALID_UR_PLAYER_8
-	special UnionRoomSpecial
+	special RunUnionRoom
 	end
 
 UnionRoom_OnTransition: @ 823D1E5
@@ -38,7 +38,7 @@ UnionRoom_OnTransition: @ 823D1E5
 UnionRoom_EventScript_Player1:: @ 823D1E6
 	lock
 	faceplayer
-	setvar VAR_RESULT, 1
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_1
 	waitstate
 	release
 	end
@@ -46,7 +46,7 @@ UnionRoom_EventScript_Player1:: @ 823D1E6
 UnionRoom_EventScript_Player2:: @ 823D1F0
 	lock
 	faceplayer
-	setvar VAR_RESULT, 2
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_2
 	waitstate
 	release
 	end
@@ -54,7 +54,7 @@ UnionRoom_EventScript_Player2:: @ 823D1F0
 UnionRoom_EventScript_Player3:: @ 823D1FA
 	lock
 	faceplayer
-	setvar VAR_RESULT, 3
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_3
 	waitstate
 	release
 	end
@@ -62,7 +62,7 @@ UnionRoom_EventScript_Player3:: @ 823D1FA
 UnionRoom_EventScript_Player4:: @ 823D204
 	lock
 	faceplayer
-	setvar VAR_RESULT, 4
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_4
 	waitstate
 	release
 	end
@@ -70,7 +70,7 @@ UnionRoom_EventScript_Player4:: @ 823D204
 UnionRoom_EventScript_Player5:: @ 823D20E
 	lock
 	faceplayer
-	setvar VAR_RESULT, 5
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_5
 	waitstate
 	release
 	end
@@ -78,7 +78,7 @@ UnionRoom_EventScript_Player5:: @ 823D20E
 UnionRoom_EventScript_Player6:: @ 823D218
 	lock
 	faceplayer
-	setvar VAR_RESULT, 6
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_6
 	waitstate
 	release
 	end
@@ -86,7 +86,7 @@ UnionRoom_EventScript_Player6:: @ 823D218
 UnionRoom_EventScript_Player7:: @ 823D222
 	lock
 	faceplayer
-	setvar VAR_RESULT, 7
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_7
 	waitstate
 	release
 	end
@@ -94,7 +94,7 @@ UnionRoom_EventScript_Player7:: @ 823D222
 UnionRoom_EventScript_Player8:: @ 823D22C
 	lock
 	faceplayer
-	setvar VAR_RESULT, 8
+	setvar VAR_RESULT, UR_INTERACT_PLAYER_8
 	waitstate
 	release
 	end
@@ -102,14 +102,14 @@ UnionRoom_EventScript_Player8:: @ 823D22C
 UnionRoom_EventScript_Attendant:: @ 823D236
 	lock
 	faceplayer
-	setvar VAR_RESULT, 9
+	setvar VAR_RESULT, UR_INTERACT_ATTENDANT
 	waitstate
 	release
 	end
 
 UnionRoom_EventScript_Unused:: @ 823D240
 	lockall
-	setvar VAR_RESULT, 10
+	setvar VAR_RESULT, UR_INTERACT_UNUSED
 	waitstate
 	releaseall
 	end