mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-14 06:14:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Flag capitalization

Browse Source
This commit is contained in:
robojumper
2024-10-25 15:36:39 +02:00
parent 1ffae07e7a
commit 8d798be120
7 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+32 -32
View File
@@ -4103,25 +4103,25 @@ unsetSceneflagGlobal__16SceneflagManagerFUsUs = .text:0x800BE500; // type:functi
unsetTempOrSceneflag__16SceneflagManagerFUs = .text:0x800BE5E0; // type:function size:0x100
commit__16SceneflagManagerFv = .text:0x800BE6E0; // type:function size:0xC8
commit__22CommittableFlagManagerFv = .text:0x800BE7B0; // type:function size:0x58
doCommit__15TBoxFlagManagerFv = .text:0x800BE810; // type:function size:0x58
checkUncommittedFlag__15TBoxFlagManagerFUs = .text:0x800BE870; // type:function size:0x68
__ct__15TBoxFlagManagerFv = .text:0x800BE8E0; // type:function size:0x40
init__15TBoxFlagManagerFv = .text:0x800BE920; // type:function size:0x4
copyFromSave__15TBoxFlagManagerFUl = .text:0x800BE930; // type:function size:0x5C
checkFlag__15TBoxFlagManagerFUsUs = .text:0x800BE990; // type:function size:0x94
getFlagCount__15TBoxFlagManagerCFv = .text:0x800BEA30; // type:function size:0x8
setFlag__15TBoxFlagManagerFUs = .text:0x800BEA40; // type:function size:0x80
clearSavedFlags__18EnemyDefeatManagerFv = .text:0x800BEAC0; // type:function size:0x40
checkUncommittedFlag__18EnemyDefeatManagerFUs = .text:0x800BEB00; // type:function size:0x7C
__ct__18EnemyDefeatManagerFv = .text:0x800BEB80; // type:function size:0x38
init__18EnemyDefeatManagerFv = .text:0x800BEBC0; // type:function size:0xC
copyFromSave__18EnemyDefeatManagerFUs = .text:0x800BEBD0; // type:function size:0x54
updateFlagIndex__18EnemyDefeatManagerFUs = .text:0x800BEC30; // type:function size:0x18
clearAll__18EnemyDefeatManagerFv = .text:0x800BEC50; // type:function size:0x34
checkIsValidFlag__18EnemyDefeatManagerFUs = .text:0x800BEC90; // type:function size:0x18
checkFlag__18EnemyDefeatManagerFUs = .text:0x800BECB0; // type:function size:0xA0
getFlagCount__18EnemyDefeatManagerCFv = .text:0x800BED50; // type:function size:0x8
setFlag__18EnemyDefeatManagerFUs = .text:0x800BED60; // type:function size:0x94
doCommit__15TBoxflagManagerFv = .text:0x800BE810; // type:function size:0x58
checkUncommittedFlag__15TBoxflagManagerFUs = .text:0x800BE870; // type:function size:0x68
__ct__15TBoxflagManagerFv = .text:0x800BE8E0; // type:function size:0x40
init__15TBoxflagManagerFv = .text:0x800BE920; // type:function size:0x4
copyFromSave__15TBoxflagManagerFUl = .text:0x800BE930; // type:function size:0x5C
checkFlag__15TBoxflagManagerFUsUs = .text:0x800BE990; // type:function size:0x94
getFlagCount__15TBoxflagManagerCFv = .text:0x800BEA30; // type:function size:0x8
setFlag__15TBoxflagManagerFUs = .text:0x800BEA40; // type:function size:0x80
clearSavedFlags__16EnemyflagManagerFv = .text:0x800BEAC0; // type:function size:0x40
checkUncommittedFlag__16EnemyflagManagerFUs = .text:0x800BEB00; // type:function size:0x7C
__ct__16EnemyflagManagerFv = .text:0x800BEB80; // type:function size:0x38
init__16EnemyflagManagerFv = .text:0x800BEBC0; // type:function size:0xC
copyFromSave__16EnemyflagManagerFUs = .text:0x800BEBD0; // type:function size:0x54
updateFlagIndex__16EnemyflagManagerFUs = .text:0x800BEC30; // type:function size:0x18
clearAll__16EnemyflagManagerFv = .text:0x800BEC50; // type:function size:0x34
checkIsValidFlag__16EnemyflagManagerFUs = .text:0x800BEC90; // type:function size:0x18
checkFlag__16EnemyflagManagerFUs = .text:0x800BECB0; // type:function size:0xA0
getFlagCount__16EnemyflagManagerCFv = .text:0x800BED50; // type:function size:0x8
setFlag__16EnemyflagManagerFUs = .text:0x800BED60; // type:function size:0x94
getFlagPtrChecked__9FlagSpaceCFv = .text:0x800BEE00; // type:function size:0x3C
getFlagPtrUnchecked__9FlagSpaceCFv = .text:0x800BEE40; // type:function size:0x8
unsetAll__9FlagSpaceFv = .text:0x800BEE50; // type:function size:0xC
@@ -4190,8 +4190,8 @@ setFlag__15SkipflagManagerFUs = .text:0x800BFC50; // type:function size:0xD0
checkFlag__15SkipflagManagerFUs = .text:0x800BFD20; // type:function size:0x68
commit__15SkipflagManagerFv = .text:0x800BFD90; // type:function size:0x70
setupFlagManagers__FPQ23EGG4Heap = .text:0x800BFE00; // type:function size:0x294
__dt__15TBoxFlagManagerFv = .text:0x800C00A0; // type:function size:0x40
__dt__18EnemyDefeatManagerFv = .text:0x800C00E0; // type:function size:0x40
__dt__15TBoxflagManagerFv = .text:0x800C00A0; // type:function size:0x40
__dt__16EnemyflagManagerFv = .text:0x800C00E0; // type:function size:0x40
__dt__16StoryflagManagerFv = .text:0x800C0120; // type:function size:0x58
__dt__15ItemflagManagerFv = .text:0x800C0180; // type:function size:0x58
postSetup__Fv = .text:0x800C01E0; // type:function size:0x8
@@ -4210,11 +4210,11 @@ initFlagSpace__15ItemflagManagerFv = .text:0x800C0440; // type:function size:0xC
getSaveFlagSpace__16StoryflagManagerCFv = .text:0x800C0450; // type:function size:0x8
doCommit__16StoryflagManagerFv = .text:0x800C0460; // type:function size:0x44
initFlagSpace__16StoryflagManagerFv = .text:0x800C04B0; // type:function size:0xC
doCommit__18EnemyDefeatManagerFv = .text:0x800C04C0; // type:function size:0x44
doCommit__16EnemyflagManagerFv = .text:0x800C04C0; // type:function size:0x44
__dt__32MyFlagManager<15ItemflagManager>Fv = .text:0x800C0510; // type:function size:0x5C
__dt__33MyFlagManager<16StoryflagManager>Fv = .text:0x800C0570; // type:function size:0x5C
__dt__35MyFlagManager<18EnemyDefeatManager>Fv = .text:0x800C05D0; // type:function size:0x40
__dt__32MyFlagManager<15TBoxFlagManager>Fv = .text:0x800C0610; // type:function size:0x40
__dt__35MyFlagManager<16EnemyflagManager>Fv = .text:0x800C05D0; // type:function size:0x40
__dt__32MyFlagManager<15TBoxflagManager>Fv = .text:0x800C0610; // type:function size:0x40
fn_800C0650 = .text:0x800C0650; // type:function size:0x3C
fn_800C0690 = .text:0x800C0690; // type:function size:0x70
fn_800C0700 = .text:0x800C0700; // type:function size:0x7C
@@ -31010,13 +31010,13 @@ lbl_80510B60 = .data:0x80510B60; // type:object size:0x10
lbl_80510B70 = .data:0x80510B70; // type:object size:0x18
__vt__32MyFlagManager<15ItemflagManager> = .data:0x80510B88; // type:object size:0x3C
__vt__33MyFlagManager<16StoryflagManager> = .data:0x80510BC4; // type:object size:0x3C
__vt__35MyFlagManager<18EnemyDefeatManager> = .data:0x80510C00; // type:object size:0x14
__vt__32MyFlagManager<15TBoxFlagManager> = .data:0x80510C14; // type:object size:0x14
__vt__35MyFlagManager<16EnemyflagManager> = .data:0x80510C00; // type:object size:0x14
__vt__32MyFlagManager<15TBoxflagManager> = .data:0x80510C14; // type:object size:0x14
__vt__15ItemflagManager = .data:0x80510C28; // type:object size:0x3C
__vt__16StoryflagManager = .data:0x80510C64; // type:object size:0x3C
__vt__20ItemStoryManagerBase = .data:0x80510CA0; // type:object size:0x3C
__vt__18EnemyDefeatManager = .data:0x80510CDC; // type:object size:0x14
__vt__15TBoxFlagManager = .data:0x80510CF0; // type:object size:0x14
__vt__16EnemyflagManager = .data:0x80510CDC; // type:object size:0x14
__vt__15TBoxflagManager = .data:0x80510CF0; // type:object size:0x14
__vt__9FlagSpace = .data:0x80510D04; // type:object size:0xC
lbl_80510D10 = .data:0x80510D10; // type:object size:0x38 data:4byte
lbl_80510D48 = .data:0x80510D48; // type:object size:0x18
@@ -39942,9 +39942,9 @@ NAND_REQUEST_THREAD = .sbss:0x805753D0; // type:object size:0x8 data:4byte
lbl_805753D8 = .sbss:0x805753D8; // type:object size:0x8 data:4byte
sInstance__16SceneflagManager = .sbss:0x805753E0; // type:object size:0x4 data:4byte
sTempFlags__16SceneflagManager = .sbss:0x805753E8; // type:object size:0x8
sInstance__15TBoxFlagManager = .sbss:0x805753F0; // type:object size:0x4 data:4byte
sTBoxFlags__15TBoxFlagManager = .sbss:0x805753F4; // type:object size:0x4
sInstance__18EnemyDefeatManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte
sInstance__15TBoxflagManager = .sbss:0x805753F0; // type:object size:0x4 data:4byte
sTBoxFlags__15TBoxflagManager = .sbss:0x805753F4; // type:object size:0x4
sInstance__16EnemyflagManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte
sInstance__16StoryflagManager = .sbss:0x805753FC; // type:object size:0x4 data:4byte
sInstance__15ItemflagManager = .sbss:0x80575400; // type:object size:0x4 data:4byte
sInstance__18DungeonflagManager = .sbss:0x80575404; // type:object size:0x4 data:4byte
@@ -48332,7 +48332,7 @@ lbl_805A78B8 = .bss:0x805A78B8; // type:object size:0xC
TIMESHIFT_STONE_REFS = .bss:0x805A78C4; // type:object size:0xC data:4byte
sSceneFlags__16SceneflagManager = .bss:0x805A78D0; // type:object size:0x10
sZoneFlags__16SceneflagManager = .bss:0x805A78E0; // type:object size:0x1F8
sEnemyDefeatFlags__18EnemyDefeatManager = .bss:0x805A7AD8; // type:object size:0x2000
sEnemyDefeatFlags__16EnemyflagManager = .bss:0x805A7AD8; // type:object size:0x2000
sFlags__16StoryflagManager = .bss:0x805A9AD8; // type:object size:0x100
sFlags__15ItemflagManager = .bss:0x805A9BD8; // type:object size:0x80
sDungeonFlags__18DungeonflagManager = .bss:0x805A9C58; // type:object size:0x10
include/d/flag/enemyflag_manager.h
+4 -4
View File
@@ -6,7 +6,7 @@
#include "d/flag/flag_space.h"
#include "toBeSorted/file_manager.h"
class EnemyDefeatManager : public CommittableFlagManager {
class EnemyflagManager : public CommittableFlagManager {
public:
FlagSpace mFlagSpace;
BitwiseFlagHelper mFlagHelper;
@@ -14,21 +14,21 @@ public:
static u16 sEnemyDefeatFlags[4096];
static EnemyDefeatManager *sInstance;
static EnemyflagManager *sInstance;
void clearSavedFlags();
bool checkUncommittedFlag(u16 flag);
u16 checkUncommittedFlag2(u16 flag) {
return checkUncommittedFlag(flag);
}
EnemyDefeatManager();
EnemyflagManager();
void init();
void copyFromSave(u16 sceneIndex);
void updateFlagIndex(u16 sceneIndex);
void clearAll();
bool checkIsValidFlag(u16 flag);
bool checkFlag(u16 flag);
virtual ~EnemyDefeatManager() {}
virtual ~EnemyflagManager() {}
virtual u16 getFlagCount() const;
void setFlag(u16 flag);
include/d/flag/tboxflag_manager.h
+4 -4
View File
@@ -5,7 +5,7 @@
#include "d/flag/committable_flag_manager.h"
#include "d/flag/flag_space.h"
class TBoxFlagManager : public CommittableFlagManager {
class TBoxflagManager : public CommittableFlagManager {
public:
FlagSpace mFlagSpace;
u16 mSceneIndex;
@@ -13,12 +13,12 @@ public:
static u16 sTBoxFlags[2];
static TBoxFlagManager *sInstance;
static TBoxflagManager *sInstance;
virtual void doCommit() override;
bool checkUncommittedFlag(u16 flag);
TBoxFlagManager();
virtual ~TBoxFlagManager() {}
TBoxflagManager();
virtual ~TBoxflagManager() {}
void init();
void copyFromSave(u32 sceneIndex);
bool checkFlag(u16 sceneIndex, u16 flag);
src/d/a/d_a_base.cpp
+1 -1
View File
@@ -476,7 +476,7 @@ void dAcBase_c::setActorRef(dAcBase_c *ref) {
// May not be only purpose
void dAcBase_c::setEnemyDefeatFlag() {
EnemyDefeatManager::sInstance->setFlag(obj_id);
EnemyflagManager::sInstance->setFlag(obj_id);
}
// 8002d940
src/d/flag/enemyflag_manager.inc
+13 -13
View File
@@ -1,17 +1,17 @@
#include "d/flag/enemyflag_manager.h"
EnemyDefeatManager *EnemyDefeatManager::sInstance = nullptr;
u16 EnemyDefeatManager::sEnemyDefeatFlags[4096] = {};
EnemyflagManager *EnemyflagManager::sInstance = nullptr;
u16 EnemyflagManager::sEnemyDefeatFlags[4096] = {};
/* 0x800BEAC0 */
void EnemyDefeatManager::clearSavedFlags() {
void EnemyflagManager::clearSavedFlags() {
u16 empty[0x1000];
memset(empty, 0, 0x2000);
FileManager::getInstance()->setEnemyDefeatFlags(empty, 0, 0x1000);
}
/* 0x800BEB00 */
bool EnemyDefeatManager::checkUncommittedFlag(u16 flag) {
bool EnemyflagManager::checkUncommittedFlag(u16 flag) {
if (checkIsValidFlag(flag)) {
return mFlagHelper.checkFlag(flag / 16, flag % 16, mFlagSpace.getFlagPtrUnchecked(), mFlagSpace.mCount);
} else {
@@ -20,17 +20,17 @@ bool EnemyDefeatManager::checkUncommittedFlag(u16 flag) {
}
/* 0x800BEB80 */
EnemyDefeatManager::EnemyDefeatManager()
EnemyflagManager::EnemyflagManager()
: CommittableFlagManager(false), mFlagSpace(sEnemyDefeatFlags, ARRAY_LENGTH(sEnemyDefeatFlags)) {}
/* 0x800BEBC0 */
void EnemyDefeatManager::init() {
void EnemyflagManager::init() {
mSceneIndex = 0;
clearAll();
}
/* 0x800BEBD0 */
void EnemyDefeatManager::copyFromSave(u16 sceneIndex) {
void EnemyflagManager::copyFromSave(u16 sceneIndex) {
mSceneIndex = sceneIndex;
u16 count = mFlagSpace.mCount;
u16 *flags = FileManager::getInstance()->getEnemyDefeatFlagsConst();
@@ -38,7 +38,7 @@ void EnemyDefeatManager::copyFromSave(u16 sceneIndex) {
}
/* 0x800BEC30 */
void EnemyDefeatManager::updateFlagIndex(u16 sceneIndex) {
void EnemyflagManager::updateFlagIndex(u16 sceneIndex) {
if (mSceneIndex == sceneIndex) {
return;
}
@@ -47,18 +47,18 @@ void EnemyDefeatManager::updateFlagIndex(u16 sceneIndex) {
}
/* 0x800BEC50 */
void EnemyDefeatManager::clearAll() {
void EnemyflagManager::clearAll() {
clearSavedFlags();
mFlagSpace.unsetAll();
}
/* 0x800BEC90 */
bool EnemyDefeatManager::checkIsValidFlag(u16 flag) {
bool EnemyflagManager::checkIsValidFlag(u16 flag) {
return flag < 0xFFFF;
}
/* 0x800BECB0 */
bool EnemyDefeatManager::checkFlag(u16 flag) {
bool EnemyflagManager::checkFlag(u16 flag) {
if (!checkIsValidFlag(flag)) {
return false;
} else {
@@ -68,12 +68,12 @@ bool EnemyDefeatManager::checkFlag(u16 flag) {
}
/* 0x800BED50 */
u16 EnemyDefeatManager::getFlagCount() const {
u16 EnemyflagManager::getFlagCount() const {
return 0x1000;
}
/* 0x800BED60 */
void EnemyDefeatManager::setFlag(u16 flag) {
void EnemyflagManager::setFlag(u16 flag) {
if (checkUncommittedFlag2(flag) != 1 && checkIsValidFlag(flag)) {
mFlagHelper.setFlag(flag / 16, flag % 16, mFlagSpace.getFlagPtrChecked(), mFlagSpace.mCount);
setNeedsCommit(true);
src/d/flag/flag_managers.cpp
+12 -12
View File
@@ -44,16 +44,16 @@ void setupFlagManagers(EGG::Heap *heap) {
SceneflagManager::sInstance->init();
}
if (TBoxFlagManager::sInstance == nullptr) {
TBoxFlagManager::sInstance = new (heap) MyFlagManager<TBoxFlagManager>();
if (TBoxflagManager::sInstance == nullptr) {
TBoxflagManager::sInstance = new (heap) MyFlagManager<TBoxflagManager>();
mHeap m(heap);
TBoxFlagManager::sInstance->init();
TBoxflagManager::sInstance->init();
}
if (EnemyDefeatManager::sInstance == nullptr) {
EnemyDefeatManager::sInstance = new (heap) MyFlagManager<EnemyDefeatManager>();
if (EnemyflagManager::sInstance == nullptr) {
EnemyflagManager::sInstance = new (heap) MyFlagManager<EnemyflagManager>();
mHeap m(heap);
EnemyDefeatManager::sInstance->init();
EnemyflagManager::sInstance->init();
}
if (StoryflagManager::sInstance == nullptr) {
@@ -90,18 +90,18 @@ static void postSetup() {
void copyAllFlagManagersFromSave() {
u16 flag = FileManager::sInstance->getSceneFlagIndex();
SceneflagManager::sInstance->copyFromSave(flag);
TBoxFlagManager::sInstance->copyFromSave(flag);
TBoxflagManager::sInstance->copyFromSave(flag);
StoryflagManager::sInstance->copyFromSave();
ItemflagManager::sInstance->copyFromSave();
DungeonflagManager::sInstance->copyFromSave(flag);
SkipflagManager::sInstance->copyFromSave();
EnemyDefeatManager::sInstance->copyFromSave(flag);
EnemyflagManager::sInstance->copyFromSave(flag);
}
void updateFlagForFlagIndex(u16 stage) {
SceneflagManager::sInstance->updateFlagindex(stage);
TBoxFlagManager::sInstance->copyFromSave(stage);
EnemyDefeatManager::sInstance->updateFlagIndex(stage);
TBoxflagManager::sInstance->copyFromSave(stage);
EnemyflagManager::sInstance->updateFlagIndex(stage);
DungeonflagManager::sInstance->copyFromSave(stage);
}
@@ -111,8 +111,8 @@ void commitAllFlagManagers() {
DungeonflagManager::sInstance->commit();
SkipflagManager::sInstance->commit();
SceneflagManager::sInstance->commit();
TBoxFlagManager::sInstance->commit();
EnemyDefeatManager::sInstance->commit();
TBoxflagManager::sInstance->commit();
EnemyflagManager::sInstance->commit();
}
bool checkedMemcpy(void *dest, u32 destLen, const void *src, u32 count) {
src/d/flag/tboxflag_manager.inc
+10 -10
View File
@@ -1,31 +1,31 @@
#include "d/flag/tboxflag_manager.h"
#include "toBeSorted/file_manager.h"
TBoxFlagManager *TBoxFlagManager::sInstance = nullptr;
u16 TBoxFlagManager::sTBoxFlags[2] = {};
TBoxflagManager *TBoxflagManager::sInstance = nullptr;
u16 TBoxflagManager::sTBoxFlags[2] = {};
/* 0x800BE810 */
void TBoxFlagManager::doCommit() {
void TBoxflagManager::doCommit() {
if (mSceneIndex != 0xFFFF) {
FileManager::getInstance()->setTBoxFlags(mFlagSpace.getFlagPtrUnchecked(), mSceneIndex * 2, 2);
}
}
/* 0x800BE870 */
bool TBoxFlagManager::checkUncommittedFlag(u16 flag) {
bool TBoxflagManager::checkUncommittedFlag(u16 flag) {
return mFlagHelper.checkFlag(flag / 16, flag % 16, mFlagSpace.getFlagPtrUnchecked(), mFlagSpace.mCount);
}
/* 0x800BE8E0 */
TBoxFlagManager::TBoxFlagManager() : CommittableFlagManager(false), mFlagSpace(sTBoxFlags, ARRAY_LENGTH(sTBoxFlags)) {
TBoxflagManager::TBoxflagManager() : CommittableFlagManager(false), mFlagSpace(sTBoxFlags, ARRAY_LENGTH(sTBoxFlags)) {
mSceneIndex = 0xFFFF;
}
/* 0x800BE920 */
void TBoxFlagManager::init() {}
void TBoxflagManager::init() {}
/* 0x800BE930 */
void TBoxFlagManager::copyFromSave(u32 sceneIndex) {
void TBoxflagManager::copyFromSave(u32 sceneIndex) {
u16 idx = sceneIndex;
mSceneIndex = idx;
u16 *flags = FileManager::getInstance()->getTBoxFlagsConst();
@@ -33,7 +33,7 @@ void TBoxFlagManager::copyFromSave(u32 sceneIndex) {
}
/* 0x800BE990 */
bool TBoxFlagManager::checkFlag(u16 sceneIndex, u16 flag) {
bool TBoxflagManager::checkFlag(u16 sceneIndex, u16 flag) {
s32 actualFlag = (flag + sceneIndex * 0x20);
return mFlagHelper.checkFlag(
actualFlag / 16, flag % 16, FileManager::getInstance()->getTBoxFlagsConst(), getFlagCount()
@@ -41,12 +41,12 @@ bool TBoxFlagManager::checkFlag(u16 sceneIndex, u16 flag) {
}
/* 0x800BEA30 */
u16 TBoxFlagManager::getFlagCount() const {
u16 TBoxflagManager::getFlagCount() const {
return 0x200;
}
/* 0x800BEA40 */
void TBoxFlagManager::setFlag(u16 flag) {
void TBoxflagManager::setFlag(u16 flag) {
if (checkUncommittedFlag2(flag) != 1) {
mFlagHelper.setFlag(flag / 16, flag % 16, mFlagSpace.getFlagPtrChecked(), mFlagSpace.mCount);
setNeedsCommit(true);