From c1da29bdebadd4f9d1f13393e994f4eed1a532e4 Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Thu, 5 Jan 2023 12:59:17 +0100
Subject: [PATCH] Minor cleanup

---
 .../dynamic_data/executing_move.rs            |  6 +--
 .../src/app_interface/dynamic_data/pokemon.rs | 54 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkmn_lib_interface/src/app_interface/dynamic_data/executing_move.rs b/pkmn_lib_interface/src/app_interface/dynamic_data/executing_move.rs
index cdf39de..905a99f 100755
--- a/pkmn_lib_interface/src/app_interface/dynamic_data/executing_move.rs
+++ b/pkmn_lib_interface/src/app_interface/dynamic_data/executing_move.rs
@@ -56,7 +56,7 @@ mod implementation {
     struct ExecutingMoveInner {
         reference: ExternRef<ExecutingMoveImpl>,
         number_of_hits: CachedValue<u8>,
-        user: CachedValue<PokemonImpl>,
+        user: CachedValue<Pokemon>,
         chosen_move: CachedValue<LearnedMove>,
         use_move: CachedValue<MoveData>,
     }
@@ -73,7 +73,7 @@ mod implementation {
                             executing_move_get_number_of_hits(reference)
                         }),
                         user: cached_value!({
-                            executing_move_get_user(reference).get_value().unwrap()
+                            Rc::new(executing_move_get_user(reference).get_value().unwrap())
                         }),
                         chosen_move: cached_value!({
                             executing_move_get_chosen_move(reference)
@@ -95,7 +95,7 @@ mod implementation {
             self.inner.value().number_of_hits.value()
         }
         fn user(&self) -> Pokemon {
-            Rc::new(self.inner.value().user.value())
+            self.inner.value().user.value()
         }
         fn chosen_move(&self) -> LearnedMove {
             self.inner.value().chosen_move.value()
diff --git a/pkmn_lib_interface/src/app_interface/dynamic_data/pokemon.rs b/pkmn_lib_interface/src/app_interface/dynamic_data/pokemon.rs
index 68de0bd..160a025 100755
--- a/pkmn_lib_interface/src/app_interface/dynamic_data/pokemon.rs
+++ b/pkmn_lib_interface/src/app_interface/dynamic_data/pokemon.rs
@@ -55,7 +55,7 @@ pub trait PokemonTrait: WithVolatile {
     fn has_type_by_name(&self, type_name: &str) -> bool;
     fn get_learned_move(&self, index: usize) -> Option<LearnedMove>;
     fn change_stat_boost(&self, stat: Statistic, diff_amount: i8, self_inflicted: bool) -> bool;
-    fn ability_script<'a>(&'a self) -> Option<&'a Box<dyn Script>>;
+    fn ability_script(&self) -> Option<&Box<dyn Script>>;
     fn change_species(&self, species: Species, form: Form);
     fn change_form(&self, form: Form);
     fn is_fainted(&self) -> bool;
@@ -131,6 +131,24 @@ mod implementation {
             fn effort_values(&self) -> ClampedStatisticSet<u8>;
         }
 
+        fn active_ability(&self) -> Ability {
+            unsafe {
+                let implementation = pokemon_get_active_ability(self.reference())
+                    .get_value()
+                    .unwrap();
+                Rc::new(implementation)
+            }
+        }
+        fn held_item(&self) -> Option<Item> {
+            unsafe {
+                let i = pokemon_get_held_item(self.inner.reference).get_value();
+                if let Some(i) = i {
+                    Some(Rc::new(i))
+                } else {
+                    None
+                }
+            }
+        }
         fn battle(&self) -> Option<Battle> {
             unsafe {
                 let b = pokemon_get_battle(self.reference()).get_value();
@@ -229,18 +247,6 @@ mod implementation {
                 pokemon_set_weight(self.reference(), weight);
             }
         }
-        fn clear_status(&self) {
-            unsafe {
-                pokemon_clear_status(self.reference());
-            }
-        }
-        fn battle_side(&self) -> BattleSide {
-            self.battle()
-                .unwrap()
-                .sides()
-                .get(self.battle_side_index() as u32)
-                .unwrap()
-        }
 
         wasm_reference_getters_funcs! {
             Pokemon,
@@ -249,12 +255,9 @@ mod implementation {
             fn nature(&self) -> Nature;
         }
 
-        fn active_ability(&self) -> Ability {
+        fn clear_status(&self) {
             unsafe {
-                let implementation = pokemon_get_active_ability(self.reference())
-                    .get_value()
-                    .unwrap();
-                Rc::new(implementation)
+                pokemon_clear_status(self.reference());
             }
         }
 
@@ -264,15 +267,12 @@ mod implementation {
             fn display_form(&self) -> Option<Form>;
         }
 
-        fn held_item(&self) -> Option<Item> {
-            unsafe {
-                let i = pokemon_get_held_item(self.inner.reference).get_value();
-                if let Some(i) = i {
-                    Some(Rc::new(i))
-                } else {
-                    None
-                }
-            }
+        fn battle_side(&self) -> BattleSide {
+            self.battle()
+                .unwrap()
+                .sides()
+                .get(self.battle_side_index() as u32)
+                .unwrap()
         }
 
         #[cfg(not(feature = "mock_data"))]