diff --git a/src/Battling/Battle/Battle.cpp b/src/Battling/Battle/Battle.cpp
index 804570b..7937bd7 100644
--- a/src/Battling/Battle/Battle.cpp
+++ b/src/Battling/Battle/Battle.cpp
@@ -5,10 +5,10 @@ void PkmnLib::Battling::Battle::SetWeather(const ArbUt::StringView& name) {
     }
     _weatherScript = std::unique_ptr<CreatureLib::Battling::Script>(
         _library->LoadScript(static_cast<ScriptCategory>(PkmnScriptCategory::Weather), name));
-    _eventHook.TriggerEvent(new WeatherChangeEvent(name));
+    _eventHook.Trigger<WeatherChangeEvent>(name);
 }
 void PkmnLib::Battling::Battle::ClearWeather() {
     _weatherScript->OnRemove();
     _weatherScript = nullptr;
-    _eventHook.TriggerEvent(new WeatherChangeEvent(""_cnc));
+    _eventHook.Trigger<WeatherChangeEvent>(""_cnc);
 }
diff --git a/src/Battling/EventHooks/PkmnEventKind.hpp b/src/Battling/EventHooks/PkmnEventKind.hpp
index 210ccef..399b450 100644
--- a/src/Battling/EventHooks/PkmnEventKind.hpp
+++ b/src/Battling/EventHooks/PkmnEventKind.hpp
@@ -3,7 +3,6 @@
 #include <Arbutils/Enum.hpp>
 #include <CreatureLib/Battling/EventHooks/EventDataKind.hpp>
 
-ENUM_WITH_START_VALUE(PkmnEventDataKind, uint8_t, ((uint8_t)CreatureLib::Battling::EventDataKindHelper::Highest()) + 1,
-                      WeatherChange)
+ENUM_WITH_START_VALUE(PkmnEventDataKind, uint8_t, 128, WeatherChange)
 
 #endif // PKMNLIB_PKMNEVENTKIND_HPP