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

Remove instance from dungeon flag mgr TU

Browse Source
This commit is contained in:
robojumper
2024-05-03 09:58:23 +02:00
parent 4353833983
commit b8b65fdf33
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
-1
View File
@@ -124,7 +124,6 @@ toBeSorted/bitwise_flag_helper.cpp:
toBeSorted/dungeonflag_manager.cpp: toBeSorted/dungeonflag_manager.cpp:
.text start:0x800BF8D0 end:0x800BFB9C .text start:0x800BF8D0 end:0x800BFB9C
.sbss start:0x80575404 end:0x80575408
.bss start:0x805A9C58 end:0x805A9C68 .bss start:0x805A9C58 end:0x805A9C68
toBeSorted/skipflag_manager.cpp: toBeSorted/skipflag_manager.cpp:
config/SOUE01/symbols.txt
+1 -1
View File
@@ -39848,7 +39848,7 @@ sTBoxFlags__15TBoxFlagManager = .sbss:0x805753F4; // type:object size:0x4
sInstance__18EnemyDefeatManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte sInstance__18EnemyDefeatManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte
lbl_805753FC = .sbss:0x805753FC; // type:object size:0x4 data:4byte lbl_805753FC = .sbss:0x805753FC; // type:object size:0x4 data:4byte
lbl_80575400 = .sbss:0x80575400; // type:object size:0x4 data:4byte lbl_80575400 = .sbss:0x80575400; // type:object size:0x4 data:4byte
sInstance__18DungeonflagManager = .sbss:0x80575404; // type:object size:0x4 data:4byte lbl_80575404 = .sbss:0x80575404; // type:object size:0x4 data:4byte
sInstance__15SkipflagManager = .sbss:0x80575408; // type:object size:0x4 data:4byte sInstance__15SkipflagManager = .sbss:0x80575408; // type:object size:0x4 data:4byte
lbl_80575410 = .sbss:0x80575410; // type:object size:0x8 data:4byte lbl_80575410 = .sbss:0x80575410; // type:object size:0x8 data:4byte
lbl_80575418 = .sbss:0x80575418; // type:object size:0x8 lbl_80575418 = .sbss:0x80575418; // type:object size:0x8
configure.py
+1 -1
View File
@@ -274,7 +274,7 @@ config.libs = [
Object(Matching, "toBeSorted/sceneflag_manager.cpp"), Object(Matching, "toBeSorted/sceneflag_manager.cpp"),
Object(NonMatching, "toBeSorted/flag_space.cpp"), Object(NonMatching, "toBeSorted/flag_space.cpp"),
Object(NonMatching, "toBeSorted/misc_flag_managers.cpp"), Object(NonMatching, "toBeSorted/misc_flag_managers.cpp"),
Object(NonMatching, "toBeSorted/dungeonflag_manager.cpp"), Object(Matching, "toBeSorted/dungeonflag_manager.cpp"),
Object(Matching, "toBeSorted/skipflag_manager.cpp"), Object(Matching, "toBeSorted/skipflag_manager.cpp"),
Object(Matching, "c/c_list.cpp"), Object(Matching, "c/c_list.cpp"),
Object(Matching, "c/c_tree.cpp"), Object(Matching, "c/c_tree.cpp"),
src/toBeSorted/dungeonflag_manager.cpp
+3 -2
View File
@@ -21,7 +21,7 @@ public:
FlagSpace mFlagSpace; FlagSpace mFlagSpace;
static u16 sDungeonFlags[8]; static u16 sDungeonFlags[8];
static DungeonflagManager *sInstance; // static DungeonflagManager *sInstance;
void copyFromSave(s16 flag); void copyFromSave(s16 flag);
void copyFromSave(u16 flagIndex); void copyFromSave(u16 flagIndex);
@@ -41,7 +41,8 @@ public:
}; };
/** 80575404 */ /** 80575404 */
DungeonflagManager *DungeonflagManager::sInstance = nullptr; // DungeonflagManager *DungeonflagManager::sInstance = nullptr;
/** 805a9c58 */ /** 805a9c58 */
u16 DungeonflagManager::sDungeonFlags[8] = {}; u16 DungeonflagManager::sDungeonFlags[8] = {};