Flag capitalization

src/d/a/d_a_base.cpp

@@ -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

@@ -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

@@ -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

@@ -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);