diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 4c0e20e0f0..797a33bfbd 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -9,27 +9,26 @@ namespace api {
 
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->api_version_major = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->api_version_minor = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->client_info = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void HelloResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(1, this->api_version_major);
@@ -45,13 +44,13 @@ void HelloResponse::calculate_size(uint32_t &total_size) const {
 }
 bool ConnectRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->password = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void ConnectResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->invalid_password); }
 void ConnectResponse::calculate_size(uint32_t &total_size) const {
@@ -59,23 +58,23 @@ void ConnectResponse::calculate_size(uint32_t &total_size) const {
 }
 bool AreaInfo::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->area_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool AreaInfo::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->name = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void AreaInfo::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(1, this->area_id);
@@ -87,27 +86,26 @@ void AreaInfo::calculate_size(uint32_t &total_size) const {
 }
 bool DeviceInfo::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->device_id = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->area_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool DeviceInfo::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->name = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void DeviceInfo::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(1, this->device_id);
@@ -258,51 +256,44 @@ void CoverStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool CoverCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_legacy_command = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->legacy_command = static_cast<enums::LegacyCoverCommand>(value.as_uint32());
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->has_position = value.as_bool();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->has_tilt = value.as_bool();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->stop = value.as_bool();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool CoverCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->position = value.as_float();
-      return true;
-    }
-    case 7: {
+      break;
+    case 7:
       this->tilt = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_FAN
@@ -364,77 +355,66 @@ void FanStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool FanCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_state = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->state = value.as_bool();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->has_speed = value.as_bool();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->speed = static_cast<enums::FanSpeed>(value.as_uint32());
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->has_oscillating = value.as_bool();
-      return true;
-    }
-    case 7: {
+      break;
+    case 7:
       this->oscillating = value.as_bool();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->has_direction = value.as_bool();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->direction = static_cast<enums::FanDirection>(value.as_uint32());
-      return true;
-    }
-    case 10: {
+      break;
+    case 10:
       this->has_speed_level = value.as_bool();
-      return true;
-    }
-    case 11: {
+      break;
+    case 11:
       this->speed_level = value.as_int32();
-      return true;
-    }
-    case 12: {
+      break;
+    case 12:
       this->has_preset_mode = value.as_bool();
-      return true;
-    }
-    case 14: {
+      break;
+    case 14:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool FanCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 13: {
+    case 13:
       this->preset_mode = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool FanCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_LIGHT
@@ -520,133 +500,108 @@ void LightStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool LightCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_state = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->state = value.as_bool();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->has_brightness = value.as_bool();
-      return true;
-    }
-    case 22: {
+      break;
+    case 22:
       this->has_color_mode = value.as_bool();
-      return true;
-    }
-    case 23: {
+      break;
+    case 23:
       this->color_mode = static_cast<enums::ColorMode>(value.as_uint32());
-      return true;
-    }
-    case 20: {
+      break;
+    case 20:
       this->has_color_brightness = value.as_bool();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->has_rgb = value.as_bool();
-      return true;
-    }
-    case 10: {
+      break;
+    case 10:
       this->has_white = value.as_bool();
-      return true;
-    }
-    case 12: {
+      break;
+    case 12:
       this->has_color_temperature = value.as_bool();
-      return true;
-    }
-    case 24: {
+      break;
+    case 24:
       this->has_cold_white = value.as_bool();
-      return true;
-    }
-    case 26: {
+      break;
+    case 26:
       this->has_warm_white = value.as_bool();
-      return true;
-    }
-    case 14: {
+      break;
+    case 14:
       this->has_transition_length = value.as_bool();
-      return true;
-    }
-    case 15: {
+      break;
+    case 15:
       this->transition_length = value.as_uint32();
-      return true;
-    }
-    case 16: {
+      break;
+    case 16:
       this->has_flash_length = value.as_bool();
-      return true;
-    }
-    case 17: {
+      break;
+    case 17:
       this->flash_length = value.as_uint32();
-      return true;
-    }
-    case 18: {
+      break;
+    case 18:
       this->has_effect = value.as_bool();
-      return true;
-    }
-    case 28: {
+      break;
+    case 28:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool LightCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 19: {
+    case 19:
       this->effect = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool LightCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->brightness = value.as_float();
-      return true;
-    }
-    case 21: {
+      break;
+    case 21:
       this->color_brightness = value.as_float();
-      return true;
-    }
-    case 7: {
+      break;
+    case 7:
       this->red = value.as_float();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->green = value.as_float();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->blue = value.as_float();
-      return true;
-    }
-    case 11: {
+      break;
+    case 11:
       this->white = value.as_float();
-      return true;
-    }
-    case 13: {
+      break;
+    case 13:
       this->color_temperature = value.as_float();
-      return true;
-    }
-    case 25: {
+      break;
+    case 25:
       this->cold_white = value.as_float();
-      return true;
-    }
-    case 27: {
+      break;
+    case 27:
       this->warm_white = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_SENSOR
@@ -732,27 +687,26 @@ void SwitchStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool SwitchCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->state = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool SwitchCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_TEXT_SENSOR
@@ -793,17 +747,16 @@ void TextSensorStateResponse::calculate_size(uint32_t &total_size) const {
 #endif
 bool SubscribeLogsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->level = static_cast<enums::LogLevel>(value.as_uint32());
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->dump_config = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void SubscribeLogsResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(1, static_cast<uint32_t>(this->level));
@@ -818,13 +771,13 @@ void SubscribeLogsResponse::calculate_size(uint32_t &total_size) const {
 #ifdef USE_API_NOISE
 bool NoiseEncryptionSetKeyRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void NoiseEncryptionSetKeyResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
 void NoiseEncryptionSetKeyResponse::calculate_size(uint32_t &total_size) const {
@@ -833,17 +786,16 @@ void NoiseEncryptionSetKeyResponse::calculate_size(uint32_t &total_size) const {
 #endif
 bool HomeassistantServiceMap::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_string();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->value = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void HomeassistantServiceMap::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->key);
@@ -885,31 +837,29 @@ void SubscribeHomeAssistantStateResponse::calculate_size(uint32_t &total_size) c
 }
 bool HomeAssistantStateResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->entity_id = value.as_string();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->state = value.as_string();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->attribute = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool GetTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->epoch_seconds = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void GetTimeResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->epoch_seconds); }
 void GetTimeResponse::calculate_size(uint32_t &total_size) const {
@@ -918,23 +868,23 @@ void GetTimeResponse::calculate_size(uint32_t &total_size) const {
 #ifdef USE_API_SERVICES
 bool ListEntitiesServicesArgument::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->type = static_cast<enums::ServiceArgType>(value.as_uint32());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ListEntitiesServicesArgument::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->name = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void ListEntitiesServicesArgument::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->name);
@@ -958,57 +908,51 @@ void ListEntitiesServicesResponse::calculate_size(uint32_t &total_size) const {
 }
 bool ExecuteServiceArgument::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->bool_ = value.as_bool();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->legacy_int = value.as_int32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->int_ = value.as_sint32();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->bool_array.push_back(value.as_bool());
-      return true;
-    }
-    case 7: {
+      break;
+    case 7:
       this->int_array.push_back(value.as_sint32());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ExecuteServiceArgument::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 4: {
+    case 4:
       this->string_ = value.as_string();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->string_array.push_back(value.as_string());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ExecuteServiceArgument::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->float_ = value.as_float();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->float_array.push_back(value.as_float());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void ExecuteServiceArgument::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(1, this->bool_);
@@ -1056,24 +1000,24 @@ void ExecuteServiceArgument::calculate_size(uint32_t &total_size) const {
 }
 bool ExecuteServiceRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->args.emplace_back();
       value.decode_to_message(this->args.back());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ExecuteServiceRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_CAMERA
@@ -1111,17 +1055,16 @@ void CameraImageResponse::calculate_size(uint32_t &total_size) const {
 }
 bool CameraImageRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->single = value.as_bool();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->stream = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_CLIMATE
@@ -1255,117 +1198,96 @@ void ClimateStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_mode = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->mode = static_cast<enums::ClimateMode>(value.as_uint32());
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->has_target_temperature = value.as_bool();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->has_target_temperature_low = value.as_bool();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->has_target_temperature_high = value.as_bool();
-      return true;
-    }
-    case 10: {
+      break;
+    case 10:
       this->unused_has_legacy_away = value.as_bool();
-      return true;
-    }
-    case 11: {
+      break;
+    case 11:
       this->unused_legacy_away = value.as_bool();
-      return true;
-    }
-    case 12: {
+      break;
+    case 12:
       this->has_fan_mode = value.as_bool();
-      return true;
-    }
-    case 13: {
+      break;
+    case 13:
       this->fan_mode = static_cast<enums::ClimateFanMode>(value.as_uint32());
-      return true;
-    }
-    case 14: {
+      break;
+    case 14:
       this->has_swing_mode = value.as_bool();
-      return true;
-    }
-    case 15: {
+      break;
+    case 15:
       this->swing_mode = static_cast<enums::ClimateSwingMode>(value.as_uint32());
-      return true;
-    }
-    case 16: {
+      break;
+    case 16:
       this->has_custom_fan_mode = value.as_bool();
-      return true;
-    }
-    case 18: {
+      break;
+    case 18:
       this->has_preset = value.as_bool();
-      return true;
-    }
-    case 19: {
+      break;
+    case 19:
       this->preset = static_cast<enums::ClimatePreset>(value.as_uint32());
-      return true;
-    }
-    case 20: {
+      break;
+    case 20:
       this->has_custom_preset = value.as_bool();
-      return true;
-    }
-    case 22: {
+      break;
+    case 22:
       this->has_target_humidity = value.as_bool();
-      return true;
-    }
-    case 24: {
+      break;
+    case 24:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ClimateCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 17: {
+    case 17:
       this->custom_fan_mode = value.as_string();
-      return true;
-    }
-    case 21: {
+      break;
+    case 21:
       this->custom_preset = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ClimateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->target_temperature = value.as_float();
-      return true;
-    }
-    case 7: {
+      break;
+    case 7:
       this->target_temperature_low = value.as_float();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->target_temperature_high = value.as_float();
-      return true;
-    }
-    case 23: {
+      break;
+    case 23:
       this->target_humidity = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_NUMBER
@@ -1415,27 +1337,26 @@ void NumberStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool NumberCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool NumberCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->state = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_SELECT
@@ -1481,33 +1402,33 @@ void SelectStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool SelectCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool SelectCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->state = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool SelectCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_SIREN
@@ -1555,61 +1476,54 @@ void SirenStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool SirenCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_state = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->state = value.as_bool();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->has_tone = value.as_bool();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->has_duration = value.as_bool();
-      return true;
-    }
-    case 7: {
+      break;
+    case 7:
       this->duration = value.as_uint32();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->has_volume = value.as_bool();
-      return true;
-    }
-    case 10: {
+      break;
+    case 10:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool SirenCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 5: {
+    case 5:
       this->tone = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool SirenCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->volume = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_LOCK
@@ -1653,41 +1567,39 @@ void LockStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool LockCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->command = static_cast<enums::LockCommand>(value.as_uint32());
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->has_code = value.as_bool();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool LockCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 4: {
+    case 4:
       this->code = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool LockCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_BUTTON
@@ -1715,57 +1627,54 @@ void ListEntitiesButtonResponse::calculate_size(uint32_t &total_size) const {
 }
 bool ButtonCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ButtonCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_MEDIA_PLAYER
 bool MediaPlayerSupportedFormat::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->sample_rate = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->num_channels = value.as_uint32();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->purpose = static_cast<enums::MediaPlayerFormatPurpose>(value.as_uint32());
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->sample_bytes = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool MediaPlayerSupportedFormat::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->format = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void MediaPlayerSupportedFormat::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->format);
@@ -1823,97 +1732,89 @@ void MediaPlayerStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool MediaPlayerCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_command = value.as_bool();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->command = static_cast<enums::MediaPlayerCommand>(value.as_uint32());
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->has_volume = value.as_bool();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->has_media_url = value.as_bool();
-      return true;
-    }
-    case 8: {
+      break;
+    case 8:
       this->has_announcement = value.as_bool();
-      return true;
-    }
-    case 9: {
+      break;
+    case 9:
       this->announcement = value.as_bool();
-      return true;
-    }
-    case 10: {
+      break;
+    case 10:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool MediaPlayerCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 7: {
+    case 7:
       this->media_url = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool MediaPlayerCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->volume = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 bool SubscribeBluetoothLEAdvertisementsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->flags = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothServiceData::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->legacy_data.push_back(value.as_uint32());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothServiceData::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->uuid = value.as_string();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->data = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothServiceData::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->uuid);
@@ -1961,31 +1862,29 @@ void BluetoothLEAdvertisementResponse::calculate_size(uint32_t &total_size) cons
 }
 bool BluetoothLERawAdvertisement::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->rssi = value.as_sint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->address_type = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothLERawAdvertisement::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 4: {
+    case 4:
       this->data = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothLERawAdvertisement::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint64(1, this->address);
@@ -2009,25 +1908,22 @@ void BluetoothLERawAdvertisementsResponse::calculate_size(uint32_t &total_size)
 }
 bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->request_type = static_cast<enums::BluetoothDeviceRequestType>(value.as_uint32());
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->has_address_type = value.as_bool();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->address_type = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothDeviceConnectionResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint64(1, this->address);
@@ -2043,27 +1939,26 @@ void BluetoothDeviceConnectionResponse::calculate_size(uint32_t &total_size) con
 }
 bool BluetoothGATTGetServicesRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTDescriptor::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->uuid.push_back(value.as_uint64());
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothGATTDescriptor::encode(ProtoWriteBuffer buffer) const {
   for (auto &it : this->uuid) {
@@ -2081,32 +1976,30 @@ void BluetoothGATTDescriptor::calculate_size(uint32_t &total_size) const {
 }
 bool BluetoothGATTCharacteristic::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->uuid.push_back(value.as_uint64());
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->properties = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTCharacteristic::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 4: {
+    case 4:
       this->descriptors.emplace_back();
       value.decode_to_message(this->descriptors.back());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothGATTCharacteristic::encode(ProtoWriteBuffer buffer) const {
   for (auto &it : this->uuid) {
@@ -2130,28 +2023,27 @@ void BluetoothGATTCharacteristic::calculate_size(uint32_t &total_size) const {
 }
 bool BluetoothGATTService::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->uuid.push_back(value.as_uint64());
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTService::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->characteristics.emplace_back();
       value.decode_to_message(this->characteristics.back());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothGATTService::encode(ProtoWriteBuffer buffer) const {
   for (auto &it : this->uuid) {
@@ -2189,17 +2081,16 @@ void BluetoothGATTGetServicesDoneResponse::calculate_size(uint32_t &total_size)
 }
 bool BluetoothGATTReadRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothGATTReadResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint64(1, this->address);
@@ -2213,87 +2104,81 @@ void BluetoothGATTReadResponse::calculate_size(uint32_t &total_size) const {
 }
 bool BluetoothGATTWriteRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->response = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTWriteRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 4: {
+    case 4:
       this->data = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTReadDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTWriteDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTWriteDescriptorRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->data = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool BluetoothGATTNotifyRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->address = value.as_uint64();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->handle = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->enable = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void BluetoothGATTNotifyDataResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint64(1, this->address);
@@ -2387,53 +2272,51 @@ void BluetoothScannerStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool BluetoothScannerSetModeRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->mode = static_cast<enums::BluetoothScannerMode>(value.as_uint32());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_VOICE_ASSISTANT
 bool SubscribeVoiceAssistantRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->subscribe = value.as_bool();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->flags = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantAudioSettings::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->noise_suppression_level = value.as_uint32();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->auto_gain = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantAudioSettings::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->volume_multiplier = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void VoiceAssistantAudioSettings::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(1, this->noise_suppression_level);
@@ -2461,31 +2344,29 @@ void VoiceAssistantRequest::calculate_size(uint32_t &total_size) const {
 }
 bool VoiceAssistantResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->port = value.as_uint32();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->error = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantEventData::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->name = value.as_string();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->value = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void VoiceAssistantEventData::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->name);
@@ -2497,44 +2378,44 @@ void VoiceAssistantEventData::calculate_size(uint32_t &total_size) const {
 }
 bool VoiceAssistantEventResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->event_type = static_cast<enums::VoiceAssistantEvent>(value.as_uint32());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantEventResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->data.emplace_back();
       value.decode_to_message(this->data.back());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantAudio::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->end = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantAudio::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->data = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void VoiceAssistantAudio::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bytes(1, reinterpret_cast<const uint8_t *>(this->data.data()), this->data.size());
@@ -2546,67 +2427,61 @@ void VoiceAssistantAudio::calculate_size(uint32_t &total_size) const {
 }
 bool VoiceAssistantTimerEventResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->event_type = static_cast<enums::VoiceAssistantTimerEvent>(value.as_uint32());
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->total_seconds = value.as_uint32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->seconds_left = value.as_uint32();
-      return true;
-    }
-    case 6: {
+      break;
+    case 6:
       this->is_active = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantTimerEventResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->timer_id = value.as_string();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->name = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantAnnounceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 4: {
+    case 4:
       this->start_conversation = value.as_bool();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->media_id = value.as_string();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->text = value.as_string();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->preannounce_media_id = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void VoiceAssistantAnnounceFinished::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
 void VoiceAssistantAnnounceFinished::calculate_size(uint32_t &total_size) const {
@@ -2614,21 +2489,19 @@ void VoiceAssistantAnnounceFinished::calculate_size(uint32_t &total_size) const
 }
 bool VoiceAssistantWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->id = value.as_string();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->wake_word = value.as_string();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->trained_languages.push_back(value.as_string());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 void VoiceAssistantWakeWord::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->id);
@@ -2666,13 +2539,13 @@ void VoiceAssistantConfigurationResponse::calculate_size(uint32_t &total_size) c
 }
 bool VoiceAssistantSetConfiguration::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->active_wake_words.push_back(value.as_string());
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
@@ -2714,37 +2587,36 @@ void AlarmControlPanelStateResponse::calculate_size(uint32_t &total_size) const
 }
 bool AlarmControlPanelCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->command = static_cast<enums::AlarmControlPanelStateCommand>(value.as_uint32());
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool AlarmControlPanelCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->code = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool AlarmControlPanelCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_TEXT
@@ -2790,33 +2662,33 @@ void TextStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool TextCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool TextCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->state = value.as_string();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool TextCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_DATETIME_DATE
@@ -2858,35 +2730,32 @@ void DateStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool DateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->year = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->month = value.as_uint32();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->day = value.as_uint32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool DateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_DATETIME_TIME
@@ -2928,35 +2797,32 @@ void TimeStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool TimeCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->hour = value.as_uint32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->minute = value.as_uint32();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->second = value.as_uint32();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool TimeCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_EVENT
@@ -3044,35 +2910,32 @@ void ValveStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool ValveCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->has_position = value.as_bool();
-      return true;
-    }
-    case 4: {
+      break;
+    case 4:
       this->stop = value.as_bool();
-      return true;
-    }
-    case 5: {
+      break;
+    case 5:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool ValveCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->position = value.as_float();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_DATETIME_DATETIME
@@ -3110,27 +2973,26 @@ void DateTimeStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool DateTimeCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 3: {
+    case 3:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool DateTimeCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
-    case 2: {
+      break;
+    case 2:
       this->epoch_seconds = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 #ifdef USE_UPDATE
@@ -3184,27 +3046,26 @@ void UpdateStateResponse::calculate_size(uint32_t &total_size) const {
 }
 bool UpdateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
-    case 2: {
+    case 2:
       this->command = static_cast<enums::UpdateCommand>(value.as_uint32());
-      return true;
-    }
-    case 3: {
+      break;
+    case 3:
       this->device_id = value.as_uint32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 bool UpdateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
-    case 1: {
+    case 1:
       this->key = value.as_fixed32();
-      return true;
-    }
+      break;
     default:
       return false;
   }
+  return true;
 }
 #endif
 
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 01135bd63d..f6e18d529d 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -8,7 +8,6 @@ from pathlib import Path
 import re
 from subprocess import call
 import sys
-from textwrap import dedent
 from typing import Any
 
 import aioesphomeapi.api_options_pb2 as pb
@@ -157,13 +156,7 @@ class TypeInfo(ABC):
         content = self.decode_varint
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name} = {content};
-          return true;
-        }}"""
-        )
+        return f"case {self.number}: this->{self.field_name} = {content}; break;"
 
     decode_varint = None
 
@@ -172,13 +165,7 @@ class TypeInfo(ABC):
         content = self.decode_length
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name} = {content};
-          return true;
-        }}"""
-        )
+        return f"case {self.number}: this->{self.field_name} = {content}; break;"
 
     decode_length = None
 
@@ -187,13 +174,7 @@ class TypeInfo(ABC):
         content = self.decode_32bit
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name} = {content};
-          return true;
-        }}"""
-        )
+        return f"case {self.number}: this->{self.field_name} = {content}; break;"
 
     decode_32bit = None
 
@@ -202,13 +183,7 @@ class TypeInfo(ABC):
         content = self.decode_64bit
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name} = {content};
-          return true;
-        }}"""
-        )
+        return f"case {self.number}: this->{self.field_name} = {content}; break;"
 
     decode_64bit = None
 
@@ -580,13 +555,7 @@ class MessageType(TypeInfo):
     @property
     def decode_length_content(self) -> str:
         # Custom decode that doesn't use templates
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          value.decode_to_message(this->{self.field_name});
-          return true;
-        }}"""
-        )
+        return f"case {self.number}: value.decode_to_message(this->{self.field_name}); break;"
 
     def dump(self, name: str) -> str:
         o = f"{name}.dump_to(out);"
@@ -797,12 +766,8 @@ class RepeatedTypeInfo(TypeInfo):
         content = self._ti.decode_varint
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name}.push_back({content});
-          return true;
-        }}"""
+        return (
+            f"case {self.number}: this->{self.field_name}.push_back({content}); break;"
         )
 
     @property
