From 3de1f79307eda8de1232dfb612097cef261d0431 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 16:08:12 -0600 Subject: add more to moves header --- include/moves.h | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'include/moves.h') diff --git a/include/moves.h b/include/moves.h index 22f7ba6..4507593 100644 --- a/include/moves.h +++ b/include/moves.h @@ -2,18 +2,30 @@ #define GUARD_MOVES_H #include "constants/move.h" +#include "constants/move_id.h" -// 0x92A88 +void LoadWazaParameters(void); +u8 sub_809287C(struct PokemonMove *move); void InitPokemonMove(struct PokemonMove *move, u16 moveID); -// 0x92AE0 +void sub_8092AA8(struct PokemonMove *move, u16 moveID); +void InitZeroedPPPokemonMove(struct PokemonMove *move, u16 moveID); s16 GetMoveTargetingFlags(struct PokemonMove *move, u32 isAI); u8 GetMoveType(struct PokemonMove *move); -// 0x92B90 u8 GetMoveWeight(struct PokemonMove *move); +u8 GetMoveHitCount(struct PokemonMove *move); s32 GetMovePower(struct PokemonMove *move); -// 0x92BF4 +u8 GetMoveAccuracy(struct PokemonMove *move, u32 r1); u32 GetMoveMaxPP(struct PokemonMove *move); -// 0x92C54 -bool8 MoveDealsDirectDamage(struct PokemonMove *move); +u8 GetMoveUnk12(struct PokemonMove *move); +u8 GetMoveCriticalHitChance(struct PokemonMove *move); +u8 GetMoveCannotHitFrozen(struct PokemonMove *move); +u8 GetMoveDealsDirectDamage(struct PokemonMove *move); +u32 GetMoveRangeType(struct PokemonMove *move); +void sub_8092C84(u8 *buffer, u16 moveID); +u8 *GetMoveUseText(u16 moveID); +u8 GetMoveAffectedByMagicCoat(u16 moveID); +u8 GetMoveTargetsUser(u16 moveID); +u8 GetMoveAffectedByMuzzled(u16 moveID); +bool8 IsBlockedBySoundproof(struct PokemonMove *move); -#endif +#endif // GUARD_MOVES_H -- cgit v1.2.3 From ee5fb3584d800ea302720e1676080132f37636b6 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 18:38:49 -0600 Subject: move data from data to wonder_mail --- include/moves.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/moves.h') diff --git a/include/moves.h b/include/moves.h index 4507593..ccf4953 100644 --- a/include/moves.h +++ b/include/moves.h @@ -27,5 +27,6 @@ u8 GetMoveAffectedByMagicCoat(u16 moveID); u8 GetMoveTargetsUser(u16 moveID); u8 GetMoveAffectedByMuzzled(u16 moveID); bool8 IsBlockedBySoundproof(struct PokemonMove *move); +bool8 DoesMoveCharge(u16 move); #endif // GUARD_MOVES_H -- cgit v1.2.3 From 8e0ba3615a545c774b691e47b6581f6c7e6c13fb Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 28 Jan 2022 17:37:55 -0600 Subject: few more decomped funcs --- include/moves.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/moves.h') diff --git a/include/moves.h b/include/moves.h index ccf4953..a5db8d0 100644 --- a/include/moves.h +++ b/include/moves.h @@ -19,7 +19,7 @@ u32 GetMoveMaxPP(struct PokemonMove *move); u8 GetMoveUnk12(struct PokemonMove *move); u8 GetMoveCriticalHitChance(struct PokemonMove *move); u8 GetMoveCannotHitFrozen(struct PokemonMove *move); -u8 GetMoveDealsDirectDamage(struct PokemonMove *move); +u8 MoveDealsDirectDamage(struct PokemonMove *move); u32 GetMoveRangeType(struct PokemonMove *move); void sub_8092C84(u8 *buffer, u16 moveID); u8 *GetMoveUseText(u16 moveID); -- cgit v1.2.3