Finish the A moves

Scripts/Interfaces/Battle.astypedef

@@ -2,6 +2,7 @@ type Battle {
     const BattleLibrary@ Library { get const; };
     bool CanFlee { get const; };
     uint CurrentTurn { get const; };
+    uint8 PokemonPerSide { get const; };
     BattleRandom@ Random { get const; };
     ChoiceQueue@ TurnQueue { get const; };
     narray<BattleSide>@ Sides { get const; };
@@ -9,6 +10,7 @@ type Battle {
     BattleHistory@ History { get const; };
     bool CanUse(BaseTurnChoice@ choice);
     ref@ AddVolatile(const constString &in name);
+    ref@ GetVolatile(const constString &in name);
     void RemoveVolatile(const constString &in name) const;
     void SetWeather(const constString &in name) const;
     void ClearWeather(const constString &in name) const;
@@ -16,4 +18,5 @@ type Battle {
     BattleSide@ GetBattleSide(uint8 index);
     BattleParty@ GetParty(uint8 index);
     BattleParty@ FindPartyForPokemon(Pokemon@ pokemon);
+    bool HasVolatile(const constString &in name) const;
 }

Scripts/Interfaces/BattleSide.astypedef

@@ -1,6 +1,13 @@
 type BattleSide {
     bool SwapPositions(uint8 a, uint8 b);
     uint8 SideIndex { get const; };
+    bool IsDefeated { get const; };
+    bool HasFled { get const; };
+    Battle@ Battle { get const; };
     uint8 GetPokemonIndex(const Pokemon@ pokemon) const;
     Pokemon@ GetPokemon(uint8 index) const;
+    ref@ AddVolatile(const constString &in name);
+    ref@ GetVolatile(const constString &in name);
+    void RemoveVolatile(const constString &in name) const;
+    bool HasVolatile(const constString &in name) const;
 }

Scripts/Interfaces/HistoryElement.astypedef

@@ -1,4 +1,7 @@
 type HistoryElement {
+    const HistoryElement@ Previous { get const; };
+    HistoryElementKind Kind { get const; };
+    uint TurnNumber { get const; };
     const DamageHistory@ opCast() const;
     const AttackUseHistory@ opCast() const;
 }

Scripts/Interfaces/PkmnScript.as

@@ -1,4 +1,7 @@
 shared abstract class PkmnScript {
+	ref@ __owner;
+
+	ref@& GetOwner(){ return __owner; };
 	void OnInitialize(const narray<EffectParameter@>@){};
 	void Stack(){};
 	void OnRemove(){};
@@ -27,13 +30,14 @@ shared abstract class PkmnScript {
 	void ModifyStatModifier(ExecutingMove@, Pokemon@, uint8, float &inout){};
 	void ModifyDamageModifier(ExecutingMove@, Pokemon@, uint8, float &inout){};
 	void OverrideDamage(ExecutingMove@, Pokemon@, uint8, uint &inout){};
+	void OverrideIncomingDamage(ExecutingMove@, Pokemon@, uint8, uint &inout){};
 	void ChangePriority(MoveTurnChoice@, int8 &inout){};
 	void OnFail(Pokemon@){};
 	void OnOpponentFail(Pokemon@){};
 	void PreventRunAway(FleeTurnChoice@, bool &inout){};
 	void PreventOpponentRunAway(FleeTurnChoice@, bool &inout){};
 	void PreventOpponentSwitch(SwitchTurnChoice@, bool &inout){};
-	void OnEndTurn(Pokemon@){};
+	void OnEndTurn(){};
 	void ModifyCriticalStage(ExecutingMove@, Pokemon@, uint8, uint8 &inout){};
 	void OverrideCriticalModifier(ExecutingMove@, Pokemon@, uint8, float &inout){};
 	void OverrideSTABModifier(ExecutingMove@, Pokemon@, uint8, float &inout){};

Scripts/Interfaces/Pokemon.astypedef

@@ -17,6 +17,8 @@ type Pokemon {
     BattleSide@ BattleSide { get const; };
     const constString& Status { get const; };
     const narray<LearnedMove@>@ Moves { get const; };
+    float Weight { get const; set; };
+    float Height { get const; set; };
     bool HasHeldItem(const constString &in name) const;
     void SetHeldItem(const constString &in name);
     void SetHeldItem(const Item@ item);

Scripts/Interfaces/narray.astypedef

@@ -1,5 +1,5 @@
 type narray<T> {
     uint64 Length { get const; };
     const T@ At(uint64 index) const;
-    const T@ opIndex(uint64) const;
+    const T@ get_opIndex(uint64) const property;
 }