@@ -810,22 +775,11 @@ class RepeatedTypeInfo(TypeInfo):
         content = self._ti.decode_length
         if content is None and isinstance(self._ti, MessageType):
             # Special handling for non-template message decoding
-            return dedent(
-                f"""\
-        case {self.number}: {{
-          this->{self.field_name}.emplace_back();
-          value.decode_to_message(this->{self.field_name}.back());
-          return true;
-        }}"""
-            )
+            return f"case {self.number}: this->{self.field_name}.emplace_back(); value.decode_to_message(this->{self.field_name}.back()); break;"
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name}.push_back({content});
-          return true;
-        }}"""
+        return (
+            f"case {self.number}: this->{self.field_name}.push_back({content}); break;"
         )
 
     @property
@@ -833,12 +787,8 @@ class RepeatedTypeInfo(TypeInfo):
         content = self._ti.decode_32bit
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name}.push_back({content});
-          return true;
-        }}"""
+        return (
+            f"case {self.number}: this->{self.field_name}.push_back({content}); break;"
         )
 
     @property
@@ -846,12 +796,8 @@ class RepeatedTypeInfo(TypeInfo):
         content = self._ti.decode_64bit
         if content is None:
             return None
-        return dedent(
-            f"""\
-        case {self.number}: {{
-          this->{self.field_name}.push_back({content});
-          return true;
-        }}"""
+        return (
+            f"case {self.number}: this->{self.field_name}.push_back({content}); break;"
         )
 
     @property
@@ -1155,41 +1101,45 @@ def build_message_type(
 
     cpp = ""
     if decode_varint:
-        decode_varint.append("default:\n  return false;")
         o = f"bool {desc.name}::decode_varint(uint32_t field_id, ProtoVarInt value) {{\n"
         o += "  switch (field_id) {\n"
         o += indent("\n".join(decode_varint), "    ") + "\n"
+        o += "    default: return false;\n"
         o += "  }\n"
+        o += "  return true;\n"
         o += "}\n"
         cpp += o
         prot = "bool decode_varint(uint32_t field_id, ProtoVarInt value) override;"
         protected_content.insert(0, prot)
     if decode_length:
-        decode_length.append("default:\n  return false;")
         o = f"bool {desc.name}::decode_length(uint32_t field_id, ProtoLengthDelimited value) {{\n"
         o += "  switch (field_id) {\n"
         o += indent("\n".join(decode_length), "    ") + "\n"
+        o += "    default: return false;\n"
         o += "  }\n"
+        o += "  return true;\n"
         o += "}\n"
         cpp += o
         prot = "bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;"
         protected_content.insert(0, prot)
     if decode_32bit:
-        decode_32bit.append("default:\n  return false;")
         o = f"bool {desc.name}::decode_32bit(uint32_t field_id, Proto32Bit value) {{\n"
         o += "  switch (field_id) {\n"
         o += indent("\n".join(decode_32bit), "    ") + "\n"
+        o += "    default: return false;\n"
         o += "  }\n"
+        o += "  return true;\n"
         o += "}\n"
         cpp += o
         prot = "bool decode_32bit(uint32_t field_id, Proto32Bit value) override;"
         protected_content.insert(0, prot)
     if decode_64bit:
-        decode_64bit.append("default:\n  return false;")
         o = f"bool {desc.name}::decode_64bit(uint32_t field_id, Proto64Bit value) {{\n"
         o += "  switch (field_id) {\n"
         o += indent("\n".join(decode_64bit), "    ") + "\n"
+        o += "    default: return false;\n"
         o += "  }\n"
+        o += "  return true;\n"
         o += "}\n"
         cpp += o
         prot = "bool decode_64bit(uint32_t field_id, Proto64Bit value) override;"