From 4ce0aa54ea5b78fef808f1430b9a03b35dc46372 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 15 May 2022 13:11:39 +0200 Subject: [PATCH] Implements pkmnlib battle events --- PkmnLibSharp/Battling/Events/BattleEventListener.cs | 6 +++--- PkmnLibSharp/Battling/Events/EventDataKind.cs | 2 +- PkmnLibSharp/Generated/Pkmnlib/CaptureAttemptEvent.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PkmnLibSharp/Battling/Events/BattleEventListener.cs b/PkmnLibSharp/Battling/Events/BattleEventListener.cs index 0c995ee..e9cb96e 100644 --- a/PkmnLibSharp/Battling/Events/BattleEventListener.cs +++ b/PkmnLibSharp/Battling/Events/BattleEventListener.cs @@ -91,9 +91,9 @@ namespace PkmnLibSharp.Battling.Events case EventDataKind.ChangeStatBoost: return new ChangeStatBoostEvent(evtType, ptr); case EventDataKind.WeatherChange: - break; - case EventDataKind.StatusChange: - break; + return new WeatherChangeEvent(evtType, ptr); + case EventDataKind.AttemptCapture: + return new CaptureAttemptEvent(evtType, ptr); default: throw new ArgumentOutOfRangeException(); } diff --git a/PkmnLibSharp/Battling/Events/EventDataKind.cs b/PkmnLibSharp/Battling/Events/EventDataKind.cs index 55c73c6..a7c29c4 100644 --- a/PkmnLibSharp/Battling/Events/EventDataKind.cs +++ b/PkmnLibSharp/Battling/Events/EventDataKind.cs @@ -17,6 +17,6 @@ namespace PkmnLibSharp.Battling.Events ChangeStatBoost = 12, WeatherChange = 128, - StatusChange = 129, + AttemptCapture = 129, } } \ No newline at end of file diff --git a/PkmnLibSharp/Generated/Pkmnlib/CaptureAttemptEvent.cs b/PkmnLibSharp/Generated/Pkmnlib/CaptureAttemptEvent.cs index 077abd1..aecb0ca 100644 --- a/PkmnLibSharp/Generated/Pkmnlib/CaptureAttemptEvent.cs +++ b/PkmnLibSharp/Generated/Pkmnlib/CaptureAttemptEvent.cs @@ -17,7 +17,7 @@ namespace Pkmnlib.Generated internal static extern IntPtr GetPokemon(IntPtr p); /// CaptureAttemptEvent * - /// const CaptureResult + /// const CaptureResult * [DllImport("libpkmnLib", CallingConvention = CallingConvention.Cdecl, EntryPoint= "PkmnLib_CaptureAttemptEvent_GetResult")] internal static extern IntPtr GetResult(IntPtr p);