diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
| commit | beeb673ba16e02cacadb2de0ee3608d2106ed14a (patch) | |
| tree | 8924e783fc8af67286cf45abcef95c065a3fd223 /data/maps/UnionRoom | |
| parent | 2ed1f7c6f92abe93d86b921709576b82970f0848 (diff) | |
| parent | ebade7affb31d5bcdc17cdcd3895758010ee6f66 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
Diffstat (limited to 'data/maps/UnionRoom')
| -rw-r--r-- | data/maps/UnionRoom/scripts.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index eac27fb5c..5a478970d 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -20,7 +20,7 @@ UnionRoom_OnResume: @ 823D1B1 removeobject 5 removeobject 4 removeobject 3 - special UnionRoomSpecial + special RunUnionRoom end UnionRoom_OnTransition: @ 823D1E5 @@ -29,7 +29,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 +37,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 +45,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 +53,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 +61,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 +69,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 +77,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 +85,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 +93,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 |