VarsFlags cleanup

This commit is contained in:
Fexty12573
2024-06-05 19:42:41 +02:00
parent 5a90627ab5
commit d63eb47bf0
2 changed files with 6 additions and 13 deletions

View File

@@ -116,10 +116,7 @@ void sub_0203F19C(FieldSystem * fieldSystem, u16 param1);
void sub_0203F1B0(FieldSystem * fieldSystem, u16 param1);
void FieldSystem_ClearLocalFlags(FieldSystem * fieldSystem);
void sub_0203F1FC(FieldSystem * fieldSystem);
u16 Script_GetTrainerID(u16 param0);
BOOL sub_0203F278(u16 param0);
BOOL Script_IsTrainerDoubleBattle(u16 param0);
BOOL Script_IsTrainerDefeated(FieldSystem * fieldSystem, u16 param1);
void sub_0203F2BC(FieldSystem * fieldSystem, u16 param1);
void sub_0203F2D8(FieldSystem * fieldSystem, u16 param1);
u16 sub_0203F2F4(u16 param0);

View File

@@ -6,6 +6,9 @@
#include "savedata.h"
#include "unk_020507CC.h"
#define GET_FLAG_BIT(idx, size) (1 << (idx % size))
#define IS_FLAG_ON(chunk, idx) (*chunk & GET_FLAG_BIT(idx, 8 * sizeof(*chunk)))
typedef struct UnkStruct_020507E4_t {
u16 unk_00[288];
u8 unk_240[364];
@@ -28,17 +31,10 @@ VarsFlags * SaveData_GetVarsFlags (SaveData * saveData)
return (VarsFlags *)SaveData_SaveTable(saveData, 4);
}
BOOL VarsFlags_IsFlagOn (VarsFlags * param0, u16 flag)
BOOL VarsFlags_IsFlagOn(VarsFlags * varflags, u16 flag)
{
u8 * v0 = sub_02050870(param0, flag);
if (v0 != NULL) {
if (*v0 & (1 << (flag % 8))) {
return TRUE;
}
}
return FALSE;
u8 *chunk = sub_02050870(varflags, flag);
return chunk != NULL && IS_FLAG_ON(chunk, flag);
}
void sub_0205081C (VarsFlags * param0, u16 param1)