diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /data/maps/UnionRoom | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'data/maps/UnionRoom')
| -rw-r--r-- | data/maps/UnionRoom/scripts.inc | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index f25e7acb6..8a9e7682a 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,18 +1,11 @@ -.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 +@ Note: LOCALID_UNION_ROOM_PLAYER_# are local ids for this map used elsewhere. They're defined in event_objects.h -UnionRoom_MapScripts:: @ 823D1A6 +UnionRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition .byte 0 -UnionRoom_OnResume: @ 823D1B1 +UnionRoom_OnResume: setflag FLAG_HIDE_UNION_ROOM_PLAYER_1 setflag FLAG_HIDE_UNION_ROOM_PLAYER_2 setflag FLAG_HIDE_UNION_ROOM_PLAYER_3 @@ -21,21 +14,21 @@ 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 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 + removeobject LOCALID_UNION_ROOM_PLAYER_1 + removeobject LOCALID_UNION_ROOM_PLAYER_2 + removeobject LOCALID_UNION_ROOM_PLAYER_3 + removeobject LOCALID_UNION_ROOM_PLAYER_4 + removeobject LOCALID_UNION_ROOM_PLAYER_5 + removeobject LOCALID_UNION_ROOM_PLAYER_6 + removeobject LOCALID_UNION_ROOM_PLAYER_7 + removeobject LOCALID_UNION_ROOM_PLAYER_8 special RunUnionRoom end -UnionRoom_OnTransition: @ 823D1E5 +UnionRoom_OnTransition: end -UnionRoom_EventScript_Player1:: @ 823D1E6 +UnionRoom_EventScript_Player1:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_1 @@ -43,7 +36,7 @@ UnionRoom_EventScript_Player1:: @ 823D1E6 release end -UnionRoom_EventScript_Player2:: @ 823D1F0 +UnionRoom_EventScript_Player2:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_2 @@ -51,7 +44,7 @@ UnionRoom_EventScript_Player2:: @ 823D1F0 release end -UnionRoom_EventScript_Player3:: @ 823D1FA +UnionRoom_EventScript_Player3:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_3 @@ -59,7 +52,7 @@ UnionRoom_EventScript_Player3:: @ 823D1FA release end -UnionRoom_EventScript_Player4:: @ 823D204 +UnionRoom_EventScript_Player4:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_4 @@ -67,7 +60,7 @@ UnionRoom_EventScript_Player4:: @ 823D204 release end -UnionRoom_EventScript_Player5:: @ 823D20E +UnionRoom_EventScript_Player5:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_5 @@ -75,7 +68,7 @@ UnionRoom_EventScript_Player5:: @ 823D20E release end -UnionRoom_EventScript_Player6:: @ 823D218 +UnionRoom_EventScript_Player6:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_6 @@ -83,7 +76,7 @@ UnionRoom_EventScript_Player6:: @ 823D218 release end -UnionRoom_EventScript_Player7:: @ 823D222 +UnionRoom_EventScript_Player7:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_7 @@ -91,7 +84,7 @@ UnionRoom_EventScript_Player7:: @ 823D222 release end -UnionRoom_EventScript_Player8:: @ 823D22C +UnionRoom_EventScript_Player8:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_PLAYER_8 @@ -99,7 +92,7 @@ UnionRoom_EventScript_Player8:: @ 823D22C release end -UnionRoom_EventScript_Attendant:: @ 823D236 +UnionRoom_EventScript_Attendant:: lock faceplayer setvar VAR_RESULT, UR_INTERACT_ATTENDANT @@ -107,7 +100,7 @@ UnionRoom_EventScript_Attendant:: @ 823D236 release end -UnionRoom_EventScript_Unused:: @ 823D240 +UnionRoom_EventScript_Unused:: lockall setvar VAR_RESULT, UR_INTERACT_UNUSED waitstate |
