diff --git a/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java b/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java
index a5b31e2b..3b390138 100644
--- a/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java
+++ b/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java
@@ -24,7 +24,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 
 public class BattleBanzaiGame extends Game {
 
-    public static final int effectId = 33;
+    public static final int effectId = 32;
 
 
     public static final int POINTS_HIJACK_TILE = Emulator.getConfig().getInt("hotel.banzai.points.tile.steal", 0);
@@ -136,7 +136,7 @@ public class BattleBanzaiGame extends Game {
 
             if (highestScore != null) {
                 for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) {
-                    item.setExtradata((highestScore.teamColor.type + 3) + "");
+                    item.setExtradata((highestScore.teamColor.type + 2) + "");
                     this.room.updateItemState(item);
                 }
             }
@@ -179,7 +179,7 @@ public class BattleBanzaiGame extends Game {
             }
 
             for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) {
-                item.setExtradata((7 + winningTeam.teamColor.type) + "");
+                item.setExtradata((6 + winningTeam.teamColor.type) + "");
                 this.room.updateItemState(item);
             }
 
@@ -263,7 +263,7 @@ public class BattleBanzaiGame extends Game {
                     tileItem.ifPresent(habboItem -> {
                         this.tileLocked(teamColor, habboItem, habbo, true);
 
-                        habboItem.setExtradata((2 + (teamColor.type * 3) + 3) + "");
+                        habboItem.setExtradata((2 + (teamColor.type * 3)) + "");
                         this.room.updateItem(habboItem);
                     });
                 }
@@ -373,7 +373,7 @@ public class BattleBanzaiGame extends Game {
         if (!this.gameTiles.contains(tile.getId())) return;
 
         int check = state - (habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3);
-        if (check == 3 || check == 4) {
+        if (check == 0 || check == 1) {
             state++;
 
             if (state % 3 == 2) {
@@ -383,7 +383,7 @@ public class BattleBanzaiGame extends Game {
                 habbo.getHabboInfo().getGamePlayer().addScore(BattleBanzaiGame.POINTS_FILL_TILE);
             }
         } else {
-            state = (habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3) + 3;
+            state = habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3;
 
             habbo.getHabboInfo().getGamePlayer().addScore(BattleBanzaiGame.POINTS_HIJACK_TILE);
         }
diff --git a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java
index 8fc3f9c7..24b0a64c 100644
--- a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java
+++ b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class FreezeGame extends Game {
-    public static final int effectId = 40;
+    public static final int effectId = 39;
 
     public static int POWER_UP_POINTS;
     public static int POWER_UP_CHANCE;
diff --git a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java
index 4f7ea528..d425a612 100644
--- a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java
+++ b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java
@@ -195,7 +195,7 @@ public class FreezeGamePlayer extends GamePlayer {
             return 0;
 
         if (!this.isFrozen()) {
-            int effectId = 40;
+            int effectId = FreezeGame.effectId;
 
             effectId += super.getTeamColor().type;
 
diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java
index ca9ecee2..d8ec242c 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java
@@ -165,7 +165,7 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable {
                         }
                     }
 
-                    this.setExtradata(team.teamColor.type + 1 + "");
+                    this.setExtradata(team.teamColor.type + "");
                     room.updateItemState(this);
                 }
             }
diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java
index 73994362..1f97a4cc 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java
@@ -75,7 +75,7 @@ public class WiredConditionNotInTeam extends InteractionWiredCondition {
         message.appendInt(this.getId());
         message.appendString("");
         message.appendInt(1);
-        message.appendInt(this.teamColor.type + 1);
+        message.appendInt(this.teamColor.type);
         message.appendInt(0);
         message.appendInt(this.getType().code);
         message.appendInt(0);
diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java
index 21abe9f3..0d29e6d0 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java
@@ -75,7 +75,7 @@ public class WiredConditionTeamMember extends InteractionWiredCondition {
         message.appendInt(this.getId());
         message.appendString("");
         message.appendInt(1);
-        message.appendInt(this.teamColor.type + 1);
+        message.appendInt(this.teamColor.type);
         message.appendInt(0);
         message.appendInt(this.getType().code);
         message.appendInt(0);
diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java
index 160e7eb1..2a094d98 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java
@@ -107,7 +107,7 @@ public class WiredEffectGiveScoreToTeam extends InteractionWiredEffect {
         message.appendInt(3);
         message.appendInt(this.points);
         message.appendInt(this.count);
-        message.appendInt(this.teamColor.type + 1);
+        message.appendInt(this.teamColor.type);
         message.appendInt(0);
         message.appendInt(this.getType().code);
         message.appendInt(this.getDelay());
diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectJoinTeam.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectJoinTeam.java
index bebaad81..f114baf6 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectJoinTeam.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectJoinTeam.java
@@ -90,7 +90,7 @@ public class WiredEffectJoinTeam extends InteractionWiredEffect {
         message.appendInt(this.getId());
         message.appendString("");
         message.appendInt(1);
-        message.appendInt(this.teamColor.type + 1);
+        message.appendInt(this.teamColor.type);
         message.appendInt(0);
         message.appendInt(this.getType().code);
         message.appendInt(this.getDelay());
diff --git a/src/main/java/com/eu/habbo/threading/runnables/BattleBanzaiTilesFlicker.java b/src/main/java/com/eu/habbo/threading/runnables/BattleBanzaiTilesFlicker.java
index 331cf787..345c45be 100644
--- a/src/main/java/com/eu/habbo/threading/runnables/BattleBanzaiTilesFlicker.java
+++ b/src/main/java/com/eu/habbo/threading/runnables/BattleBanzaiTilesFlicker.java
@@ -28,7 +28,7 @@ public class BattleBanzaiTilesFlicker implements Runnable {
 
         int state = 0;
         if (this.on) {
-            state = (this.color.type * 3) + 5;
+            state = (this.color.type * 3) + 2;
             this.on = false;
         } else {
             this.on = true;