summaryrefslogtreecommitdiff
path: root/data/maps/UnionRoom/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/UnionRoom/scripts.inc')
-rw-r--r--data/maps/UnionRoom/scripts.inc47
1 files changed, 28 insertions, 19 deletions
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index eac27fb5c..f25e7acb6 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,3 +1,12 @@
+.set LOCALID_UR_PLAYER_4, 2
+.set LOCALID_UR_PLAYER_8, 3
+.set LOCALID_UR_PLAYER_7, 4
+.set LOCALID_UR_PLAYER_6, 5
+.set LOCALID_UR_PLAYER_5, 6
+.set LOCALID_UR_PLAYER_3, 7
+.set LOCALID_UR_PLAYER_2, 8
+.set LOCALID_UR_PLAYER_1, 9
+
UnionRoom_MapScripts:: @ 823D1A6
map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
@@ -12,15 +21,15 @@ UnionRoom_OnResume: @ 823D1B1
setflag FLAG_HIDE_UNION_ROOM_PLAYER_6
setflag FLAG_HIDE_UNION_ROOM_PLAYER_7
setflag FLAG_HIDE_UNION_ROOM_PLAYER_8
- removeobject 9
- removeobject 8
- removeobject 7
- removeobject 2
- removeobject 6
- removeobject 5
- removeobject 4
- removeobject 3
- special UnionRoomSpecial
+ removeobject LOCALID_UR_PLAYER_1
+ removeobject LOCALID_UR_PLAYER_2
+ removeobject LOCALID_UR_PLAYER_3
+ removeobject LOCALID_UR_PLAYER_4
+ removeobject LOCALID_UR_PLAYER_5
+ removeobject LOCALID_UR_PLAYER_6
+ removeobject LOCALID_UR_PLAYER_7
+ removeobject LOCALID_UR_PLAYER_8
+ special RunUnionRoom
end
UnionRoom_OnTransition: @ 823D1E5
@@ -29,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
@@ -37,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
@@ -45,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
@@ -53,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
@@ -61,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
@@ -69,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
@@ -77,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
@@ -85,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
@@ -93,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