diff --git a/src/HexManiac.Core/ViewModels/Map/BlockMapViewModel.cs b/src/HexManiac.Core/ViewModels/Map/BlockMapViewModel.cs
index bae4c7b5..f81dd4d9 100644
--- a/src/HexManiac.Core/ViewModels/Map/BlockMapViewModel.cs
+++ b/src/HexManiac.Core/ViewModels/Map/BlockMapViewModel.cs
@@ -1931,11 +1931,12 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
 
       private static readonly ObservableCollection<string> weatherOptions = new();
       private static readonly ObservableCollection<string> caveOptions = new();
+      private static readonly ObservableCollection<string> battleOptions = new();
       static MapHeaderViewModel() {
          // weather
-         weatherOptions.Add("None");
+         weatherOptions.Add("Indoor");
          weatherOptions.Add("Sunny Clouds");
-         weatherOptions.Add("Sunny");
+         weatherOptions.Add("Outdoor");
          weatherOptions.Add("Rain");
          weatherOptions.Add("Snow");
          weatherOptions.Add("Thunderstorm");
@@ -1958,13 +1959,27 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
 
          // cave
          caveOptions.Add("Normal");
-         caveOptions.Add("Flash");
+         caveOptions.Add("Flash Usable");
+         caveOptions.Add("Flash Not Usable");
+
+         // battle
+         battleOptions.Add("Normal");
+         battleOptions.Add("Gym");
+         battleOptions.Add("Evil Team");
+         battleOptions.Add("Unknown");
+         battleOptions.Add("Elite 1");
+         battleOptions.Add("Elite 2");
+         battleOptions.Add("Elite 3");
+         battleOptions.Add("Elite 4");
+         battleOptions.Add("Big Red Pokeball");
       }
 
       public ObservableCollection<string> WeatherOptions => weatherOptions;
 
       public ObservableCollection<string> CaveOptions => caveOptions;
 
+      public ObservableCollection<string> BattleOptions => battleOptions;
+
       public MapHeaderViewModel(ModelArrayElement element, Func<ModelDelta> tokens) {
          (map, tokenFactory) = (element, tokens);
          if (element == null) return;
diff --git a/src/HexManiac.WPF/Controls/MapTab.xaml b/src/HexManiac.WPF/Controls/MapTab.xaml
index e22e9602..88149038 100644
--- a/src/HexManiac.WPF/Controls/MapTab.xaml
+++ b/src/HexManiac.WPF/Controls/MapTab.xaml
@@ -804,8 +804,8 @@
                <CheckBox Grid.Row="5" Grid.Column="0" Content="Allow Biking"   IsChecked="{Binding AllowBiking}" Margin="4,2" Visibility="{Binding ShowAllowBikingField, Converter={StaticResource BoolToVisibility}}" />
                <CheckBox Grid.Row="5" Grid.Column="1" Content="Allow Escaping" IsChecked="{Binding AllowEscaping}" Margin="4,2" />
 
-               <local:AngleBorder  Grid.Row="6" Content="BattleType:" />
-               <local:AngleTextBox Grid.Row="6" TextBinding="{Binding BattleType, UpdateSourceTrigger=PropertyChanged}" />
+               <local:AngleBorder  Grid.Row="6" Content="BattleType:" Direction="Left" />
+               <local:AngleComboBox Grid.Row="6" Grid.Column="1" Direction="Out" Margin="0,2,4,2" SelectedIndex="{Binding BattleType}" ItemsSource="{Binding BattleOptions}" />
 
                <local:AngleBorder  Grid.Row="7" Content="FloorNum:" Visibility="{Binding ShowFloorNumField, Converter={StaticResource BoolToVisibility}}" />
                <local:AngleTextBox Grid.Row="7" TextBinding="{Binding FloorNum, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding ShowFloorNumField, Converter={StaticResource BoolToVisibility}}" />