diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
| commit | 65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch) | |
| tree | 250c345d17b8d8f910d327d98f577afddfb3a64a /data/maps/UnionRoom | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/UnionRoom')
| -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 5a478970d..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,14 +21,14 @@ 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 + 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 |