Everything OK except for weak dtor order

This commit is contained in:
robojumper
2024-10-25 11:05:26 +02:00
parent e689fbaa42
commit ceac3a6ef8
8 changed files with 105 additions and 67 deletions
+38 -38
View File
@@ -4069,7 +4069,7 @@ fn_800BD7A0 = .text:0x800BD7A0; // type:function size:0x74
fn_800BD820 = .text:0x800BD820; // type:function size:0x8
fn_800BD830 = .text:0x800BD830; // type:function size:0x78
fn_800BD8B0 = .text:0x800BD8B0; // type:function size:0x10
doNothing__16SceneflagManagerFv = .text:0x800BD8C0; // type:function size:0x4
init__16SceneflagManagerFv = .text:0x800BD8C0; // type:function size:0x4
setShouldCommit__16SceneflagManagerFUs = .text:0x800BD8D0; // type:function size:0xC
__ct__16SceneflagManagerFv = .text:0x800BD8E0; // type:function size:0x64
isNotTempOrZoneFlag__16SceneflagManagerFUs = .text:0x800BD950; // type:function size:0xC
@@ -4161,22 +4161,22 @@ onDirty__20ItemStoryManagerBaseFv = .text:0x800BF630; // type:function size:0x4
FUN_800bf640__20ItemStoryManagerBaseFUs = .text:0x800BF640; // type:function size:0x10
doCommit_Priv__20ItemStoryManagerBaseFv = .text:0x800BF650; // type:function size:0x40
FUN_800bf690__20ItemStoryManagerBaseFv = .text:0x800BF690; // type:function size:0x4
__ct__16StoryFlagManagerFv = .text:0x800BF6A0; // type:function size:0x5C
copyFlagsFromSave__16StoryFlagManagerFv = .text:0x800BF700; // type:function size:0x3C
setupUnkFlagsStuff__16StoryFlagManagerFv = .text:0x800BF740; // type:function size:0x10
onDirty__16StoryFlagManagerFv = .text:0x800BF750; // type:function size:0x4
commit__16StoryFlagManagerFv = .text:0x800BF760; // type:function size:0x4C
unsetFlag__16StoryFlagManagerFUs = .text:0x800BF7B0; // type:function size:0x4
__ct__15ItemFlagManagerFv = .text:0x800BF7C0; // type:function size:0x5C
copyFlagsFromSave__15ItemFlagManagerFv = .text:0x800BF820; // type:function size:0x3C
setupUnkFlagsStuff__15ItemFlagManagerFv = .text:0x800BF860; // type:function size:0x10
onDirty__15ItemFlagManagerFv = .text:0x800BF870; // type:function size:0x4
commit__15ItemFlagManagerFv = .text:0x800BF880; // type:function size:0x4C
copyFromSave__18DungeonflagManagerFUs = .text:0x800BF8D0; // type:function size:0x54
__ct__16StoryflagManagerFv = .text:0x800BF6A0; // type:function size:0x5C
copyFlagsFromSave__16StoryflagManagerFv = .text:0x800BF700; // type:function size:0x3C
setupUnkFlagsStuff__16StoryflagManagerFv = .text:0x800BF740; // type:function size:0x10
onDirty__16StoryflagManagerFv = .text:0x800BF750; // type:function size:0x4
commit__16StoryflagManagerFv = .text:0x800BF760; // type:function size:0x4C
unsetFlag__16StoryflagManagerFUs = .text:0x800BF7B0; // type:function size:0x4
__ct__15ItemflagManagerFv = .text:0x800BF7C0; // type:function size:0x5C
copyFlagsFromSave__15ItemflagManagerFv = .text:0x800BF820; // type:function size:0x3C
setupUnkFlagsStuff__15ItemflagManagerFv = .text:0x800BF860; // type:function size:0x10
onDirty__15ItemflagManagerFv = .text:0x800BF870; // type:function size:0x4
commit__15ItemflagManagerFv = .text:0x800BF880; // type:function size:0x4C
copyFromSave_Internal__18DungeonflagManagerFUs = .text:0x800BF8D0; // type:function size:0x54
setCommitFlag__18DungeonflagManagerFUs = .text:0x800BF930; // type:function size:0xC
__ct__18DungeonflagManagerFv = .text:0x800BF940; // type:function size:0x3C
setupFlagStuff__18DungeonflagManagerFv = .text:0x800BF980; // type:function size:0x54
copyFromSave__18DungeonflagManagerFs = .text:0x800BF9E0; // type:function size:0xC
init__18DungeonflagManagerFv = .text:0x800BF980; // type:function size:0x54
copyFromSave__18DungeonflagManagerFUl = .text:0x800BF9E0; // type:function size:0xC
setToValue__18DungeonflagManagerFUsUl = .text:0x800BF9F0; // type:function size:0x6C
setFlag__18DungeonflagManagerFUs = .text:0x800BFA60; // type:function size:0x60
getDungeonFlag__18DungeonflagManagerFUs = .text:0x800BFAC0; // type:function size:0x50
@@ -4184,7 +4184,7 @@ doCommit__18DungeonflagManagerFv = .text:0x800BFB10; // type:function size:0x8C
copyFromSave__15SkipflagManagerFv = .text:0x800BFBA0; // type:function size:0x44
setCommitFlag__15SkipflagManagerFUs = .text:0x800BFBF0; // type:function size:0xC
__ct__15SkipflagManagerFv = .text:0x800BFC00; // type:function size:0x2C
unsetCommitFlag__15SkipflagManagerFv = .text:0x800BFC30; // type:function size:0xC
init__15SkipflagManagerFv = .text:0x800BFC30; // type:function size:0xC
thunk_copyFromSave__15SkipflagManagerFv = .text:0x800BFC40; // type:function size:0x4
setFlag__15SkipflagManagerFUs = .text:0x800BFC50; // type:function size:0xD0
checkFlag__15SkipflagManagerFUs = .text:0x800BFD20; // type:function size:0x68
@@ -4192,27 +4192,27 @@ commitFlags__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__16StoryFlagManagerFv = .text:0x800C0120; // type:function size:0x58
__dt__15ItemFlagManagerFv = .text:0x800C0180; // type:function size:0x58
__dt__16StoryflagManagerFv = .text:0x800C0120; // type:function size:0x58
__dt__15ItemflagManagerFv = .text:0x800C0180; // type:function size:0x58
postSetup__Fv = .text:0x800C01E0; // type:function size:0x8
copyAllFlagManagersFromSave__Fv = .text:0x800C01F0; // type:function size:0x78
updateFlagForFlagIndex__FUs = .text:0x800C0270; // type:function size:0x58
commitAllFlagManagers = .text:0x800C02D0; // type:function size:0x54
commitAllFlagManagers__Fv = .text:0x800C02D0; // type:function size:0x54
checkedMemcpy = .text:0x800C0330; // type:function size:0x54
getSaveFlagSpace__15ItemFlagManagerCFv = .text:0x800C0390; // type:function size:0x8
unk3__15ItemFlagManagerFUs = .text:0x800C03A0; // type:function size:0x8
getUncommittedValue__15ItemFlagManagerFUs = .text:0x800C03B0; // type:function size:0x8
getCounterOrFlag__15ItemFlagManagerCFUs = .text:0x800C03C0; // type:function size:0x8
setFlagOrCounterToValue__15ItemFlagManagerFUsUs = .text:0x800C03D0; // type:function size:0x8
unsetFlag__15ItemFlagManagerFUs = .text:0x800C03E0; // type:function size:0x8
doCommit__15ItemFlagManagerFv = .text:0x800C03F0; // type:function size:0x44
setFlagszptr__15ItemFlagManagerFv = .text:0x800C0440; // type:function size:0xC
getSaveFlagSpace__16StoryFlagManagerCFv = .text:0x800C0450; // type:function size:0x8
doCommit__16StoryFlagManagerFv = .text:0x800C0460; // type:function size:0x44
setFlagszptr__16StoryFlagManagerFv = .text:0x800C04B0; // type:function size:0xC
getSaveFlagSpace__15ItemflagManagerCFv = .text:0x800C0390; // type:function size:0x8
unk3__15ItemflagManagerFUs = .text:0x800C03A0; // type:function size:0x8
getUncommittedValue__15ItemflagManagerFUs = .text:0x800C03B0; // type:function size:0x8
getCounterOrFlag__15ItemflagManagerCFUs = .text:0x800C03C0; // type:function size:0x8
setFlagOrCounterToValue__15ItemflagManagerFUsUs = .text:0x800C03D0; // type:function size:0x8
unsetFlag__15ItemflagManagerFUs = .text:0x800C03E0; // type:function size:0x8
doCommit__15ItemflagManagerFv = .text:0x800C03F0; // type:function size:0x44
setFlagszptr__15ItemflagManagerFv = .text:0x800C0440; // type:function size:0xC
getSaveFlagSpace__16StoryflagManagerCFv = .text:0x800C0450; // type:function size:0x8
doCommit__16StoryflagManagerFv = .text:0x800C0460; // type:function size:0x44
setFlagszptr__16StoryflagManagerFv = .text:0x800C04B0; // type:function size:0xC
doCommit__18EnemyDefeatManagerFv = .text:0x800C04C0; // type:function size:0x44
__dt__18ItemFlagManagerSubFv = .text:0x800C0510; // type:function size:0x5C
__dt__19StoryFlagManagerSubFv = .text:0x800C0570; // type:function size:0x5C
__dt__18ItemflagManagerSubFv = .text:0x800C0510; // type:function size:0x5C
__dt__19StoryflagManagerSubFv = .text:0x800C0570; // type:function size:0x5C
__dt__21EnemyDefeatManagerSubFv = .text:0x800C05D0; // type:function size:0x40
__dt__18TBoxFlagManagerSubFv = .text:0x800C0610; // type:function size:0x40
fn_800C0650 = .text:0x800C0650; // type:function size:0x3C
@@ -31008,12 +31008,12 @@ lbl_80510B48 = .data:0x80510B48; // type:object size:0xC
lbl_80510B54 = .data:0x80510B54; // type:object size:0xC
lbl_80510B60 = .data:0x80510B60; // type:object size:0x10
lbl_80510B70 = .data:0x80510B70; // type:object size:0x18
__vt__18ItemFlagManagerSub = .data:0x80510B88; // type:object size:0x3C
__vt__19StoryFlagManagerSub = .data:0x80510BC4; // type:object size:0x3C
__vt__18ItemflagManagerSub = .data:0x80510B88; // type:object size:0x3C
__vt__19StoryflagManagerSub = .data:0x80510BC4; // type:object size:0x3C
__vt__21EnemyDefeatManagerSub = .data:0x80510C00; // type:object size:0x14
__vt__18TBoxFlagManagerSub = .data:0x80510C14; // type:object size:0x14
__vt__15ItemFlagManager = .data:0x80510C28; // type:object size:0x3C
__vt__16StoryFlagManager = .data:0x80510C64; // type:object size:0x3C
__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
@@ -48333,8 +48333,8 @@ 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
STATIC_STORYFLAGS = .bss:0x805A9AD8; // type:object size:0x100
STATIC_ITEM_FLAGS = .bss:0x805A9BD8; // type:object size:0x80
sFlags__16StoryflagManager = .bss:0x805A9AD8; // type:object size:0x100
sFlags__15ItemflagManager = .bss:0x805A9BD8; // type:object size:0x80
sDungeonFlags__18DungeonflagManager = .bss:0x805A9C58; // type:object size:0x10
sSkipFlags__15SkipflagManager = .bss:0x805A9C68; // type:object size:0x20
lbl_805A9C88 = .bss:0x805A9C88; // type:object size:0x10 data:4byte