Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-24 01:35:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #307 from DizzyEggg/mon_flags
Some checks failed
GithubCI / build (push) Has been cancelled
Details

Browse Source 
Make pokemon flag static inlines more readable
This commit is contained in:
Seth Barberee
2024-12-20 08:22:42 -08:00
committed by GitHub
parent 534e604c2a 4fe9f5d061
commit 3bed5dacd3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/pokemon.h
View File

@@ -12,8 +12,8 @@
enum PokemonUnk0Flags
{
FLAG_NONE = 0,
FLAG_UNK_1 = 1,
FLAG_ON_TEAM = 2, // Mon is not on "standby"
FLAG_UNK_1 = 1 << 0,
FLAG_ON_TEAM = 1 << 1, // Mon is not on "standby"
};
// size: 0x1A4
@@ -108,22 +108,22 @@ bool8 sub_808DA44(s32, u32);
static inline bool8 PokemonFlag1(PokemonStruct1 *mon)
{
return (mon->unk0 >> (FLAG_UNK_1 - 1)) & 1;
return (mon->unk0 & FLAG_UNK_1) != 0;
}
static inline bool8 PokemonFlag1Struct2(PokemonStruct2 *mon)
{
return (mon->unk0 >> (FLAG_UNK_1 - 1)) & 1;
return (mon->unk0 & FLAG_UNK_1) != 0;
}
static inline bool8 PokemonFlag2(PokemonStruct1 *mon)
{
return (mon->unk0 >> (FLAG_ON_TEAM - 1)) & 1;
return (mon->unk0 & FLAG_ON_TEAM) != 0;
}
static inline bool8 PokemonFlag2Struct2(PokemonStruct2 *mon)
{
return (mon->unk0 >> (FLAG_ON_TEAM - 1)) & 1;
return (mon->unk0 & FLAG_ON_TEAM) != 0;
}
static inline void SetPokemonFlag2(PokemonStruct1 *mon)