1 files changed, 21 insertions, 19 deletions
diff --git a/include/constants/union_room.h b/include/constants/union_room.h
index 04ffa3037..b4e08b1a8 100644
--- a/include/constants/union_room.h
+++ b/include/constants/union_room.h
@@ -5,29 +5,31 @@
 #define UNION_ROOM_SPAWN_IN   1
 #define UNION_ROOM_SPAWN_OUT  2
 
-#define UROOM_ACTIVITY_NONE       0
-#define UROOM_ACTIVITY_BATTLE     1
-#define UROOM_ACTIVITY_DBLBATTLE  2
-#define UROOM_ACTIVITY_MLTBATTLE  3
-#define UROOM_ACTIVITY_TRADE      4
-#define UROOM_ACTIVITY_CHAT       5
-#define UROOM_ACTIVITY_WCARD      6
-#define UROOM_ACTIVITY_WNEWS      7
-#define UROOM_ACTIVITY_CARD       8
-#define UROOM_ACTIVITY_PJUMP      9
-#define UROOM_ACTIVITY_BCRUSH    10
-#define UROOM_ACTIVITY_BPICK     11
-#define UROOM_ACTIVITY_SEARCH    12
-#define UROOM_ACTIVITY_SPINTRADE 13
-#define UROOM_ACTIVITY_ITEMTRADE 14
+#define ACTIVITY_NONE       0
+#define ACTIVITY_BATTLE     1
+#define ACTIVITY_DBLBATTLE  2
+#define ACTIVITY_MLTBATTLE  3
+#define ACTIVITY_TRADE      4
+#define ACTIVITY_CHAT       5
+#define ACTIVITY_WCARD      6
+#define ACTIVITY_WNEWS      7
+#define ACTIVITY_CARD       8
+#define ACTIVITY_PJUMP      9
+#define ACTIVITY_BCRUSH    10
+#define ACTIVITY_BPICK     11
+#define ACTIVITY_SEARCH    12
+#define ACTIVITY_SPINTRADE 13
+#define ACTIVITY_ITEMTRADE 14
 
 // Player response
-#define UROOM_ACTIVITY_ACCEPT    17
-#define UROOM_ACTIVITY_DECLINE   18
+#define ACTIVITY_ACCEPT    17
+#define ACTIVITY_DECLINE   18
 
 // Duplicate IDs?
-#define UROOM_ACTIVITY_WCARD2    21
-#define UROOM_ACTIVITY_WNEWS2    22
+#define ACTIVITY_WCARD2    21
+#define ACTIVITY_WNEWS2    22
+
+#define IN_UNION_ROOM   0x40
 
 // Used in UR_AddTextPrinterParameterized
 #define UR_COLOR_DKE_WHT_LTE 0