-#define IS_AMOEBALIVE(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBALIVE)
-#define IS_AMOEBOID(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBOID)
-#define IS_SCHLUESSEL(e) (Elementeigenschaften1[e] & EP_BIT_SCHLUESSEL)
-#define IS_PFORTE(e) (Elementeigenschaften1[e] & EP_BIT_PFORTE)
-#define IS_SOLID(e) (Elementeigenschaften1[e] & EP_BIT_SOLID)
-#define IS_MASSIVE(e) (Elementeigenschaften1[e] & EP_BIT_MASSIVE)
-#define IS_SLIPPERY(e) (Elementeigenschaften1[e] & EP_BIT_SLIPPERY)
-#define IS_ENEMY(e) (Elementeigenschaften1[e] & EP_BIT_ENEMY)
-#define IS_MAUER(e) (Elementeigenschaften1[e] & EP_BIT_MAUER)
-#define CAN_FALL(e) (Elementeigenschaften1[e] & EP_BIT_CAN_FALL)
-#define CAN_SMASH(e) (Elementeigenschaften1[e] & EP_BIT_CAN_SMASH)
-#define CAN_CHANGE(e) (Elementeigenschaften1[e] & EP_BIT_CAN_CHANGE)
-#define CAN_MOVE(e) (Elementeigenschaften1[e] & EP_BIT_CAN_MOVE)
-#define COULD_MOVE(e) (Elementeigenschaften1[e] & EP_BIT_COULD_MOVE)
-#define DONT_TOUCH(e) (Elementeigenschaften1[e] & EP_BIT_DONT_TOUCH)
-#define DONT_GO_TO(e) (Elementeigenschaften1[e] & EP_BIT_DONT_GO_TO)
-#define IS_MAMPF2(e) (Elementeigenschaften1[e] & EP_BIT_MAMPF2)
-#define IS_CHAR(e) (Elementeigenschaften1[e] & EP_BIT_CHAR)
-#define IS_BD_ELEMENT(e) (Elementeigenschaften1[e] & EP_BIT_BD_ELEMENT)
-#define IS_SB_ELEMENT(e) (Elementeigenschaften1[e] & EP_BIT_SB_ELEMENT)
-#define IS_GEM(e) (Elementeigenschaften1[e] & EP_BIT_GEM)
-#define IS_INACTIVE(e) (Elementeigenschaften1[e] & EP_BIT_INACTIVE)
-#define IS_EXPLOSIVE(e) (Elementeigenschaften1[e] & EP_BIT_EXPLOSIVE)
-#define IS_MAMPF3(e) (Elementeigenschaften1[e] & EP_BIT_MAMPF3)
-#define IS_PUSHABLE(e) (Elementeigenschaften1[e] & EP_BIT_PUSHABLE)
-#define ELEM_IS_PLAYER(e) (Elementeigenschaften1[e] & EP_BIT_PLAYER)
-#define HAS_CONTENT(e) (Elementeigenschaften1[e] & EP_BIT_HAS_CONTENT)
-#define IS_EATABLE(e) (Elementeigenschaften1[e] & EP_BIT_EATABLE)
-#define IS_SP_ELEMENT(e) (Elementeigenschaften1[e] & EP_BIT_SP_ELEMENT)
-#define IS_QUICK_GATE(e) (Elementeigenschaften1[e] & EP_BIT_QUICK_GATE)
-#define IS_OVER_PLAYER(e) (Elementeigenschaften1[e] & EP_BIT_OVER_PLAYER)
-#define IS_ACTIVE_BOMB(e) (Elementeigenschaften1[e] & EP_BIT_ACTIVE_BOMB)
-
-#define IS_BELT(e) (Elementeigenschaften2[e] & EP_BIT_BELT)
-#define IS_BELT_ACTIVE(e) (Elementeigenschaften2[e] & EP_BIT_BELT_ACTIVE)
-#define IS_BELT_SWITCH(e) (Elementeigenschaften2[e] & EP_BIT_BELT_SWITCH)
-#define IS_TUBE(e) (Elementeigenschaften2[e] & EP_BIT_TUBE)
-#define IS_EM_SLIPPERY_WALL(e) (Elementeigenschaften2[e] & EP_BIT_EM_SLIPPERY_WALL)
+#define IS_AMOEBALIVE(e) (Properties1[e] & EP_BIT_AMOEBALIVE)
+#define IS_AMOEBOID(e) (Properties1[e] & EP_BIT_AMOEBOID)
+#define IS_SCHLUESSEL(e) (Properties1[e] & EP_BIT_SCHLUESSEL)
+#define IS_PFORTE(e) (Properties1[e] & EP_BIT_PFORTE)
+#define IS_SOLID(e) (Properties1[e] & EP_BIT_SOLID)
+#define IS_MASSIVE(e) (Properties1[e] & EP_BIT_MASSIVE)
+#define IS_SLIPPERY(e) (Properties1[e] & EP_BIT_SLIPPERY)
+#define IS_ENEMY(e) (Properties1[e] & EP_BIT_ENEMY)
+#define IS_MAUER(e) (Properties1[e] & EP_BIT_MAUER)
+#define CAN_FALL(e) (Properties1[e] & EP_BIT_CAN_FALL)
+#define CAN_SMASH(e) (Properties1[e] & EP_BIT_CAN_SMASH)
+#define CAN_CHANGE(e) (Properties1[e] & EP_BIT_CAN_CHANGE)
+#define CAN_MOVE(e) (Properties1[e] & EP_BIT_CAN_MOVE)
+#define COULD_MOVE(e) (Properties1[e] & EP_BIT_COULD_MOVE)
+#define DONT_TOUCH(e) (Properties1[e] & EP_BIT_DONT_TOUCH)
+#define DONT_GO_TO(e) (Properties1[e] & EP_BIT_DONT_GO_TO)
+#define IS_MAMPF2(e) (Properties1[e] & EP_BIT_MAMPF2)
+#define IS_CHAR(e) (Properties1[e] & EP_BIT_CHAR)
+#define IS_BD_ELEMENT(e) (Properties1[e] & EP_BIT_BD_ELEMENT)
+#define IS_SB_ELEMENT(e) (Properties1[e] & EP_BIT_SB_ELEMENT)
+#define IS_GEM(e) (Properties1[e] & EP_BIT_GEM)
+#define IS_INACTIVE(e) (Properties1[e] & EP_BIT_INACTIVE)
+#define IS_EXPLOSIVE(e) (Properties1[e] & EP_BIT_EXPLOSIVE)
+#define IS_MAMPF3(e) (Properties1[e] & EP_BIT_MAMPF3)
+#define IS_PUSHABLE(e) (Properties1[e] & EP_BIT_PUSHABLE)
+#define ELEM_IS_PLAYER(e) (Properties1[e] & EP_BIT_PLAYER)
+#define HAS_CONTENT(e) (Properties1[e] & EP_BIT_HAS_CONTENT)
+#define IS_EATABLE(e) (Properties1[e] & EP_BIT_EATABLE)
+#define IS_SP_ELEMENT(e) (Properties1[e] & EP_BIT_SP_ELEMENT)
+#define IS_QUICK_GATE(e) (Properties1[e] & EP_BIT_QUICK_GATE)
+#define IS_OVER_PLAYER(e) (Properties1[e] & EP_BIT_OVER_PLAYER)
+#define IS_ACTIVE_BOMB(e) (Properties1[e] & EP_BIT_ACTIVE_BOMB)
+
+#define IS_BELT(e) (Properties2[e] & EP_BIT_BELT)
+#define IS_BELT_ACTIVE(e) (Properties2[e] & EP_BIT_BELT_ACTIVE)
+#define IS_BELT_SWITCH(e) (Properties2[e] & EP_BIT_BELT_SWITCH)
+#define IS_TUBE(e) (Properties2[e] & EP_BIT_TUBE)
+#define IS_EM_SLIPPERY_WALL(e) (Properties2[e] & EP_BIT_EM_SLIPPERY_WALL)