From 91c0a142ccf4783c65aecdd75a4faed33edf3ed6 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 28 Feb 2022 20:57:06 -0500 Subject: Decomped HasLastUsedMove() --- include/constants/move.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include/constants/move.h') diff --git a/include/constants/move.h b/include/constants/move.h index 0601969..eb78219 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_MOVE_H #define GUARD_CONSTANTS_MOVE_H +#define STRUGGLE_MOVE_INDEX 4 + enum MoveFlags { MOVE_FLAG_EXISTS = 1 << 0, @@ -11,6 +13,13 @@ enum MoveFlags MOVE_FLAG_DISABLED = 1 << 5 // Disabled by an effect like Taunt. }; +enum MoveFlags2 +{ + MOVE_FLAG_SEALED = 1 << 0, + MOVE_FLAG_TEMPORARY = 1 << 3, // Used for moves copied by Mimic. + MOVE_FLAG_REPLACE = 1 << 5 // Used for moves copied by Sketch. +}; + enum AccuracyType { // Accuracy used for all moves. @@ -52,7 +61,7 @@ struct MoveData struct PokemonMove { u8 moveFlags; - bool8 sealed; + u8 moveFlags2; u16 moveID; u8 PP; u8 powerBoost; // How much the move is boosted by Ginsengs. -- cgit v1.2.3 From 70ce2c1642376305f26ad0eaebad26d7d3fe9ac9 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 28 Feb 2022 21:17:15 -0500 Subject: Decomped LastUsedMoveOutOfPP() --- include/constants/move.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/constants/move.h') diff --git a/include/constants/move.h b/include/constants/move.h index eb78219..e6f4e70 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -3,7 +3,7 @@ #define STRUGGLE_MOVE_INDEX 4 -enum MoveFlags +enum MoveFlag { MOVE_FLAG_EXISTS = 1 << 0, MOVE_FLAG_LINKED = 1 << 1, // This move is linked with the previous move in the Pokémon's moveset. @@ -13,7 +13,7 @@ enum MoveFlags MOVE_FLAG_DISABLED = 1 << 5 // Disabled by an effect like Taunt. }; -enum MoveFlags2 +enum MoveFlag2 { MOVE_FLAG_SEALED = 1 << 0, MOVE_FLAG_TEMPORARY = 1 << 3, // Used for moves copied by Mimic. -- cgit v1.2.3 From f50e233c9171d7bdd76c1c53dd96c85cd0a4d99f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 28 Feb 2022 21:23:19 -0500 Subject: Removed redundant struct fills --- include/constants/move.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/constants/move.h') diff --git a/include/constants/move.h b/include/constants/move.h index e6f4e70..e5de485 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -37,7 +37,6 @@ struct MoveData u8 *namePointer; /* 0x4 */ s16 power; u8 type; - u8 fill7; // Determines the range of moves. /* 0x8 */ u16 targetingFlags[2]; // 0 for player and 1 for AI // The AI consider certain moves to have different range than they actually do. -- cgit v1.2.3