Style and Clippy fixes.

src/dynamic_data/libraries/battle_stat_calculator.rs

@@ -24,6 +24,12 @@ pub struct Gen7BattleStatCalculator {
     identifier: ValueIdentifier,
 }
 
+impl Default for Gen7BattleStatCalculator {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Gen7BattleStatCalculator {
     /// Creates a new Gen 7 battle stat calculator
     pub fn new() -> Self {

src/dynamic_data/libraries/damage_library.rs

@@ -224,11 +224,7 @@ impl DamageLibrary for Gen7DamageLibrary {
 
         float_damage = (float_damage * hit_data.effectiveness()).floor();
         let mut damage = if float_damage <= 0.0 {
-            if hit_data.effectiveness() == 0.0 {
+            u32::from(hit_data.effectiveness() != 0.0)
-                0
-            } else {
-                1
-            }
         } else if float_damage >= u32::MAX as f32 {
             u32::MAX
         } else {

src/dynamic_data/models/battle.rs

@@ -345,7 +345,7 @@ impl Battle {
                 .library()
                 .load_script(self.into(), ScriptCategory::Weather, &weather)
                 .unwrap()
-                .expect(format!("Couldn't find weather script by name {}", weather).as_str());
+                .unwrap_or_else(|| panic!("Couldn't find weather script by name {}", weather));
             self.weather.set(script);
         } else {
             self.weather.clear();

src/dynamic_data/models/learned_move.rs

@@ -1,7 +1,6 @@
 use std::sync::atomic::{AtomicU8, Ordering};
 use std::sync::Arc;
 
-use crate::dynamic_data::Pokemon;
 use crate::static_data::MoveData;
 use crate::{ValueIdentifiable, ValueIdentifier};
 

src/dynamic_data/models/pokemon.rs

@@ -457,7 +457,8 @@ impl Pokemon {
             .calculate_flat_stats(self, &self.flat_stats);
         self.recalculate_boosted_stats();
     }
-    /// Calculates the boosted stats on the Pokemon. This should be called when a stat boost changes.
+    /// Calculates the boosted stats on the Pokemon, _without_ recalculating the flat stats.
+    /// This should be called when a stat boost changes.
     pub fn recalculate_boosted_stats(&self) {
         self.library
             .stat_calculator()
@@ -516,7 +517,7 @@ impl Pokemon {
 
         let ability_script = self
             .library
-            .load_script((&*self).into(), ScriptCategory::Ability, self.active_ability().name())
+            .load_script(self.into(), ScriptCategory::Ability, self.active_ability().name())
             .unwrap();
         if let Some(ability_script) = ability_script {
             self.ability_script
@@ -614,7 +615,7 @@ impl Pokemon {
         }
     }
 
-    /// Damages the Pokemon by a certain amount of damage, from a specific damage source.
+    /// Damages the Pokemon by a certain amount of damage, from a damage source.
     pub fn damage(&self, mut damage: u32, source: DamageSource) {
         if damage > self.current_health() {
             damage = self.current_health();
@@ -820,7 +821,7 @@ pub mod test {
     fn construct_pokemon() {
         let lib = Arc::new(crate::dynamic_data::libraries::dynamic_library::test::build());
         let species = lib.static_data().species().get(&"foo".into()).unwrap().clone();
-        let form = species.get_form(&"default".into()).unwrap().clone();
+        let form = species.get_form(&"default".into()).unwrap();
 
         let pokemon = Pokemon::new(
             lib,

src/dynamic_data/models/pokemon_builder.rs

@@ -47,7 +47,7 @@ impl PokemonBuilder {
         };
 
         let species = self.library.static_data().species().get(&self.species).unwrap().clone();
-        let form = species.get_default_form().clone();
+        let form = species.get_default_form();
         let p = Pokemon::new(
             self.library,
             species,

src/dynamic_data/models/pokemon_party.rs

@@ -93,11 +93,9 @@ impl PokemonParty {
 
     /// Checks if the party contains a given pokemon.
     pub fn has_pokemon(&self, pokemon: &Pokemon) -> bool {
-        for p in &self.pokemon {
+        for p in self.pokemon.iter().flatten() {
-            if let Some(p) = p {
+            if std::ptr::eq(p.as_ref(), pokemon) {
-                if std::ptr::eq(p.as_ref(), pokemon) {
+                return true;
-                    return true;
-                }
             }
         }
         false

src/dynamic_data/script_handling/mod.rs

@@ -239,7 +239,7 @@ mod tests {
     impl TestScript {
         fn new() -> Self {
             Self {
-                name: StringKey::new("test".into()),
+                name: "test".into(),
                 is_marked_for_deletion: Default::default(),
                 suppressed_count: AtomicUsize::new(0),
                 test_count: AtomicUsize::new(0),
@@ -247,7 +247,7 @@ mod tests {
         }
         fn new_with_name(name: &str) -> Self {
             Self {
-                name: StringKey::new(name.into()),
+                name: name.into(),
                 is_marked_for_deletion: Default::default(),
                 suppressed_count: AtomicUsize::new(0),
                 test_count: AtomicUsize::new(0),
@@ -424,7 +424,7 @@ mod tests {
             "test_b"
         );
 
-        set.remove(&StringKey::new("test_c".into()));
+        set.remove(&"test_c".into());
         assert!(aggregator.get_next().is_none());
     }
 
@@ -451,7 +451,7 @@ mod tests {
             "test_a"
         );
 
-        set.remove(&StringKey::new("test_b".into()));
+        set.remove(&"test_b".into());
 
         assert_eq!(
             aggregator

src/dynamic_data/script_handling/script.rs

@@ -398,7 +398,7 @@ mod tests {
     impl TestScript {
         fn new() -> Self {
             Self {
-                name: StringKey::new("test".into()),
+                name: "test".into(),
                 container: AtomicPtr::<ScriptContainer>::default(),
                 suppressed_count: AtomicUsize::new(0),
                 marked_for_deletion: Default::default(),
@@ -537,10 +537,7 @@ mod tests {
             h.join().unwrap();
         }
 
-        assert_eq!(
+        assert_eq!(container.script.read().as_ref().unwrap().name(), &"script2".into());
-            container.script.read().as_ref().unwrap().name(),
-            &StringKey::new("script2".into())
-        );
     }
 }
 
@@ -556,20 +553,20 @@ pub enum ScriptOwnerData {
     None,
 }
 
-impl Into<ScriptOwnerData> for &Pokemon {
+impl From<&Pokemon> for ScriptOwnerData {
-    fn into(self) -> ScriptOwnerData {
+    fn from(p: &Pokemon) -> Self {
-        ScriptOwnerData::Pokemon(AtomicPtr::new(self as *const Pokemon as *mut Pokemon))
+        ScriptOwnerData::Pokemon(AtomicPtr::new(p as *const Pokemon as *mut Pokemon))
     }
 }
 
-impl Into<ScriptOwnerData> for &BattleSide {
+impl From<&BattleSide> for ScriptOwnerData {
-    fn into(self) -> ScriptOwnerData {
+    fn from(p: &BattleSide) -> Self {
-        ScriptOwnerData::BattleSide(AtomicPtr::new(self as *const BattleSide as *mut BattleSide))
+        ScriptOwnerData::BattleSide(AtomicPtr::new(p as *const BattleSide as *mut BattleSide))
     }
 }
 
-impl Into<ScriptOwnerData> for &Battle {
+impl From<&Battle> for ScriptOwnerData {
-    fn into(self) -> ScriptOwnerData {
+    fn from(p: &Battle) -> Self {
-        ScriptOwnerData::Battle(AtomicPtr::new(self as *const Battle as *mut Battle))
+        ScriptOwnerData::Battle(AtomicPtr::new(p as *const Battle as *mut Battle))
     }
 }

src/ffi/dynamic_data/libraries/battle_stat_calculator.rs

@@ -1,6 +1,7 @@
 use crate::dynamic_data::{BattleStatCalculator, Gen7BattleStatCalculator};
 use crate::ffi::IdentifiablePointer;
 
+/// Creates a new Gen 7 battle stat calculator
 #[no_mangle]
 extern "C" fn gen_7_battle_stat_calculator_new() -> IdentifiablePointer<Box<dyn BattleStatCalculator>> {
     let v: Box<dyn BattleStatCalculator> = Box::new(Gen7BattleStatCalculator::new());

src/ffi/dynamic_data/libraries/damage_library.rs

@@ -1,6 +1,8 @@
 use crate::dynamic_data::{DamageLibrary, Gen7DamageLibrary};
 use crate::ffi::IdentifiablePointer;
 
+/// Creates a new generation 7 damage library. `has_randomness` defines whether a random damage
+/// modifier (0.85x - 1.00x) is applied to the calculated damage.
 #[no_mangle]
 extern "C" fn gen_7_damage_library_new(randomness: u8) -> IdentifiablePointer<Box<dyn DamageLibrary>> {
     let v: Box<dyn DamageLibrary> = Box::new(Gen7DamageLibrary::new(randomness == 1));

src/ffi/dynamic_data/libraries/dynamic_library.rs

@@ -3,6 +3,7 @@ use crate::ffi::{IdentifiablePointer, OwnedPtr};
 use crate::static_data::StaticData;
 use std::sync::Arc;
 
+/// Instantiates a new DynamicLibrary with given parameters.
 #[no_mangle]
 extern "C" fn dynamic_library_new(
     static_data: OwnedPtr<StaticData>,

src/ffi/dynamic_data/libraries/misc_library.rs

@@ -1,6 +1,7 @@
 use crate::dynamic_data::{Gen7MiscLibrary, MiscLibrary};
 use crate::ffi::IdentifiablePointer;
 
+/// Instantiates a new MiscLibrary.
 #[no_mangle]
 extern "C" fn gen_7_misc_library_new() -> IdentifiablePointer<Box<dyn MiscLibrary>> {
     let v: Box<dyn MiscLibrary> = Box::new(Gen7MiscLibrary::new());

src/ffi/dynamic_data/libraries/mod.rs

@@ -1,5 +1,10 @@
+/// The foreign function interfaces for the battle stat calculator
 mod battle_stat_calculator;
+/// The foreign function interfaces for the damage library
 mod damage_library;
+/// The foreign function interfaces for the dynamic library
 mod dynamic_library;
+/// The foreign function interfaces for the misc library
 mod misc_library;
+/// The foreign function interfaces for the script resolver
 mod script_resolver;

src/ffi/dynamic_data/libraries/script_resolver.rs

@@ -1,6 +1,7 @@
 use crate::dynamic_data::{EmptyScriptResolver, ScriptResolver};
 use crate::ffi::IdentifiablePointer;
 
+/// Instantiates a basic empty script resolver, that always returns None.
 #[no_mangle]
 extern "C" fn empty_script_resolver_new() -> IdentifiablePointer<Box<dyn ScriptResolver>> {
     let v: Box<dyn ScriptResolver> = Box::new(EmptyScriptResolver {
@@ -11,12 +12,14 @@ extern "C" fn empty_script_resolver_new() -> IdentifiablePointer<Box<dyn ScriptR
     IdentifiablePointer::new(ptr, id)
 }
 
+/// Foreign function interfaces for the Webassembly script resolver.
 #[cfg(feature = "wasm")]
 mod web_assembly_script_resolver {
     use crate::dynamic_data::ScriptResolver;
     use crate::ffi::{ExternPointer, IdentifiablePointer};
     use crate::script_implementations::wasm::script_resolver::WebAssemblyScriptResolver;
 
+    /// Instantiates a new WebAssemblyScriptResolver.
     #[no_mangle]
     extern "C" fn webassembly_script_resolver_new() -> IdentifiablePointer<Box<dyn ScriptResolver>> {
         let v: Box<dyn ScriptResolver> = WebAssemblyScriptResolver::new();
@@ -25,17 +28,19 @@ mod web_assembly_script_resolver {
         IdentifiablePointer::new(ptr, id)
     }
 
+    /// Load a compiled WASM module.
     #[no_mangle]
     extern "C" fn webassembly_script_resolver_load_wasm_from_bytes(
-        ptr: ExternPointer<Box<WebAssemblyScriptResolver>>,
+        mut ptr: ExternPointer<Box<WebAssemblyScriptResolver>>,
         arr: *const u8,
         len: usize,
     ) {
         unsafe { ptr.as_mut().load_wasm_from_bytes(std::slice::from_raw_parts(arr, len)) }
     }
 
+    /// Tells the script resolver we're done loading wasm modules, and to finalize the resolver.
     #[no_mangle]
-    extern "C" fn webassembly_script_resolver_finalize(ptr: ExternPointer<Box<WebAssemblyScriptResolver>>) {
+    extern "C" fn webassembly_script_resolver_finalize(mut ptr: ExternPointer<Box<WebAssemblyScriptResolver>>) {
         ptr.as_mut().finalize();
     }
 }

src/ffi/dynamic_data/mod.rs

@@ -1,2 +1,4 @@
+/// The foreign function interfaces for the dynamic data libraries
 mod libraries;
-mod models;
+/// The foreign function interfaces for the dynamic data models
+mod models;

src/ffi/dynamic_data/models/mod.rs

@@ -1 +1,2 @@
+/// The foreign function interface for a Pokemon.
 mod pokemon;

src/ffi/dynamic_data/models/pokemon.rs

@@ -8,6 +8,7 @@ use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Instantiates a new Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_new(
     library: ExternPointer<Arc<DynamicLibrary>>,
@@ -39,34 +40,40 @@ extern "C" fn pokemon_new(
     .into()
 }
 
+/// Drops an Arc reference held by the FFI.
 #[no_mangle]
 unsafe extern "C" fn pokemon_drop(ptr: OwnedPtr<Arc<Pokemon>>) {
     drop_in_place(ptr);
 }
 
+/// The library data of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_library(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<DynamicLibrary>> {
     ptr.as_ref().library().clone().into()
 }
 
+/// The species of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_species(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Species>> {
-    ptr.as_ref().species().clone().into()
+    ptr.as_ref().species().into()
 }
 
+/// The form of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_form(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Form>> {
-    ptr.as_ref().form().clone().into()
+    ptr.as_ref().form().into()
 }
 
+/// The species that should be displayed to the user. This handles stuff like the Illusion ability.
 #[no_mangle]
 extern "C" fn pokemon_display_species(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Species>> {
-    ptr.as_ref().display_species().clone().into()
+    ptr.as_ref().display_species().into()
 }
 
+/// The form that should be displayed to the user. This handles stuff like the Illusion ability.
 #[no_mangle]
 extern "C" fn pokemon_display_form(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Form>> {
-    ptr.as_ref().display_form().clone().into()
+    ptr.as_ref().display_form().into()
 }
 
 ffi_arc_getter!(Pokemon, level, LevelInt);
@@ -75,6 +82,7 @@ ffi_arc_getter!(Pokemon, unique_identifier, u32);
 ffi_arc_getter!(Pokemon, gender, Gender);
 ffi_arc_getter!(Pokemon, coloring, u8);
 
+/// Gets the held item of a Pokemon
 #[no_mangle]
 extern "C" fn pokemon_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Item>> {
     if let Some(v) = ptr.as_ref().held_item().read().as_ref() {
@@ -84,44 +92,40 @@ extern "C" fn pokemon_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> Identifiabl
     }
 }
 
+/// Checks whether the Pokemon is holding a specific item.
 #[no_mangle]
 extern "C" fn pokemon_has_held_item(ptr: ExternPointer<Arc<Pokemon>>, name: *const c_char) -> u8 {
     let name = unsafe { CStr::from_ptr(name) }.into();
-    if ptr.as_ref().has_held_item(&name) {
+    u8::from(ptr.as_ref().has_held_item(&name))
-        1
-    } else {
-        0
-    }
 }
 
+/// Changes the held item of the Pokemon. Returns the previously held item.
 #[no_mangle]
 extern "C" fn pokemon_set_held_item(
     ptr: ExternPointer<Arc<Pokemon>>,
     item: ExternPointer<Arc<Item>>,
 ) -> IdentifiablePointer<Arc<Item>> {
     if let Some(v) = ptr.as_ref().set_held_item(item.as_ref()) {
-        v.clone().into()
+        v.into()
     } else {
         IdentifiablePointer::none()
     }
 }
 
+/// Removes the held item from the Pokemon. Returns the previously held item.
 #[no_mangle]
 extern "C" fn pokemon_remove_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Item>> {
     if let Some(v) = ptr.as_ref().remove_held_item() {
-        v.clone().into()
+        v.into()
     } else {
         IdentifiablePointer::none()
     }
 }
 
+/// Makes the Pokemon uses its held item.
 #[no_mangle]
 extern "C" fn pokemon_consume_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().consume_held_item() {
+    u8::from(ptr.as_ref().consume_held_item())
-        1
-    } else {
-        0
-    }
 }
 
 ffi_arc_getter!(Pokemon, current_health, u32);
@@ -129,6 +133,7 @@ ffi_arc_getter!(Pokemon, max_health, u32);
 ffi_arc_getter!(Pokemon, weight, f32);
 ffi_arc_getter!(Pokemon, height, f32);
 
+/// An optional nickname of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_nickname(ptr: ExternPointer<Arc<Pokemon>>) -> *mut c_char {
     let name = ptr.as_ref().nickname();
@@ -139,15 +144,13 @@ extern "C" fn pokemon_nickname(ptr: ExternPointer<Arc<Pokemon>>) -> *mut c_char
     }
 }
 
+/// Whether the actual ability on the form is a hidden ability.
 #[no_mangle]
 extern "C" fn pokemon_real_ability_is_hidden(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().real_ability().hidden {
+    u8::from(ptr.as_ref().real_ability().hidden)
-        1
-    } else {
-        0
-    }
 }
 
+/// The index of the actual ability on the form.
 #[no_mangle]
 extern "C" fn pokemon_real_ability_index(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
     ptr.as_ref().real_ability().index
@@ -155,6 +158,8 @@ extern "C" fn pokemon_real_ability_index(ptr: ExternPointer<Arc<Pokemon>>) -> u8
 
 ffi_vec_value_getters!(Pokemon, types, TypeIdentifier);
 
+/// Gets a learned move of the Pokemon. Index should generally be below [`MAX_MOVES`], you will get
+/// a null pointer otherwise.
 #[no_mangle]
 extern "C" fn pokemon_learned_move_get(
     ptr: ExternPointer<Arc<Pokemon>>,
@@ -167,21 +172,25 @@ extern "C" fn pokemon_learned_move_get(
     }
 }
 
+/// The stats of the Pokemon when disregarding any stat boosts.
 #[no_mangle]
 extern "C" fn pokemon_flat_stats(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<StatisticSet<u32>> {
     (ptr.as_ref().flat_stats() as *const StatisticSet<u32>).into()
 }
 
+/// The stats of the Pokemon including the stat boosts.
 #[no_mangle]
 extern "C" fn pokemon_boosted_stats(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<StatisticSet<u32>> {
     (ptr.as_ref().boosted_stats() as *const StatisticSet<u32>).into()
 }
 
+/// Get the stat boosts for a specific stat.
 #[no_mangle]
 extern "C" fn pokemon_get_stat_boost(ptr: ExternPointer<Arc<Pokemon>>, statistic: Statistic) -> i8 {
     ptr.as_ref().stat_boost(statistic)
 }
 
+/// Change a boosted stat by a certain amount.
 #[no_mangle]
 extern "C" fn pokemon_change_stat_boost(
     ptr: ExternPointer<Arc<Pokemon>>,
@@ -189,35 +198,37 @@ extern "C" fn pokemon_change_stat_boost(
     diff_amount: i8,
     self_inflicted: u8,
 ) -> u8 {
-    if ptr.as_ref().change_stat_boost(stat, diff_amount, self_inflicted == 1) {
+    u8::from(ptr.as_ref().change_stat_boost(stat, diff_amount, self_inflicted == 1))
-        1
-    } else {
-        0
-    }
 }
 
+/// Gets a [individual value](https://bulbapedia.bulbagarden.net/wiki/Individual_values) of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_get_individual_value(ptr: ExternPointer<Arc<Pokemon>>, stat: Statistic) -> u8 {
     ptr.as_ref().individual_values().get_stat(stat)
 }
 
+/// Modifies a [individual value](https://bulbapedia.bulbagarden.net/wiki/Individual_values) of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_set_individual_value(ptr: ExternPointer<Arc<Pokemon>>, stat: Statistic, value: u8) {
     ptr.as_ref().individual_values().set_stat(stat, value);
     ptr.as_ref().recalculate_flat_stats();
 }
 
+/// Gets a [effort value](https://bulbapedia.bulbagarden.net/wiki/Effort_values) of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_get_effort_value(ptr: ExternPointer<Arc<Pokemon>>, stat: Statistic) -> u8 {
     ptr.as_ref().effort_values().get_stat(stat)
 }
 
+/// Modifies a [effort value](https://bulbapedia.bulbagarden.net/wiki/Effort_values) of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_set_effort_value(ptr: ExternPointer<Arc<Pokemon>>, stat: Statistic, value: u8) {
     ptr.as_ref().effort_values().set_stat(stat, value);
     ptr.as_ref().recalculate_flat_stats();
 }
 
+/// Gets the data for the battle the Pokemon is currently in. If the Pokemon is not in a battle, this
+/// returns null.
 #[no_mangle]
 extern "C" fn pokemon_get_battle(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Battle> {
     if let Some(v) = ptr.as_ref().get_battle() {
@@ -227,54 +238,59 @@ extern "C" fn pokemon_get_battle(ptr: ExternPointer<Arc<Pokemon>>) -> Identifiab
     }
 }
 
+/// Get the index of the side of the battle the Pokemon is in. If the Pokemon
+/// is not on the battlefield, this always returns 0.
 #[no_mangle]
 extern "C" fn pokemon_get_battle_side_index(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
     ptr.as_ref().get_battle_side_index().unwrap_or_default()
 }
 
+/// Get the index of the slot on the side of the battle the Pokemon is in. If the Pokemon
+// is not on the battlefield, this always returns 0.
 #[no_mangle]
 extern "C" fn pokemon_get_battle_index(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
     ptr.as_ref().get_battle_index().unwrap_or_default()
 }
 
+/// Returns whether something overrides the ability.
 #[no_mangle]
 extern "C" fn pokemon_is_ability_overriden(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().is_ability_overriden() {
+    u8::from(ptr.as_ref().is_ability_overriden())
-        1
-    } else {
-        0
-    }
 }
 
+/// Returns the currently active ability.
 #[no_mangle]
 extern "C" fn pokemon_active_ability(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Ability> {
     (ptr.as_ref().active_ability() as *const Ability).into()
 }
 
+/// Whether or not the Pokemon is allowed to gain experience.
 #[no_mangle]
 extern "C" fn pokemon_allowed_experience_gain(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().allowed_experience_gain() {
+    u8::from(ptr.as_ref().allowed_experience_gain())
-        1
-    } else {
-        0
-    }
 }
 
+/// The [nature](https://bulbapedia.bulbagarden.net/wiki/Nature) of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_nature(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Nature>> {
     ptr.as_ref().nature().clone().into()
 }
 
+/// Calculates the flat stats on the Pokemon. This should be called when for example the base
+/// stats, level, nature, IV, or EV changes. This has a side effect of recalculating the boosted
+/// stats, as those depend on the flat stats.
 #[no_mangle]
 extern "C" fn pokemon_recalculate_flat_stats(ptr: ExternPointer<Arc<Pokemon>>) {
     ptr.as_ref().recalculate_flat_stats()
 }
 
+/// Calculates the boosted stats on the Pokemon. This should be called when a stat boost changes.
 #[no_mangle]
 extern "C" fn pokemon_recalculate_boosted_stats(ptr: ExternPointer<Arc<Pokemon>>) {
     ptr.as_ref().recalculate_boosted_stats()
 }
 
+/// Change the species of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_change_species(
     ptr: ExternPointer<Arc<Pokemon>>,
@@ -285,48 +301,44 @@ extern "C" fn pokemon_change_species(
         .change_species(species.as_ref().clone(), form.as_ref().clone())
 }
 
+/// Change the form of the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_change_form(ptr: ExternPointer<Arc<Pokemon>>, form: ExternPointer<Arc<Form>>) {
     ptr.as_ref().change_form(form.as_ref())
 }
 
+/// Whether or not the Pokemon is useable in a battle.
 #[no_mangle]
 extern "C" fn pokemon_is_usable(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().is_usable() {
+    u8::from(ptr.as_ref().is_usable())
-        1
-    } else {
-        0
-    }
 }
 
+/// Returns whether the Pokemon is fainted.
 #[no_mangle]
 extern "C" fn pokemon_is_fainted(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().is_fainted() {
+    u8::from(ptr.as_ref().is_fainted())
-        1
-    } else {
-        0
-    }
 }
 
+/// Whether or not the Pokemon is on the battlefield.
 #[no_mangle]
 extern "C" fn pokemon_is_on_battlefield(ptr: ExternPointer<Arc<Pokemon>>) -> u8 {
-    if ptr.as_ref().is_on_battlefield() {
+    u8::from(ptr.as_ref().is_on_battlefield())
-        1
-    } else {
-        0
-    }
 }
 
+/// Damages the Pokemon by a certain amount of damage, from a damage source.
 #[no_mangle]
 extern "C" fn pokemon_damage(ptr: ExternPointer<Arc<Pokemon>>, damage: u32, source: DamageSource) {
     ptr.as_ref().damage(damage, source)
 }
 
+/// Heals the Pokemon by a specific amount. Unless allow_revive is set to true, this will not
+/// heal if the Pokemon has 0 health. If the amount healed is 0, this will return false.
 #[no_mangle]
 extern "C" fn pokemon_heal(ptr: ExternPointer<Arc<Pokemon>>, amount: u32, allow_revive: u8) -> bool {
     ptr.as_ref().heal(amount, allow_revive == 1)
 }
 
+/// Learn a move.
 #[no_mangle]
 extern "C" fn pokemon_learn_move(
     ptr: ExternPointer<Arc<Pokemon>>,
@@ -336,6 +348,7 @@ extern "C" fn pokemon_learn_move(
     unsafe { ptr.as_ref().learn_move(&CStr::from_ptr(move_name).into(), learn_method) }
 }
 
+/// Removes the current non-volatile status from the Pokemon.
 #[no_mangle]
 extern "C" fn pokemon_clear_status(ptr: ExternPointer<Arc<Pokemon>>) {
     ptr.as_ref().clear_status()

src/ffi/mod.rs

@@ -1,22 +1,14 @@
+/// The foreign function interfaces for the dynamic data
 mod dynamic_data;
+/// The foreign function interfaces for that static data
 mod static_data;
 
+/// Helper type for clearer functions.
 type OwnedPtr<T> = *mut T;
+/// Helper type for clearer functions.
 type BorrowedPtr<T> = *const T;
 
-macro_rules! ffi_getter {
+/// Generates a basic getter foreign function interface.
-    (
-        $type:ty, $func:ident, $returns: ty
-    ) => {
-        paste::paste! {
-            #[no_mangle]
-            extern "C" fn [< $type:snake _ $func >](ptr: ExternPointer<$type>) -> $returns {
-                ptr.as_ref().$func()
-            }
-        }
-    };
-}
-
 macro_rules! ffi_arc_getter {
     (
         $type:ty, $func:ident, $returns: ty
@@ -30,6 +22,7 @@ macro_rules! ffi_arc_getter {
     };
 }
 
+/// Generates a basic getter foreign function interface where the return type is a [`crate::StringKey`].
 macro_rules! ffi_arc_stringkey_getter {
     (
         $type:ty, $func:ident
@@ -43,6 +36,7 @@ macro_rules! ffi_arc_stringkey_getter {
     };
 }
 
+/// Generates a foreign function interface for a vec. This generates a length function, and a getter.
 macro_rules! ffi_vec_value_getters {
     (
         $type:ty, $func:ident, $returns: ty
@@ -60,6 +54,8 @@ macro_rules! ffi_vec_value_getters {
     };
 }
 
+/// Generates a foreign function interface for a vec of [`crate::StringKey`]. This generates a
+/// length function, and a getter.
 macro_rules! ffi_vec_stringkey_getters {
     (
         $type:ident, $func:ident
@@ -80,57 +76,62 @@ macro_rules! ffi_vec_stringkey_getters {
 use crate::{ValueIdentifiable, ValueIdentifier};
 pub(self) use ffi_arc_getter;
 pub(self) use ffi_arc_stringkey_getter;
-pub(self) use ffi_getter;
 pub(self) use ffi_vec_stringkey_getters;
 pub(self) use ffi_vec_value_getters;
+use std::mem::transmute;
 use std::sync::Arc;
 
+/// Helper utility class to wrap a pointer for extern functions.
 #[repr(C)]
 pub(self) struct ExternPointer<T: ?Sized> {
+    /// The wrapped pointer.
     ptr: *mut T,
 }
 
 impl<T: ?Sized> ExternPointer<T> {
+    /// Get the internal pointer as reference.
     pub(self) fn as_ref(&self) -> &T {
         unsafe {
-            self.ptr.as_ref().expect(&format!(
+            self.ptr
-                "Given pointer of type '{}' was null",
+                .as_ref()
-                std::any::type_name::<T>()
+                .unwrap_or_else(|| panic!("Given pointer of type '{}' was null", std::any::type_name::<T>()))
-            ))
         }
     }
-
+    /// Get the internal pointer as mutable reference.
-    pub(self) fn as_mut(&self) -> &mut T {
+    pub(self) fn as_mut(&mut self) -> &mut T {
         unsafe {
-            self.ptr.as_mut().expect(&format!(
+            self.ptr
-                "Given pointer of type '{}' was null",
+                .as_mut()
-                std::any::type_name::<T>()
+                .unwrap_or_else(|| panic!("Given pointer of type '{}' was null", std::any::type_name::<T>()))
-            ))
         }
     }
 }
 
+/// Helper utility class to give both the pointer and identifier to a FFI.
 #[repr(C)]
 pub(self) struct IdentifiablePointer<T> {
+    /// The wrapped pointer.
     pub ptr: *const T,
-    pub id: ValueIdentifier,
+    /// The identifier of the pointer.
+    pub id: usize,
 }
 
 impl<T> IdentifiablePointer<T> {
+    /// Creates a new IdentifiablePointer.
     pub(self) fn new(ptr: *const T, id: ValueIdentifier) -> Self {
-        Self { ptr, id }
+        unsafe { Self { ptr, id: transmute(id) } }
     }
 }
 
-impl<T> Into<ExternPointer<T>> for *mut T {
+impl<T> From<*mut T> for ExternPointer<T> {
-    fn into(self) -> ExternPointer<T> {
+    fn from(ptr: *mut T) -> Self {
-        ExternPointer { ptr: self }
+        ExternPointer { ptr }
     }
 }
 
 impl<T: ValueIdentifiable> From<Arc<T>> for IdentifiablePointer<Arc<T>> {
     fn from(v: Arc<T>) -> Self {
-        let id = v.value_identifier();
+        let id = unsafe { transmute(v.value_identifier()) };
         Self {
             ptr: Box::into_raw(Box::new(v)),
             id,
@@ -140,7 +141,7 @@ impl<T: ValueIdentifiable> From<Arc<T>> for IdentifiablePointer<Arc<T>> {
 
 impl<T: ValueIdentifiable> From<Box<T>> for IdentifiablePointer<T> {
     fn from(v: Box<T>) -> Self {
-        let id = v.value_identifier();
+        let id = unsafe { transmute(v.value_identifier()) };
         Self {
             ptr: Box::into_raw(v),
             id,
@@ -150,12 +151,13 @@ impl<T: ValueIdentifiable> From<Box<T>> for IdentifiablePointer<T> {
 
 impl<T: ValueIdentifiable> From<*const T> for IdentifiablePointer<T> {
     fn from(v: *const T) -> Self {
-        let id = unsafe { v.as_ref() }.unwrap().value_identifier();
+        let id = unsafe { transmute(v.as_ref().unwrap().value_identifier()) };
         Self { ptr: v, id }
     }
 }
 
 impl<T> IdentifiablePointer<T> {
+    /// Returns an identifiable pointer with null as pointer, and 0 as identifier.
     pub fn none() -> Self {
         Self {
             ptr: std::ptr::null(),

src/ffi/static_data/ability.rs

@@ -5,6 +5,7 @@ use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Instantiates a new ability.
 #[no_mangle]
 unsafe extern "C" fn ability_new(
     name: *const c_char,
@@ -24,26 +25,31 @@ unsafe extern "C" fn ability_new(
     Arc::new(Ability::new(&name, &effect, parameters_vec)).into()
 }
 
+/// Drops a reference counted ability.
 #[no_mangle]
 unsafe extern "C" fn ability_drop(ptr: OwnedPtr<Arc<Ability>>) {
     drop_in_place(ptr)
 }
 
+/// The name of the ability.
 #[no_mangle]
 unsafe extern "C" fn ability_name(ptr: ExternPointer<Arc<Ability>>) -> OwnedPtr<c_char> {
     CString::new(ptr.as_ref().name().str()).unwrap().into_raw()
 }
 
+/// The name of the script effect of the ability.
 #[no_mangle]
 unsafe extern "C" fn ability_effect(ptr: ExternPointer<Arc<Ability>>) -> OwnedPtr<c_char> {
     CString::new(ptr.as_ref().effect().str()).unwrap().into_raw()
 }
 
+/// The length of the parameters for the script effect of the ability.
 #[no_mangle]
 unsafe extern "C" fn ability_parameter_length(ptr: ExternPointer<Arc<Ability>>) -> usize {
     ptr.as_ref().parameters().len()
 }
 
+/// Gets a parameter for the script effect of the ability.
 #[no_mangle]
 unsafe extern "C" fn ability_parameter_get(
     ptr: ExternPointer<Arc<Ability>>,

src/ffi/static_data/form.rs

@@ -9,6 +9,7 @@ use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Instantiates a new form.
 #[no_mangle]
 unsafe extern "C" fn form_new(
     name: *const c_char,
@@ -60,11 +61,13 @@ unsafe extern "C" fn form_new(
     .into()
 }
 
+/// Drops a reference count for a form.
 #[no_mangle]
 unsafe extern "C" fn form_drop(ptr: OwnedPtr<Arc<Form>>) {
     drop_in_place(ptr)
 }
 
+/// The name of the form.
 #[no_mangle]
 unsafe extern "C" fn form_name(ptr: ExternPointer<Arc<Form>>) -> OwnedPtr<c_char> {
     let name = ptr.as_ref().name();
@@ -77,6 +80,7 @@ ffi_arc_getter!(Form, base_experience, u32);
 
 ffi_vec_value_getters!(Form, types, TypeIdentifier);
 
+/// The inherent values of a form of species that are used for the stats of a Pokemon.
 #[no_mangle]
 unsafe extern "C" fn form_base_stats(ptr: ExternPointer<Arc<Form>>) -> IdentifiablePointer<StaticStatisticSet<u16>> {
     (ptr.as_ref().base_stats() as *const StaticStatisticSet<u16>).into()
@@ -87,12 +91,9 @@ ffi_vec_stringkey_getters!(Form, hidden_abilities);
 
 ffi_arc_getter!(Form, moves, BorrowedPtr<LearnableMoves>);
 
+/// Check if the form has a specific flag set.
 #[no_mangle]
 unsafe extern "C" fn form_has_flag(ptr: ExternPointer<Arc<Form>>, flag: *const c_char) -> u8 {
     let flag = CStr::from_ptr(flag).into();
-    if ptr.as_ref().has_flag(&flag) {
+    u8::from(ptr.as_ref().has_flag(&flag))
-        1
-    } else {
-        0
-    }
 }

src/ffi/static_data/growth_rate.rs

@@ -3,22 +3,27 @@ use crate::ffi::{ExternPointer, OwnedPtr};
 use crate::static_data::{GrowthRate, LookupGrowthRate};
 use std::ptr::drop_in_place;
 
+/// Instantiates a new lookup growth rate. The experience array should be the amount of experience
+/// required per level, with the first element being the experience required for level 1 (generally 0).
 #[no_mangle]
 unsafe extern "C" fn growth_rate_lookup_new(array: *const u32, length: usize) -> OwnedPtr<Box<dyn GrowthRate>> {
     let array = std::slice::from_raw_parts(array, length);
     Box::into_raw(Box::new(Box::new(LookupGrowthRate::new(array.to_vec()))))
 }
 
+/// Drops the growth rate.
 #[no_mangle]
 unsafe extern "C" fn growth_rate_lookup_drop(ptr: OwnedPtr<Box<dyn GrowthRate>>) {
     drop_in_place(ptr)
 }
 
+/// Calculate the level something with this growth rate would have at a certain experience.
 #[no_mangle]
 extern "C" fn growth_rate_calculate_level(ptr: ExternPointer<Box<dyn GrowthRate>>, experience: u32) -> LevelInt {
     ptr.as_ref().calculate_level(experience)
 }
 
+/// Calculate the experience something with this growth rate would have at a certain level.
 #[no_mangle]
 extern "C" fn growth_rate_calculate_experience(ptr: ExternPointer<Box<dyn GrowthRate>>, level: LevelInt) -> u32 {
     ptr.as_ref().calculate_experience(level)

src/ffi/static_data/item.rs

@@ -6,6 +6,7 @@ use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Instantiates an item.
 #[no_mangle]
 unsafe extern "C" fn item_new(
     name: *const c_char,
@@ -24,11 +25,13 @@ unsafe extern "C" fn item_new(
     Arc::new(Item::new(&name, category, battle_category, price, flags_set)).into()
 }
 
+/// Drops a reference counted item.
 #[no_mangle]
 unsafe extern "C" fn item_drop(ptr: OwnedPtr<Arc<Item>>) {
     drop_in_place(ptr)
 }
 
+/// The name of the item.
 #[no_mangle]
 unsafe extern "C" fn item_name(ptr: ExternPointer<Arc<Item>>) -> OwnedPtr<c_char> {
     let name = ptr.as_ref().name();
@@ -39,12 +42,9 @@ ffi_arc_getter!(Item, category, ItemCategory);
 ffi_arc_getter!(Item, battle_category, BattleItemCategory);
 ffi_arc_getter!(Item, price, i32);
 
+/// Checks whether the item has a specific flag.
 #[no_mangle]
 unsafe extern "C" fn item_has_flag(ptr: ExternPointer<Arc<Item>>, flag: *const c_char) -> u8 {
     let flag = CStr::from_ptr(flag).into();
-    if ptr.as_ref().has_flag(&flag) {
+    u8::from(ptr.as_ref().has_flag(&flag))
-        1
-    } else {
-        0
-    }
 }

src/ffi/static_data/learnable_moves.rs

@@ -4,19 +4,22 @@ use crate::static_data::LearnableMoves;
 use std::ffi::{c_char, CStr};
 use std::ptr::drop_in_place;
 
+/// Instantiates a new Learnable Moves.
 #[no_mangle]
 extern "C" fn learnable_moves_new() -> OwnedPtr<LearnableMoves> {
     Box::into_raw(Box::new(LearnableMoves::new()))
 }
 
+/// drops a learnablemoves struct.
 #[no_mangle]
 unsafe extern "C" fn learnable_moves_drop(ptr: OwnedPtr<LearnableMoves>) {
     drop_in_place(ptr)
 }
 
+/// Adds a new level move the Pokemon can learn.
 #[no_mangle]
 unsafe extern "C" fn learnable_moves_add_level_move(
-    ptr: ExternPointer<LearnableMoves>,
+    mut ptr: ExternPointer<LearnableMoves>,
     level: LevelInt,
     move_name: BorrowedPtr<c_char>,
 ) {

src/ffi/static_data/libraries/growth_rate_library.rs

@@ -4,16 +4,19 @@ use crate::static_data::{GrowthRate, GrowthRateLibrary};
 use std::ffi::{c_char, CStr};
 use std::ptr::drop_in_place;
 
+/// Instantiates a new growth rate library with a capacity
 #[no_mangle]
 extern "C" fn growth_rate_library_new(capacity: usize) -> IdentifiablePointer<GrowthRateLibrary> {
     Box::new(GrowthRateLibrary::new(capacity)).into()
 }
 
+/// Drops the growthrate library.
 #[no_mangle]
 unsafe extern "C" fn growth_rate_library_drop(ptr: OwnedPtr<GrowthRateLibrary>) {
     drop_in_place(ptr)
 }
 
+/// Calculates the level for a given growth key name and a certain experience.
 #[no_mangle]
 unsafe extern "C" fn growth_rate_library_calculate_level(
     ptr: ExternPointer<GrowthRateLibrary>,
@@ -24,6 +27,7 @@ unsafe extern "C" fn growth_rate_library_calculate_level(
         .calculate_level(&CStr::from_ptr(growth_rate).into(), experience)
 }
 
+/// Calculates the experience for a given growth key name and a certain level.
 #[no_mangle]
 unsafe extern "C" fn growth_rate_library_calculate_experience(
     ptr: ExternPointer<GrowthRateLibrary>,
@@ -34,9 +38,10 @@ unsafe extern "C" fn growth_rate_library_calculate_experience(
         .calculate_experience(&CStr::from_ptr(growth_rate).into(), level)
 }
 
+/// Adds a new growth rate with a name and value.
 #[no_mangle]
 unsafe extern "C" fn growth_rate_library_add_growth_rate(
-    ptr: ExternPointer<GrowthRateLibrary>,
+    mut ptr: ExternPointer<GrowthRateLibrary>,
     name: BorrowedPtr<c_char>,
     growth_rate: OwnedPtr<Box<dyn GrowthRate>>,
 ) {

src/ffi/static_data/libraries/library_settings.rs

@@ -3,16 +3,19 @@ use crate::ffi::{ExternPointer, IdentifiablePointer, OwnedPtr};
 use crate::static_data::LibrarySettings;
 use std::ptr::drop_in_place;
 
+/// Creates a new settings library.
 #[no_mangle]
 extern "C" fn library_settings_new(max_level: LevelInt) -> IdentifiablePointer<LibrarySettings> {
     Box::new(LibrarySettings::new(max_level)).into()
 }
 
+/// Drop a library settings object.
 #[no_mangle]
 unsafe extern "C" fn library_settings_drop(ptr: OwnedPtr<LibrarySettings>) {
     drop_in_place(ptr)
 }
 
+/// The highest level a Pokemon can be.
 #[no_mangle]
 extern "C" fn library_settings_maximum_level(ptr: ExternPointer<LibrarySettings>) -> LevelInt {
     ptr.as_ref().maximum_level()

src/ffi/static_data/libraries/mod.rs

@@ -1,7 +1,12 @@
+/// The foreign function interface for the growth rate library.
 mod growth_rate_library;
+/// The foreign function interface for the library settings.
 mod library_settings;
+/// The foreign function interface for the nature library.
 mod nature_library;
+/// The foreign function interface for the static data.
 mod static_data;
+/// The foreign function interface for the type library.
 mod type_library;
 
 use crate::ffi::{BorrowedPtr, IdentifiablePointer, OwnedPtr};
@@ -10,6 +15,7 @@ use std::ffi::{c_char, CStr};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Generates foreign function interfaces for a DataLibrary trait implementation.
 macro_rules! library_interface {
     ($library_type:ty, $return_type:ty) => {
         paste::paste! {

src/ffi/static_data/libraries/nature_library.rs

@@ -4,19 +4,22 @@ use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Creates a new nature library with a given capacity.
 #[no_mangle]
 extern "C" fn nature_library_new(capacity: usize) -> IdentifiablePointer<NatureLibrary> {
     Box::new(NatureLibrary::new(capacity)).into()
 }
 
+/// Drop a nature library.
 #[no_mangle]
 unsafe extern "C" fn nature_library_drop(ptr: OwnedPtr<NatureLibrary>) {
     drop_in_place(ptr);
 }
 
+/// Adds a new nature with name to the library.
 #[no_mangle]
 unsafe extern "C" fn nature_library_load_nature(
-    ptr: ExternPointer<NatureLibrary>,
+    mut ptr: ExternPointer<NatureLibrary>,
     name: BorrowedPtr<c_char>,
     nature: OwnedPtr<Arc<Nature>>,
 ) {
@@ -24,6 +27,7 @@ unsafe extern "C" fn nature_library_load_nature(
         .load_nature(CStr::from_ptr(name).into(), nature.as_ref().unwrap().clone())
 }
 
+/// Gets a nature by name.
 #[no_mangle]
 unsafe extern "C" fn nature_library_get_nature(
     ptr: ExternPointer<NatureLibrary>,
@@ -36,6 +40,7 @@ unsafe extern "C" fn nature_library_get_nature(
     }
 }
 
+/// Finds a nature name by nature.
 #[no_mangle]
 unsafe extern "C" fn nature_library_get_nature_name(
     ptr: ExternPointer<NatureLibrary>,

src/ffi/static_data/libraries/static_data.rs

@@ -5,54 +5,64 @@ use crate::static_data::{
 };
 use std::ptr::drop_in_place;
 
+/// Instantiates a new data collection.
 #[no_mangle]
 unsafe extern "C" fn static_data_new(settings: OwnedPtr<LibrarySettings>) -> IdentifiablePointer<StaticData> {
     Box::new(StaticData::new(*Box::from_raw(settings))).into()
 }
 
+/// Drop a static data.
 #[no_mangle]
 unsafe extern "C" fn static_data_drop(ptr: OwnedPtr<StaticData>) {
     drop_in_place(ptr)
 }
 
+/// Several misc settings for the library.
 #[no_mangle]
-unsafe extern "C" fn static_data_settings(data: ExternPointer<StaticData>) -> IdentifiablePointer<LibrarySettings> {
+unsafe extern "C" fn static_data_settings(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<LibrarySettings> {
     (data.as_mut().settings() as *const LibrarySettings).into()
 }
 
+/// All data for Pokemon species.
 #[no_mangle]
-unsafe extern "C" fn static_data_species(data: ExternPointer<StaticData>) -> IdentifiablePointer<SpeciesLibrary> {
+unsafe extern "C" fn static_data_species(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<SpeciesLibrary> {
     (data.as_mut().species_mut() as *const SpeciesLibrary).into()
 }
 
+/// All data for the moves.
 #[no_mangle]
-unsafe extern "C" fn static_data_moves(data: ExternPointer<StaticData>) -> IdentifiablePointer<MoveLibrary> {
+unsafe extern "C" fn static_data_moves(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<MoveLibrary> {
     (data.as_mut().moves_mut() as *const MoveLibrary).into()
 }
 
+/// All data for the items.
 #[no_mangle]
-unsafe extern "C" fn static_data_items(data: ExternPointer<StaticData>) -> IdentifiablePointer<ItemLibrary> {
+unsafe extern "C" fn static_data_items(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<ItemLibrary> {
     (data.as_mut().items_mut() as *const ItemLibrary).into()
 }
 
+/// All data for growth rates.
 #[no_mangle]
 unsafe extern "C" fn static_data_growth_rates(
-    data: ExternPointer<StaticData>,
+    mut data: ExternPointer<StaticData>,
 ) -> IdentifiablePointer<GrowthRateLibrary> {
     (data.as_mut().growth_rates_mut() as *const GrowthRateLibrary).into()
 }
 
+/// All data related to types and type effectiveness.
 #[no_mangle]
-unsafe extern "C" fn static_data_types(data: ExternPointer<StaticData>) -> IdentifiablePointer<TypeLibrary> {
+unsafe extern "C" fn static_data_types(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<TypeLibrary> {
     (data.as_mut().types_mut() as *const TypeLibrary).into()
 }
 
+/// All data related to natures.
 #[no_mangle]
-unsafe extern "C" fn static_data_natures(data: ExternPointer<StaticData>) -> IdentifiablePointer<NatureLibrary> {
+unsafe extern "C" fn static_data_natures(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<NatureLibrary> {
     (data.as_mut().natures_mut() as *const NatureLibrary).into()
 }
 
+/// All data related to abilities.
 #[no_mangle]
-unsafe extern "C" fn static_data_abilities(data: ExternPointer<StaticData>) -> IdentifiablePointer<AbilityLibrary> {
+unsafe extern "C" fn static_data_abilities(mut data: ExternPointer<StaticData>) -> IdentifiablePointer<AbilityLibrary> {
     (data.as_mut().abilities_mut() as *const AbilityLibrary).into()
 }

src/ffi/static_data/libraries/type_library.rs

@@ -3,16 +3,19 @@ use crate::static_data::{TypeIdentifier, TypeLibrary};
 use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 
+/// Instantiates a new type library with a specific capacity.
 #[no_mangle]
 extern "C" fn type_library_new(capacity: usize) -> IdentifiablePointer<TypeLibrary> {
     Box::new(TypeLibrary::new(capacity)).into()
 }
 
+/// Drops a type library.
 #[no_mangle]
 unsafe extern "C" fn type_library_drop(ptr: OwnedPtr<TypeLibrary>) {
     drop_in_place(ptr);
 }
 
+/// Gets the type identifier for a type with a name.
 #[no_mangle]
 unsafe extern "C" fn type_library_get_type_id(
     ptr: ExternPointer<TypeLibrary>,
@@ -28,6 +31,7 @@ unsafe extern "C" fn type_library_get_type_id(
     }
 }
 
+/// Gets the type name from the type identifier.
 #[no_mangle]
 unsafe extern "C" fn type_library_get_type_name(
     ptr: ExternPointer<TypeLibrary>,
@@ -43,6 +47,7 @@ unsafe extern "C" fn type_library_get_type_name(
     }
 }
 
+/// Gets the effectiveness for a single attacking type against a single defending type.
 #[no_mangle]
 extern "C" fn type_library_get_single_effectiveness(
     ptr: ExternPointer<TypeLibrary>,
@@ -52,6 +57,9 @@ extern "C" fn type_library_get_single_effectiveness(
     ptr.as_ref().get_single_effectiveness(attacking, defending)
 }
 
+/// Gets the effectiveness for a single attacking type against an amount of defending types.
+/// This is equivalent to running [`type_library_get_single_effectiveness`] on each defending type,
+/// and multiplying the results with each other.
 #[no_mangle]
 unsafe extern "C" fn type_library_get_effectiveness(
     ptr: ExternPointer<TypeLibrary>,
@@ -63,17 +71,19 @@ unsafe extern "C" fn type_library_get_effectiveness(
     ptr.as_ref().get_effectiveness(attacking, v)
 }
 
+/// Registers a new type in the library.
 #[no_mangle]
 unsafe extern "C" fn type_library_register_type(
-    ptr: ExternPointer<TypeLibrary>,
+    mut ptr: ExternPointer<TypeLibrary>,
     name: BorrowedPtr<c_char>,
 ) -> TypeIdentifier {
     ptr.as_mut().register_type(&CStr::from_ptr(name).into())
 }
 
+/// Sets the effectiveness for an attacking type against a defending type.
 #[no_mangle]
 unsafe extern "C" fn type_library_set_effectiveness(
-    ptr: ExternPointer<TypeLibrary>,
+    mut ptr: ExternPointer<TypeLibrary>,
     attacking: TypeIdentifier,
     defending: TypeIdentifier,
     effectiveness: f32,

src/ffi/static_data/mod.rs

@@ -4,43 +4,59 @@ use crate::StringKey;
 use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 
+/// The Foreign Function Interface for abilities
 mod ability;
+/// The Foreign Function Interface for forms
 mod form;
+/// The Foreign Function Interface for growth rates
 mod growth_rate;
+/// The Foreign Function Interface for items
 mod item;
+/// The Foreign Function Interface for learnable moves
 mod learnable_moves;
+/// The Foreign Function Interface for libraries
 mod libraries;
+/// The Foreign Function Interface for moves
 mod move_data;
+/// The Foreign Function Interface for natures
 mod nature;
+/// The Foreign Function Interface for species
 mod species;
+/// The Foreign Function Interface for sets of statistics
 mod statistic_set;
 
+/// Instantiates an effect parameter with a boolean.
 #[no_mangle]
 extern "C" fn effect_parameter_new_bool(value: u8) -> OwnedPtr<EffectParameter> {
     Box::into_raw(Box::new((value == 1).into()))
 }
 
+/// Instantiates an effect parameter with an integer.
 #[no_mangle]
 extern "C" fn effect_parameter_new_int(value: i64) -> OwnedPtr<EffectParameter> {
     Box::into_raw(Box::new(value.into()))
 }
 
+/// Instantiates an effect parameter with a float.
 #[no_mangle]
 extern "C" fn effect_parameter_new_float(value: f32) -> OwnedPtr<EffectParameter> {
     Box::into_raw(Box::new(value.into()))
 }
 
+/// Instantiates an effect parameter with a string.
 #[no_mangle]
 unsafe extern "C" fn effect_parameter_new_string(value: *const c_char) -> OwnedPtr<EffectParameter> {
     let sk: StringKey = CStr::from_ptr(value).to_str().unwrap().into();
     Box::into_raw(Box::new(sk.into()))
 }
 
+/// Drop an effect parameter.
 #[no_mangle]
 unsafe extern "C" fn effect_parameter_drop(ptr: OwnedPtr<EffectParameter>) {
     drop_in_place(ptr)
 }
 
+/// Get the type of an effect parameter.
 #[no_mangle]
 extern "C" fn effect_parameter_get_type(ptr: ExternPointer<EffectParameter>) -> u8 {
     match ptr.as_ref() {
@@ -51,15 +67,17 @@ extern "C" fn effect_parameter_get_type(ptr: ExternPointer<EffectParameter>) ->
     }
 }
 
+/// Get the boolean contained in the effect parameter, panics if the effect parameter is not a bool.
 #[no_mangle]
 extern "C" fn effect_parameter_get_as_bool(ptr: ExternPointer<EffectParameter>) -> u8 {
     let p = ptr.as_ref();
     if let EffectParameter::Bool(_, b) = p {
-        return if *b { 1 } else { 0 };
+        return u8::from(*b);
     }
     panic!("Unexpected effect parameter. Expected bool, was: {}", p);
 }
 
+/// Get the int contained in the effect parameter, panics if the effect parameter is not a int.
 #[no_mangle]
 extern "C" fn effect_parameter_get_as_int(ptr: ExternPointer<EffectParameter>) -> i64 {
     let p = ptr.as_ref();
@@ -69,6 +87,7 @@ extern "C" fn effect_parameter_get_as_int(ptr: ExternPointer<EffectParameter>) -
     panic!("Unexpected effect parameter. Expected int, was: {}", p);
 }
 
+/// Get the float contained in the effect parameter, panics if the effect parameter is not a float.
 #[no_mangle]
 extern "C" fn effect_parameter_get_as_float(ptr: ExternPointer<EffectParameter>) -> f32 {
     let p = ptr.as_ref();
@@ -78,6 +97,7 @@ extern "C" fn effect_parameter_get_as_float(ptr: ExternPointer<EffectParameter>)
     panic!("Unexpected effect parameter. Expected float, was: {}", p);
 }
 
+/// Get the string contained in the effect parameter, panics if the effect parameter is not a string.
 #[no_mangle]
 extern "C" fn effect_parameter_get_as_string(ptr: ExternPointer<EffectParameter>) -> OwnedPtr<c_char> {
     let p = ptr.as_ref();

src/ffi/static_data/move_data.rs

@@ -1,4 +1,4 @@
-use crate::ffi::{ffi_arc_getter, ffi_getter, BorrowedPtr, ExternPointer, IdentifiablePointer, OwnedPtr};
+use crate::ffi::{ffi_arc_getter, BorrowedPtr, ExternPointer, IdentifiablePointer, OwnedPtr};
 use crate::static_data::{EffectParameter, MoveCategory, MoveData, MoveTarget, SecondaryEffect, TypeIdentifier};
 use crate::StringKey;
 use hashbrown::HashSet;
@@ -6,6 +6,7 @@ use std::ffi::{c_char, CStr, CString};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Instantiates a new move.
 #[no_mangle]
 unsafe extern "C" fn move_data_new(
     name: *const c_char,
@@ -46,11 +47,13 @@ unsafe extern "C" fn move_data_new(
     .into()
 }
 
+/// Drops a reference counted move.
 #[no_mangle]
 unsafe extern "C" fn move_data_drop(ptr: OwnedPtr<Arc<MoveData>>) {
     drop_in_place(ptr)
 }
 
+/// The name of the move.
 #[no_mangle]
 unsafe extern "C" fn move_data_name(ptr: ExternPointer<Arc<MoveData>>) -> OwnedPtr<c_char> {
     let name = ptr.as_ref().name();
@@ -65,6 +68,7 @@ ffi_arc_getter!(MoveData, base_usages, u8);
 ffi_arc_getter!(MoveData, target, MoveTarget);
 ffi_arc_getter!(MoveData, priority, i8);
 
+/// The optional secondary effect the move has.
 #[no_mangle]
 unsafe extern "C" fn move_data_secondary_effect(
     ptr: ExternPointer<Arc<MoveData>>,
@@ -77,16 +81,14 @@ unsafe extern "C" fn move_data_secondary_effect(
     }
 }
 
+/// Arbitrary flags that can be applied to the move.
 #[no_mangle]
 unsafe extern "C" fn move_data_has_flag(ptr: ExternPointer<Arc<MoveData>>, flag: *const c_char) -> u8 {
     let flag = CStr::from_ptr(flag).into();
-    if ptr.as_ref().has_flag(&flag) {
+    u8::from(ptr.as_ref().has_flag(&flag))
-        1
-    } else {
-        0
-    }
 }
 
+/// Instantiates a new Secondary Effect.
 #[no_mangle]
 unsafe extern "C" fn secondary_effect_new(
     chance: f32,
@@ -108,23 +110,31 @@ unsafe extern "C" fn secondary_effect_new(
     .into()
 }
 
+/// Drop a secondary effect.
 #[no_mangle]
 unsafe extern "C" fn secondary_effect_drop(ptr: OwnedPtr<SecondaryEffect>) {
     drop_in_place(ptr)
 }
 
-ffi_getter!(SecondaryEffect, chance, f32);
+/// The chance the effect triggers.
+#[no_mangle]
+unsafe extern "C" fn secondary_effect_chance(ptr: ExternPointer<SecondaryEffect>) -> f32 {
+    ptr.as_ref().chance()
+}
 
+/// The name of the effect.
 #[no_mangle]
 unsafe extern "C" fn secondary_effect_effect_name(ptr: ExternPointer<SecondaryEffect>) -> OwnedPtr<c_char> {
     CString::new(ptr.as_ref().effect_name().str()).unwrap().into_raw()
 }
 
+/// The length of parameters of the effect.
 #[no_mangle]
 unsafe extern "C" fn secondary_effect_parameter_length(ptr: ExternPointer<SecondaryEffect>) -> usize {
     ptr.as_ref().parameters().len()
 }
 
+/// Get a parameter of the effect.
 #[no_mangle]
 unsafe extern "C" fn secondary_effect_parameter_get(
     ptr: ExternPointer<SecondaryEffect>,

src/ffi/static_data/nature.rs

@@ -3,6 +3,7 @@ use crate::static_data::{Nature, Statistic};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Instantiates a new statistic.
 #[no_mangle]
 extern "C" fn nature_new(
     increase_stat: Statistic,
@@ -13,21 +14,26 @@ extern "C" fn nature_new(
     Nature::new(increase_stat, decrease_stat, increase_modifier, decrease_modifier).into()
 }
 
+/// Reduce the reference count for a nature.
 #[no_mangle]
 unsafe extern "C" fn nature_drop(ptr: OwnedPtr<Arc<Nature>>) {
     drop_in_place(ptr)
 }
 
+/// The stat that should receive the increased modifier.
 #[no_mangle]
 extern "C" fn nature_increased_stat(ptr: ExternPointer<Arc<Nature>>) -> Statistic {
     ptr.as_ref().increased_stat()
 }
 
+/// The stat that should receive the decreased modifier.
 #[no_mangle]
 extern "C" fn nature_decreased_stat(ptr: ExternPointer<Arc<Nature>>) -> Statistic {
     ptr.as_ref().decreased_stat()
 }
 
+/// Calculates the modifier for a given stat. If it's the increased stat, returns the increased
+/// modifier, if it's the decreased stat, returns the decreased modifier. Otherwise returns 1.0
 #[no_mangle]
 extern "C" fn nature_get_stat_modifier(ptr: ExternPointer<Arc<Nature>>, stat: Statistic) -> f32 {
     ptr.as_ref().get_stat_modifier(stat)

src/ffi/static_data/species.rs

@@ -6,6 +6,7 @@ use std::ffi::{c_char, CStr};
 use std::ptr::drop_in_place;
 use std::sync::Arc;
 
+/// Creates a new species.
 #[no_mangle]
 unsafe extern "C" fn species_new(
     id: u16,
@@ -37,6 +38,7 @@ unsafe extern "C" fn species_new(
     .into()
 }
 
+/// Drop a reference to the species.
 #[no_mangle]
 unsafe extern "C" fn species_drop(ptr: OwnedPtr<Arc<Species>>) {
     drop_in_place(ptr);
@@ -48,9 +50,10 @@ ffi_arc_getter!(Species, gender_rate, f32);
 ffi_arc_stringkey_getter!(Species, growth_rate);
 ffi_arc_getter!(Species, capture_rate, u8);
 
+/// Adds a new form to the species.
 #[no_mangle]
 unsafe extern "C" fn species_add_form(
-    species: ExternPointer<Arc<Species>>,
+    mut species: ExternPointer<Arc<Species>>,
     name: BorrowedPtr<c_char>,
     form: OwnedPtr<Arc<Form>>,
 ) {
@@ -58,6 +61,7 @@ unsafe extern "C" fn species_add_form(
     species.as_mut().add_form(CStr::from_ptr(name).into(), form)
 }
 
+/// Gets a form by name.
 #[no_mangle]
 unsafe extern "C" fn species_get_form(
     species: ExternPointer<Arc<Species>>,

src/ffi/static_data/statistic_set.rs

@@ -2,6 +2,7 @@ use crate::ffi::{ExternPointer, IdentifiablePointer, OwnedPtr};
 use crate::static_data::{StaticStatisticSet, Statistic, StatisticSet};
 use std::ptr::drop_in_place;
 
+/// Basic foreign function interface for a statistic set.
 macro_rules! statistic_set {
     ($num_type:ident) => {
     paste::paste!{
@@ -61,6 +62,7 @@ statistic_set!(i8);
 statistic_set!(i16);
 statistic_set!(i32);
 
+/// Basic foreign function interface for a static statistic set.
 macro_rules! static_statistic_set {
     ($num_type:ident) => {
     paste::paste!{

src/script_implementations/wasm/export_registry/dynamic_data/battle_side.rs

@@ -12,14 +12,14 @@ register! {
         env: FunctionEnvMut<WebAssemblyEnv>,
         side: ExternRef<BattleSide>,
     ) -> u8 {
-        if side.value_func(&env).unwrap().has_fled_battle() { 1 } else { 0 }
+        u8::from(side.value_func(&env).unwrap().has_fled_battle())
     }
 
     fn battleside_is_defeated(
         env: FunctionEnvMut<WebAssemblyEnv>,
         side: ExternRef<BattleSide>,
     ) -> u8 {
-        if side.value_func(&env).unwrap().is_defeated() { 1 } else { 0 }
+        u8::from(side.value_func(&env).unwrap().is_defeated())
     }
 
     fn battleside_get_side_index(
@@ -102,7 +102,7 @@ register! {
     ) -> u8 {
         unsafe {
             let c_name = CStr::from_ptr(env.data().data().get_raw_pointer(name_ptr));
-            if side.value_func(&env).unwrap().has_volatile_script(&c_name.as_ref().into()) { 1 } else { 0 }
+            u8::from(side.value_func(&env).unwrap().has_volatile_script(&c_name.as_ref().into()))
         }
     }
 

src/script_implementations/wasm/export_registry/dynamic_data/choice_queue.rs

@@ -10,10 +10,6 @@ register! {
         battle_random: ExternRef<ChoiceQueue>,
         pokemon: ExternRef<Pokemon>
     ) -> u8 {
-        if battle_random.value_func(&env).unwrap().move_pokemon_choice_next(pokemon.value_func(&env).unwrap()) {
+        u8::from(battle_random.value_func(&env).unwrap().move_pokemon_choice_next(pokemon.value_func(&env).unwrap()))
-            1
-        } else {
-            0
-        }
     }
 }

src/script_implementations/wasm/export_registry/dynamic_data/hit_data.rs

@@ -16,7 +16,7 @@ register! {
         env: FunctionEnvMut<WebAssemblyEnv>,
         hit: ExternRef<HitData>,
     ) -> u8 {
-        if hit.value_func(&env).unwrap().is_critical() { 1 } else { 0 }
+        u8::from(hit.value_func(&env).unwrap().is_critical())
     }
 
     fn hit_data_fail(

src/script_implementations/wasm/export_registry/dynamic_data/mod.rs

@@ -7,20 +7,26 @@ use wasmer::{FunctionEnv, FunctionEnvMut, Imports, StoreMut};
 use crate::script_implementations::wasm::script_resolver::WebAssemblyEnv;
 use crate::static_data::StaticData;
 
+/// The battle registration
+mod battle;
+/// Battle random registration
 mod battle_random;
 /// Battle side registration
 mod battle_side;
+/// Choice queue registration.
 mod choice_queue;
+/// The executing move registration/
 mod executing_move;
+/// The hit data registration/
+mod hit_data;
 /// Learned move registration
 mod learned_move;
+/// The party registration.
 mod party;
 /// Pokemon registration
 mod pokemon;
 /// Turn choice registration
 mod turn_choice;
-mod hit_data;
-mod battle;
 
 register! {
     fn dynamic_library_get_static_data(

src/script_implementations/wasm/export_registry/dynamic_data/pokemon.rs

@@ -7,7 +7,7 @@ use crate::script_implementations::wasm::script::WebAssemblyScript;
 use crate::script_implementations::wasm::script_resolver::WebAssemblyEnv;
 use crate::static_data::{ClampedStatisticSet, Species};
 use crate::static_data::{Item, StatisticSet};
-use crate::{ScriptCategory, StringKey};
+use crate::ScriptCategory;
 use std::ffi::{c_char, CStr};
 use wasmer::FunctionEnvMut;
 
@@ -134,11 +134,7 @@ register! {
         self_inflicted: u8
     ) -> u8 {
         unsafe{
-            if pokemon.value_func(&env).unwrap().change_stat_boost(transmute(stat), amount, self_inflicted == 1) {
+            u8::from(pokemon.value_func(&env).unwrap().change_stat_boost(transmute(stat), amount, self_inflicted == 1))
-                1
-            } else {
-                0
-            }
         }
     }
 
@@ -194,8 +190,7 @@ register! {
     ) -> u8 {
         let name : *mut c_char = env.data().data().get_raw_pointer(name);
         let name = unsafe { CStr::from_ptr(name) };
-        let key = StringKey::new(name.to_str().unwrap().into());
+        u8::from(pokemon.value_func(&env).unwrap().has_held_item(&name.into()))
-        if pokemon.value_func(&env).unwrap().has_held_item(&key) { 1 } else { 0 }
     }
 
     fn pokemon_heal(
@@ -204,7 +199,7 @@ register! {
         amount: u32,
         allow_revive: u8
     ) -> u8 {
-        if pokemon.value_func(&env).unwrap().heal(amount, allow_revive == 1) { 1 } else { 0 }
+        u8::from(pokemon.value_func(&env).unwrap().heal(amount, allow_revive == 1))
     }
 
     fn pokemon_clear_status(
@@ -261,7 +256,7 @@ register! {
     ) -> u8 {
         unsafe {
             let c_name = CStr::from_ptr(env.data().data().get_raw_pointer(name_ptr));
-            if pokemon.value_func(&env).unwrap().has_volatile_script(&c_name.as_ref().into()) { 1 } else { 0 }
+            u8::from(pokemon.value_func(&env).unwrap().has_volatile_script(&c_name.as_ref().into()))
         }
     }
 

src/script_implementations/wasm/export_registry/mod.rs

@@ -149,13 +149,7 @@ fn effect_parameter_get_type(env: FunctionEnvMut<WebAssemblyEnv>, parameter: Ext
 fn effect_parameter_as_bool(env: FunctionEnvMut<WebAssemblyEnv>, parameter: ExternRef<EffectParameter>) -> u8 {
     let v = parameter.value_func(&env).unwrap();
     match v {
-        EffectParameter::Bool(_, b) => {
+        EffectParameter::Bool(_, b) => u8::from(*b),
-            if *b {
-                1
-            } else {
-                0
-            }
-        }
         _ => panic!("Unexpected parameter type!"),
     }
 }

src/script_implementations/wasm/export_registry/static_data/mod.rs

@@ -9,6 +9,7 @@ use crate::static_data::{
     ItemLibrary, LibrarySettings, MoveLibrary, SpeciesLibrary, StaticData, StatisticSet, TypeLibrary,
 };
 
+/// Item registration.
 mod item;
 /// Moves data registration
 mod moves;

src/script_implementations/wasm/export_registry/static_data/moves.rs

@@ -56,17 +56,9 @@ fn move_data_get_priority(env: FunctionEnvMut<WebAssemblyEnv>, move_data: Extern
     move_data.value_func(&env).unwrap().priority()
 }
 fn move_data_has_flag(env: FunctionEnvMut<WebAssemblyEnv>, move_data: ExternRef<MoveData>, flag: ExternRef<StringKey>) -> u8 {
-    if move_data.value_func(&env).unwrap().has_flag(flag.value_func(&env).unwrap()) {
+    u8::from(move_data.value_func(&env).unwrap().has_flag(flag.value_func(&env).unwrap()))
-        1
-    } else {
-        0
-    }
 }
 fn move_data_has_flag_by_hash(env: FunctionEnvMut<WebAssemblyEnv>, move_data: ExternRef<MoveData>, flag_hash: u32) -> u8 {
-    if move_data.value_func(&env).unwrap().has_flag_by_hash(flag_hash) {
+    u8::from(move_data.value_func(&env).unwrap().has_flag_by_hash(flag_hash))
-        1
-    } else {
-        0
-    }
 }
 }

src/script_implementations/wasm/script.rs

@@ -54,6 +54,7 @@ impl WebAssemblyScript {
         }
     }
 
+    /// Get a pointer inside the WASM memory.
     pub(crate) fn get_wasm_pointer(&self) -> u32 {
         self.self_ptr
     }
@@ -569,7 +570,7 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().prevent_stat_boost_change(env) {
             let ptr = env.allocate_temp(*prevent);
-            let self_inflicted = if self_inflicted { 1_u8 } else { 0_u8 };
+            let self_inflicted = u8::from(self_inflicted);
             call_func!(
                 func,
                 env,

src/script_implementations/wasm/script_function_cache.rs

@@ -173,6 +173,7 @@ script_function_cache! {
 }
 
 impl ScriptFunctionCache {
+    /// Get the name of a script.
     pub(crate) fn script_get_name(&self, env: &Arc<WebAssemblyEnvironmentData>) -> Option<TypedFunction<u32, u32>> {
         {
             let read_lock = self.script_get_name.read();
@@ -191,6 +192,7 @@ impl ScriptFunctionCache {
         self.script_get_name.read().as_ref().cloned()
     }
 
+    /// Drop the memory of a CString inside the WASM memory.
     pub(crate) fn dealloc_cstring(&self, env: &Arc<WebAssemblyEnvironmentData>) -> Option<TypedFunction<u32, ()>> {
         {
             let read_lock = self.dealloc_cstring.read();

src/script_implementations/wasm/script_resolver.rs

@@ -93,18 +93,15 @@ impl WebAssemblyScriptResolver {
         self.modules.push(module);
     }
 
-    /// Initialise all the data we need.
+    /// Tells the script resolver we're done loading wasm modules, and to finalize the resolver.
     pub fn finalize(&mut self) {
         let mut imports = Imports::new();
-        //let mut exports = Exports::new();
 
         let env = FunctionEnv::new(
             &mut self.store_mut(),
             WebAssemblyEnv::new(Arc::downgrade(&self.environment_data)),
         );
         register_webassembly_funcs(&mut imports, &mut self.store_mut(), &env);
-        //imports.register("env", exports);
-
         for module in &self.modules {
             for import in module.imports() {
                 if imports.get_export("env", import.name()).is_none() {

src/static_data/growth_rates.rs

@@ -15,7 +15,8 @@ pub struct LookupGrowthRate {
 }
 
 impl LookupGrowthRate {
-    /// Instantiates a new lookup growth rate.
+    /// Instantiates a new lookup growth rate. The experience vec should be the amount of experience
+    /// required per level, with the first element being the experience required for level 1 (generally 0).
     pub fn new(experience: Vec<u32>) -> LookupGrowthRate {
         LookupGrowthRate { experience }
     }

src/static_data/libraries/ability_library.rs

@@ -51,7 +51,7 @@ pub mod tests {
     pub fn build() -> AbilityLibrary {
         let mut lib = AbilityLibrary::new(1);
         lib.add(
-            &StringKey::new("test_ability".into()),
+            &StringKey::new("test_ability"),
             Arc::new(Ability::new(&"test_ability".into(), &"test_ability".into(), Vec::new())),
         );
         // Drops borrow as mut

src/static_data/libraries/move_library.rs

@@ -71,7 +71,7 @@ pub mod tests {
         let m = build_move();
         // Borrow as mut so we can insert
         let w = &mut lib;
-        w.add(&StringKey::new("foo".into()), Arc::new(m));
+        w.add(&StringKey::new("foo"), Arc::new(m));
         // Drops borrow as mut
 
         lib

src/static_data/mod.rs

@@ -49,27 +49,27 @@ pub enum EffectParameter {
     String(ValueIdentifier, StringKey),
 }
 
-impl Into<EffectParameter> for bool {
+impl From<bool> for EffectParameter {
-    fn into(self) -> EffectParameter {
+    fn from(b: bool) -> Self {
-        EffectParameter::Bool(Default::default(), self)
+        EffectParameter::Bool(Default::default(), b)
     }
 }
 
-impl Into<EffectParameter> for i64 {
+impl From<i64> for EffectParameter {
-    fn into(self) -> EffectParameter {
+    fn from(i: i64) -> Self {
-        EffectParameter::Int(Default::default(), self)
+        EffectParameter::Int(Default::default(), i)
     }
 }
 
-impl Into<EffectParameter> for f32 {
+impl From<f32> for EffectParameter {
-    fn into(self) -> EffectParameter {
+    fn from(f: f32) -> Self {
-        EffectParameter::Float(Default::default(), self)
+        EffectParameter::Float(Default::default(), f)
     }
 }
 
-impl Into<EffectParameter> for StringKey {
+impl From<StringKey> for EffectParameter {
-    fn into(self) -> EffectParameter {
+    fn from(s: StringKey) -> Self {
-        EffectParameter::String(Default::default(), self)
+        EffectParameter::String(Default::default(), s)
     }
 }
 

src/utils/mod.rs

@@ -10,4 +10,5 @@ mod random;
 /// The string_key module defines a custom string handling for reduced allocations and fast lookups
 /// and equality checks.
 mod string_key;
+/// Helper tool to keep track of moving memory for FFI.
 mod value_identifier;

src/utils/string_key.rs

@@ -116,11 +116,12 @@ impl Display for StringKey {
     }
 }
 
-impl Into<StringKey> for &CStr {
+impl From<&CStr> for StringKey {
-    fn into(self) -> StringKey {
+    fn from(s: &CStr) -> Self {
-        StringKey::new(self.to_str().unwrap())
+        StringKey::new(s.to_str().unwrap())
     }
 }
+
 /// Converts a character to lowercased in a const safe way.
 const fn to_lower(c: u8) -> u8 {
     if c >= b'A' && c <= b'Z' {
@@ -170,7 +171,7 @@ mod tests {
 
     #[test]
     fn create_empty_stringkey() {
-        let sk = StringKey::new("".into());
+        let sk = StringKey::new("");
         assert_eq!(sk.str(), "");
         assert_eq!(sk.hash(), 0);
         assert_eq!(sk.hash(), StringKey::get_hash(""));
@@ -178,7 +179,7 @@ mod tests {
 
     #[test]
     fn create_stringkey_foo() {
-        let sk = StringKey::new("foo".into());
+        let sk = StringKey::new("foo");
         assert_eq!(sk.str(), "foo");
         assert_eq!(sk.hash(), 2356372769);
         assert_eq!(sk.hash(), StringKey::get_hash("foo"));
@@ -187,7 +188,7 @@ mod tests {
 
     #[test]
     fn create_stringkey_bar() {
-        let sk = StringKey::new("bar".into());
+        let sk = StringKey::new("bar");
         assert_eq!(sk.str(), "bar");
         assert_eq!(sk.hash(), 1996459178);
         assert_eq!(sk.hash(), StringKey::get_hash("bar"));

src/utils/value_identifier.rs

@@ -1,5 +1,6 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+/// The current index for the value counter.
 static CURRENT: AtomicUsize = AtomicUsize::new(1);
 
 /// An extremely basic way to identify a piece of data.
@@ -9,9 +10,7 @@ pub struct ValueIdentifier(usize);
 
 impl Default for ValueIdentifier {
     fn default() -> Self {
-        Self {
+        Self(CURRENT.fetch_add(1, Ordering::SeqCst))
-            0: CURRENT.fetch_add(1, Ordering::SeqCst),
-        }
     }
 }
 

tests/common/library_loader.rs

@@ -53,15 +53,13 @@ pub fn load_types(path: &String, type_library: &mut TypeLibrary) {
         .unwrap();
     let headers = reader.headers().unwrap();
     for header in headers.iter().skip(1) {
-        type_library.register_type(&StringKey::new(header.into()));
+        type_library.register_type(&header.into());
     }
 
     for record in reader.records() {
         let record = record.unwrap();
         let offensive_type = record.get(0).unwrap();
-        let offensive_type_id = type_library
+        let offensive_type_id = type_library.get_type_id(&offensive_type.into()).unwrap();
-            .get_type_id(&StringKey::new(offensive_type.into()))
-            .unwrap();
 
         for (i, v) in record.iter().skip(1).enumerate() {
             let effectiveness = v.parse::<f32>().unwrap();
@@ -78,7 +76,7 @@ pub fn load_natures(path: &String, nature_library: &mut NatureLibrary) {
 
     for record in reader.records() {
         let record = record.unwrap();
-        let nature_name = StringKey::new(record.get(0).unwrap().into());
+        let nature_name = record.get(0).unwrap().into();
         let increased_statistic_str = record.get(1).unwrap();
         let decreased_statistic_str = record.get(2).unwrap();
         if increased_statistic_str.is_empty() || decreased_statistic_str.is_empty() {
@@ -102,7 +100,7 @@ pub fn load_items(path: &String, lib: &mut ItemLibrary) {
     let json_array = json.as_array().unwrap();
 
     for v in json_array {
-        let name = StringKey::new(v.get("name").unwrap().as_str().unwrap().into());
+        let name = v.get("name").unwrap().as_str().unwrap().into();
         let category = serde_json::from_value(v.get("itemType").unwrap().clone()).unwrap();
         let mut battle_category = BattleItemCategory::None;
         if let Some(c) = v.get("battleType") {
@@ -113,7 +111,7 @@ pub fn load_items(path: &String, lib: &mut ItemLibrary) {
         if let Some(f) = v.get("flags") {
             let a = f.as_array().unwrap();
             for flag in a {
-                flags.insert(StringKey::new(flag.as_str().unwrap().into()));
+                flags.insert(flag.as_str().unwrap().into());
             }
         }
 
@@ -154,7 +152,7 @@ pub fn load_abilities(path: &String, ability_library: &mut AbilityLibrary) {
         let name = StringKey::new(key);
         let mut effect = StringKey::empty();
         if let Some(e) = value.get("effect") {
-            effect = StringKey::new(e.as_str().unwrap().into());
+            effect = e.as_str().unwrap().into();
         }
         let mut parameters = Vec::new();
         if let Some(p) = value.get("parameters") {
@@ -175,8 +173,8 @@ pub fn load_moves(path: &String, lib: &mut StaticData) {
     let data = json.as_object().unwrap().get("data").unwrap().as_array().unwrap();
     for move_data in data {
         let move_data = move_data.as_object().unwrap();
-        let move_name = StringKey::new(move_data.get("name").unwrap().as_str().unwrap().into());
+        let move_name = move_data.get("name").unwrap().as_str().unwrap().into();
-        let move_type = StringKey::new(move_data.get("type").unwrap().as_str().unwrap().into());
+        let move_type = move_data.get("type").unwrap().as_str().unwrap().into();
         let move_type_id = lib.types().get_type_id(&move_type).unwrap();
         let move_category = serde_json::from_value(move_data.get("category").unwrap().clone()).unwrap();
         let base_power = move_data.get("power").unwrap().as_i64().unwrap() as u8;
@@ -199,7 +197,7 @@ pub fn load_moves(path: &String, lib: &mut StaticData) {
 
             Some(SecondaryEffect::new(
                 chance,
-                StringKey::new(v.get("name").unwrap().as_str().unwrap().into()),
+                v.get("name").unwrap().as_str().unwrap().into(),
                 parameters,
             ))
         } else {
@@ -210,7 +208,7 @@ pub fn load_moves(path: &String, lib: &mut StaticData) {
         if let Some(f) = move_data.get("flags") {
             let f = f.as_array().unwrap();
             for flag in f {
-                flags.insert(StringKey::new(flag.as_str().unwrap().into()));
+                flags.insert(flag.as_str().unwrap().into());
             }
         }
 
@@ -246,7 +244,7 @@ pub fn load_species(path: &String, library: &mut StaticData) {
         let name = StringKey::new(key);
         let id = value.get("id").unwrap().as_i64().unwrap();
         let gender_rate = value.get("genderRatio").unwrap().as_f64().unwrap();
-        let growth_rate_name = StringKey::new(value.get("growthRate").unwrap().as_str().unwrap().into());
+        let growth_rate_name = value.get("growthRate").unwrap().as_str().unwrap().into();
         let _base_happiness = value.get("baseHappiness").unwrap().as_i64().unwrap();
         let catch_rate = value.get("catchRate").unwrap().as_i64().unwrap();
         let _color = value.get("color").unwrap().as_str().unwrap();
@@ -289,13 +287,13 @@ fn load_wasm(path: &String, library: &mut WebAssemblyScriptResolver) {
 fn parse_form(name: StringKey, value: &Value, library: &mut StaticData) -> Arc<Form> {
     let mut abilities = Vec::new();
     for a in value.get("abilities").unwrap().as_array().unwrap() {
-        abilities.push(StringKey::new(a.as_str().unwrap().into()));
+        abilities.push(a.as_str().unwrap().into());
     }
     let mut hidden_abilities = Vec::new();
     for a in value.get("hiddenAbilities").unwrap().as_array().unwrap() {
-        hidden_abilities.push(StringKey::new(a.as_str().unwrap().into()));
+        hidden_abilities.push(a.as_str().unwrap().into());
     }
-    let base_stats = parse_statistics(&value.get("baseStats").unwrap());
+    let base_stats = parse_statistics(value.get("baseStats").unwrap());
     // TODO: ev reward
     let height = value.get("height").unwrap().as_f64().unwrap();
     let weight = value.get("weight").unwrap().as_f64().unwrap();
@@ -306,15 +304,10 @@ fn parse_form(name: StringKey, value: &Value, library: &mut StaticData) -> Arc<F
         .as_array()
         .unwrap()
         .iter()
-        .map(|a| {
+        .map(|a| library.types().get_type_id(&a.as_str().unwrap().into()).unwrap())
-            library
-                .types()
-                .get_type_id(&StringKey::new(a.as_str().unwrap().into()))
-                .unwrap()
-        })
         .collect();
 
-    let moves = parse_moves(&value.get("moves").unwrap(), library.moves());
+    let moves = parse_moves(value.get("moves").unwrap(), library.moves());
 
     Arc::new(Form::new(
         &name,
@@ -379,7 +372,7 @@ fn parse_moves(value: &Value, move_library: &MoveLibrary) -> LearnableMoves {
 
     let level_moves = value.get("levelMoves").unwrap().as_array().unwrap();
     for level_move in level_moves {
-        let name = StringKey::new(level_move.get("name").unwrap().as_str().unwrap().into());
+        let name = level_move.get("name").unwrap().as_str().unwrap().into();
         let level = level_move.get("level").unwrap().as_u64().unwrap() as LevelInt;
         assert!(move_library.get(&name).is_some());
         moves.add_level_move(level, &name);
@@ -401,7 +394,7 @@ fn parse_effect_parameter(value: &Value) -> EffectParameter {
                 n.as_i64().unwrap().into()
             }
         }
-        Value::String(s) => StringKey::new(s.as_str().into()).into(),
+        Value::String(s) => StringKey::new(s.as_str()).into(),
         Value::Array(_) => {
             panic!("Unexpected type")
         }
@@ -421,8 +414,8 @@ fn test_type_library_loaded() {
 
     assert_eq!(
         lib.get_effectiveness(
-            lib.get_type_id(&StringKey::new("fire".into())).unwrap(),
+            lib.get_type_id(&"fire".into()).unwrap(),
-            &[lib.get_type_id(&StringKey::new("grass".into())).unwrap()],
+            &[lib.get_type_id(&"grass".into()).unwrap()],
         ),
         2.0
     );

tests/common/test_case.rs

@@ -74,7 +74,7 @@ impl TestCase {
 
 impl TestPokemon {
     fn to_pokemon(&self, library: Arc<DynamicLibrary>) -> Pokemon {
-        let mut builder = PokemonBuilder::new(library, StringKey::new(self.species.as_str().into()), self.level);
+        let mut builder = PokemonBuilder::new(library, self.species.as_str().into(), self.level);
         for move_name in &self.moves {
             builder = builder.learn_move(StringKey::new(move_name));
         }

tests/main.rs

@@ -83,7 +83,7 @@ fn validate_assurance() {
     let executing_move = ExecutingMove::new(
         vec![],
         1,
-        p1.clone(),
+        p1,
         mv.clone(),
         mv.move_data().clone(),
         ScriptContainer::default(),