mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-07 19:11:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

OK, checkpoint

Browse Source
This commit is contained in:
robojumper
2024-10-25 12:08:24 +02:00
parent ceac3a6ef8
commit 5e73b2b902
9 changed files with 70 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/flag/flag_managers.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef D_FLAG_FLAG_MANAGERS_H
#define D_FLAG_FLAG_MANAGERS_H
#include "egg/core/eggHeap.h"
void setupFlagManagers(EGG::Heap *heap);
void copyAllFlagManagersFromSave();
void updateFlagForFlagIndex(u16 stage);
void commitAllFlagManagers();
bool checkedMemcpy(void *dest, u32 destLen, const void *src, u32 count);
#endif
include/toBeSorted/item_story_flag_manager.h
+13 -14
View File
@@ -24,7 +24,7 @@ public:
/** 0x28 */ virtual void setFlagOrCounterToValue(u16 flag, u16 value);
/** 0x2C */ virtual u16 getCounterOrFlag(u16 flag) const;
/** 0x30 */ virtual u16 getUncommittedValue(u16 flag);
/** 0x34 */ virtual void unk3(u16 arg);
/** 0x34 */ virtual u16 unk3(u16 arg);
/** 0x38 */ virtual const u16 *getSaveFlagSpace() const = 0;
@@ -33,10 +33,8 @@ public:
void copyFlagsFromSave_Priv();
void setupUnkFlagStuff(UnkFlagDefinition *def, u16 count);
void doCommit_Priv();
void thunk_setOrClearFlag(u16 flag, u16 value);
void setOrClearFlag(u16 flag, u16 value);
u16 getFlag(u16 flag) const;
u16 FUN_800bf600(u16 flag);
u16 getFlag(u16 flag) const;
void FUN_800bf610(u16 flag);
u16 FUN_800bf640(u16 flag);
void FUN_800bf690();
@@ -72,12 +70,7 @@ public:
u16 *flags = storyFlagsPtr->getFlagPtrUnchecked();
FileManager::sInstance->setStoryFlags(flags, 0, sz);
}
/** 0x20 */ virtual void setFlag(u16 flag) override;
/** 0x24 */ virtual void unsetFlag(u16 flag) override;
/** 0x28 */ virtual void setFlagOrCounterToValue(u16 flag, u16 value) override;
/** 0x2C */ virtual u16 getCounterOrFlag(u16 flag) const override;
/** 0x30 */ virtual u16 getUncommittedValue(u16 flag) override;
/** 0x34 */ virtual void unk3(u16 arg) override;
/** 0x38 */ virtual const u16 *getSaveFlagSpace() const override {
return FileManager::sInstance->getStoryFlagsConst();
};
@@ -108,26 +101,32 @@ public:
u16 *flags = storyFlagsPtr->getFlagPtrUnchecked();
FileManager::sInstance->setItemFlags(flags, 0, sz);
}
/** 0x20 */ virtual void setFlag(u16 flag);
/** 0x20 */ virtual void setFlag(u16 flag) {
ItemStoryManagerBase::setFlag(flag & ~0x4000);
}
/** 0x24 */ virtual void unsetFlag(u16 flag) {
ItemStoryManagerBase::unsetFlag(flag & ~0x4000);
}
/** 0x28 */ virtual void setFlagOrCounterToValue(u16 flag, u16 value) {
ItemStoryManagerBase::thunk_setOrClearFlag(flag & ~0x4000, value);
ItemStoryManagerBase::setFlagOrCounterToValue(flag & ~0x4000, value);
}
/** 0x2C */ virtual u16 getCounterOrFlag(u16 flag) const {
return getFlag(flag & ~0x4000);
return ItemStoryManagerBase::getCounterOrFlag(flag & ~0x4000);
}
/** 0x30 */ virtual u16 getUncommittedValue(u16 flag) {
return ItemStoryManagerBase::getUncommittedValue(flag & ~0x4000);
}
/** 0x34 */ virtual void unk3(u16 arg) {
FUN_800bf600(arg & ~0x4000);
/** 0x34 */ virtual u16 unk3(u16 arg) {
return ItemStoryManagerBase::unk3(arg & ~0x4000);
}
/** 0x38 */ virtual const u16 *getSaveFlagSpace() const {
return FileManager::sInstance->getItemFlagsConst();
};
u16 getFlagDirect(u16 flag) {
return ItemStoryManagerBase::getCounterOrFlag(flag);
}
public:
static ItemflagManager *sInstance;
static u16 sFlags[0x40];