Merge pull request #1717 from mrgriffin/trainer-party-macro

Macros for keeping .partyFlags, .partySize, and .party in sync
This commit is contained in:
GriffinR authored and GitHub committed 2022-08-02 13:11:43 -04:00
commit 99a37b5aa5
2 files changed
+859 -2562

No files matched your search

+5
View File
@@ -57,6 +57,11 @@ struct TrainerMonItemCustomMoves
u16 moves[MAX_MON_MOVES]; u16 moves[MAX_MON_MOVES];
}; };
#define NO_ITEM_DEFAULT_MOVES(party) { .NoItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = 0
#define NO_ITEM_CUSTOM_MOVES(party) { .NoItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET
#define ITEM_DEFAULT_MOVES(party) { .ItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_HELD_ITEM
#define ITEM_CUSTOM_MOVES(party) { .ItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM
union TrainerMonPtr union TrainerMonPtr
{ {
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
+854 -2562
View File
File diff suppressed because it is too large. Load diff