diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-14 14:07:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 14:07:32 -0500 |
| commit | 8c66bde7153cd29be3fd17dccb3fef6b09dd8ee4 (patch) | |
| tree | 21964480572d1cf8f95c49b798f955e3bbe19be2 /data/maps/UnionRoom/scripts.inc | |
| parent | b422fd4a499e44889243dc5087b34fdd9f85c6aa (diff) | |
| parent | 515dde69afea00d7eafd0693ee423fcc1ae0bac5 (diff) | |
Merge pull request #388 from GriffinRichards/constants-localids
Use more LOCALID constants
Diffstat (limited to 'data/maps/UnionRoom/scripts.inc')
| -rw-r--r-- | data/maps/UnionRoom/scripts.inc | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index 35222ba8b..7a9b758a0 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,3 +1,12 @@ +.set LOCALID_UNION_ROOM_PLAYER_4, 2 +.set LOCALID_UNION_ROOM_PLAYER_8, 3 +.set LOCALID_UNION_ROOM_PLAYER_7, 4 +.set LOCALID_UNION_ROOM_PLAYER_6, 5 +.set LOCALID_UNION_ROOM_PLAYER_5, 6 +.set LOCALID_UNION_ROOM_PLAYER_3, 7 +.set LOCALID_UNION_ROOM_PLAYER_2, 8 +.set LOCALID_UNION_ROOM_PLAYER_1, 9 + UnionRoom_MapScripts:: @ 816047C map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition @@ -12,14 +21,14 @@ UnionRoom_OnResume:: @ 8160487 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 + 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 UnionRoomSpecial end |