diff --git a/src/Tester/AngelScript/PokemonBuilder.hpp b/src/Tester/AngelScript/PokemonBuilder.hpp
index 7a37cf3..1eb6ab1 100644
--- a/src/Tester/AngelScript/PokemonBuilder.hpp
+++ b/src/Tester/AngelScript/PokemonBuilder.hpp
@@ -36,28 +36,45 @@ public:
                    asFUNCTION(CreatePokemonBuilder), asCALL_CDECL) >= 0);
 
         Ensure(engine->RegisterObjectMethod("PokemonBuilder", "PokemonBuilder@ WithForme(const constString&in forme)",
-                                            asMETHOD(PkmnLib::Battling::CreatePokemon, WithForme), asCALL_THISCALL));
+                                            asMETHODPR(PkmnLib::Battling::CreatePokemon, WithForme,
+                                                       (const ArbUt::StringView&), PkmnLib::Battling::CreatePokemon&),
+                                            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod("PokemonBuilder", "PokemonBuilder@ WithGender(Gender gender)",
                                             asFUNCTION(WithGenderWrapper), asCALL_CDECL_OBJFIRST));
-        Ensure(engine->RegisterObjectMethod("PokemonBuilder", "PokemonBuilder@ IsShiny(bool value)",
-                                            asMETHOD(PkmnLib::Battling::CreatePokemon, IsShiny), asCALL_THISCALL));
+        Ensure(engine->RegisterObjectMethod(
+            "PokemonBuilder", "PokemonBuilder@ IsShiny(bool value)",
+            asMETHODPR(PkmnLib::Battling::CreatePokemon, IsShiny, (bool), PkmnLib::Battling::CreatePokemon&),
+            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod("PokemonBuilder", "PokemonBuilder@ WithHeldItem(const constString&in item)",
-                                            asMETHOD(PkmnLib::Battling::CreatePokemon, WithHeldItem), asCALL_THISCALL));
+                                            asMETHODPR(PkmnLib::Battling::CreatePokemon, WithHeldItem,
+                                                       (const ArbUt::StringView&), PkmnLib::Battling::CreatePokemon&),
+                                            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod(
             "PokemonBuilder", "PokemonBuilder@ LearnMove(const constString&in move, MoveLearnMethod method)",
-            asMETHOD(PkmnLib::Battling::CreatePokemon, LearnMove), asCALL_THISCALL));
+            asMETHODPR(PkmnLib::Battling::CreatePokemon, LearnMove,
+                       (const ArbUt::StringView&, CreatureLib::Battling::AttackLearnMethod),
+                       PkmnLib::Battling::CreatePokemon&),
+            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod(
             "PokemonBuilder",
             "PokemonBuilder@ WithIndividualValues(uint8 hp,uint8 att,uint8 def,uint8 spa,uint8 spd,uint8 speed)",
-            asMETHOD(PkmnLib::Battling::CreatePokemon, WithIndividualValues), asCALL_THISCALL));
+            asMETHODPR(PkmnLib::Battling::CreatePokemon, WithIndividualValues, (u8, u8, u8, u8, u8, u8),
+                       PkmnLib::Battling::CreatePokemon&),
+            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod(
             "PokemonBuilder",
             "PokemonBuilder@ WithEffortValues(uint8 hp,uint8 att,uint8 def,uint8 spa,uint8 spd,uint8 speed)",
-            asMETHOD(PkmnLib::Battling::CreatePokemon, WithEffortValues), asCALL_THISCALL));
+            asMETHODPR(PkmnLib::Battling::CreatePokemon, WithEffortValues, (u8, u8, u8, u8, u8, u8),
+                       PkmnLib::Battling::CreatePokemon&),
+            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod("PokemonBuilder", "PokemonBuilder@ WithNature(const constString&in nature)",
-                                            asMETHOD(PkmnLib::Battling::CreatePokemon, WithNature), asCALL_THISCALL));
+                                            asMETHODPR(PkmnLib::Battling::CreatePokemon, WithNature,
+                                                       (const ArbUt::StringView&), PkmnLib::Battling::CreatePokemon&),
+                                            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod("PokemonBuilder", "PokemonBuilder@ WithNickname(const string&in name)",
-                                            asMETHOD(PkmnLib::Battling::CreatePokemon, WithNickname), asCALL_THISCALL));
+                                            asMETHODPR(PkmnLib::Battling::CreatePokemon, WithNickname,
+                                                       (const std::string&), PkmnLib::Battling::CreatePokemon&),
+                                            asCALL_THISCALL));
         Ensure(engine->RegisterObjectMethod("PokemonBuilder", "Pokemon@ Build(uint seed = 0)", asFUNCTION(BuildWrapper),
                                             asCALL_CDECL_OBJFIRST));
     }