Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix style of some bit definitions #4319

Merged
merged 1 commit into from
Mar 29, 2024
Merged

Fix style of some bit definitions #4319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions include/data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ struct TrainerMon
u8 lvl;
u8 ball;
u8 friendship;
u8 nature : 5;
bool8 gender : 2;
bool8 isShiny : 1;
u8 dynamaxLevel : 4;
bool8 gigantamaxFactor : 1;
bool8 shouldDynamax : 1;
bool8 shouldTerastal : 1;
u8 nature:5;
bool8 gender:2;
bool8 isShiny:1;
u8 dynamaxLevel:4;
bool8 gigantamaxFactor:1;
bool8 shouldDynamax:1;
bool8 shouldTerastal:1;
};

#define TRAINER_PARTY(partyArray) partyArray, .partySize = ARRAY_COUNT(partyArray)
Expand Down
4 changes: 2 additions & 2 deletions include/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@ struct SpeciesInfo /*0x8C*/
/* 0x38 */ u16 trainerScale;
/* 0x3A */ u16 trainerOffset;
/* 0x3C */ const u8 *description;
/* 0x40 */ u8 bodyColor : 7;
/* 0x40 */ u8 bodyColor:7;
// Graphical Data
u8 noFlip : 1;
u8 noFlip:1;
/* 0x41 */ u8 frontAnimDelay;
/* 0x42 */ u8 frontAnimId;
/* 0x43 */ u8 backAnimId;
Expand Down
Loading