mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-07 05:24:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

UnkFlagStuff cleanup

Browse Source
This commit is contained in:
lepelog
2023-08-10 11:32:03 +02:00
parent d7882c352e
commit d681c65480
5 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/unk_flag_stuff.cpp → src/toBeSorted/unk_flag_stuff.cpp
+14 -33
View File
@@ -1,25 +1,6 @@
#pragma once
#include <types.h>
struct UnkFlagDefinition {
u8 index;
u8 shiftMask;
};
class UnkFlagStuff {
u16 definitionsCount;
UnkFlagDefinition* definitions;
public:
u16 calculateMask(s32 shift);
void doNothing(u32 unused);
UnkFlagStuff(u16 count, UnkFlagDefinition* definitions);
void prepareIndexShiftMask(u16 counterIdx, u32 unused, u16* indexPtr, u8* shiftPtr, u16* maskPtr);
u16 maskForIdx(u16 index);
u32 getCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 param4);
void setCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 flagCount, u32 value);
u32 unk(u16 param1, u32 param2);
};
#include <toBeSorted/unk_flag_stuff.h>
u16 UnkFlagStuff::calculateMask(s32 shift) {
return (2 << (shift & 0xF)) - 1;
@@ -28,21 +9,21 @@ u16 UnkFlagStuff::calculateMask(s32 shift) {
void UnkFlagStuff::doNothing(u32 unused) {}
UnkFlagStuff::UnkFlagStuff(u16 count, UnkFlagDefinition* definitions) {
this->definitionsCount = count;
this->definitions = definitions;
this->mDefinitionsCount = count;
this->mpDefinitions = definitions;
}
void UnkFlagStuff::prepareIndexShiftMask(u16 counterIdx, u32 unused, u16* indexPtr, u8* shiftPtr, u16* maskPtr) {
doNothing(counterIdx);
*indexPtr = definitions[counterIdx].index;
*shiftPtr = definitions[counterIdx].shiftMask >> 4;
*maskPtr = calculateMask(definitions[counterIdx].shiftMask);
*indexPtr = mpDefinitions[counterIdx].mIndex;
*shiftPtr = mpDefinitions[counterIdx].mShiftMask >> 4;
*maskPtr = calculateMask(mpDefinitions[counterIdx].mShiftMask);
}
u16 UnkFlagStuff::maskForIdx(u16 index) {
doNothing(index);
return calculateMask(definitions[index].shiftMask);
return calculateMask(mpDefinitions[index].mShiftMask);
}
u32 UnkFlagStuff::getCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 param4) {
@@ -62,21 +43,21 @@ void UnkFlagStuff::setCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 flagCount,
dataPtr[index] = (u16)(value << shift) | dataPtr[index];
}
inline bool check(int a, int b) {
inline bool isLessThan(int a, int b) {
return a <= b;
}
u32 UnkFlagStuff::unk(u16 param1, u32 param2) {
if (definitions == nullptr) {
u32 UnkFlagStuff::checkFlagValid(u16 counterIdx, u32 flagCount) {
if (mpDefinitions == nullptr) {
return 0;
}
if (definitionsCount <= param1 || definitions[param1].index == 0xFF) {
if (mDefinitionsCount <= counterIdx || mpDefinitions[counterIdx].mIndex == 0xFF) {
return 0;
} else {
if (!check(param2, definitions[param1].index)) {
return 1;
} else {
if (isLessThan(flagCount, mpDefinitions[counterIdx].mIndex)) {
return 0;
} else {
return 1;
}
}
}