mirror of
https://github.com/zeldaret/st
synced 2026-06-01 17:57:45 -04:00
OverlayManager::Unload improvements
This commit is contained in:
@@ -709,9 +709,9 @@ func_0201478c kind:function(arm,size=0x1c) addr:0x0201478c
|
||||
func_020147a8 kind:function(arm,size=0x1c) addr:0x020147a8
|
||||
func_020147c4 kind:function(arm,size=0x1c) addr:0x020147c4
|
||||
func_020147e0 kind:function(thumb,size=0x1c) addr:0x020147e0
|
||||
OverlayManager_LoadIfNotLoaded kind:function(thumb,size=0x28) addr:0x020147fc
|
||||
OverlayManager_Load kind:function(thumb,size=0x2c) addr:0x02014824
|
||||
OverlayManager_Unload kind:function(thumb,size=0x28) addr:0x02014850
|
||||
_ZN14OverlayManager15LoadIfNotLoadedEjj kind:function(thumb,size=0x28) addr:0x020147fc
|
||||
_ZN14OverlayManager4LoadEjj kind:function(thumb,size=0x2c) addr:0x02014824
|
||||
_ZN14OverlayManager6UnloadEj kind:function(thumb,size=0x28) addr:0x02014850
|
||||
func_02014878 kind:function(thumb,size=0x58) addr:0x02014878
|
||||
func_020148d0 kind:function(thumb,size=0x46) addr:0x020148d0
|
||||
func_02014918 kind:function(thumb,size=0x2c) addr:0x02014918
|
||||
|
||||
@@ -394,5 +394,5 @@ class OverlayManager {
|
||||
};
|
||||
|
||||
extern OverlayManager gOverlayManager;
|
||||
extern u32 data_0203e0e8[OverlayIndex_COUNT];
|
||||
extern OverlayIndex data_0203e0e8[OverlayIndex_COUNT];
|
||||
extern char* data_02043c88[OverlayIndex_COUNT];
|
||||
|
||||
@@ -46,11 +46,11 @@ THUMB void OverlayManager::Load(OverlaySlot index, OverlayId id) {
|
||||
}
|
||||
|
||||
THUMB void OverlayManager::Unload(OverlaySlot index) {
|
||||
OverlayId loadedId = gOverlayManager.mLoadedOverlays[index];
|
||||
OverlayManager* pOverlayManager = &gOverlayManager;
|
||||
|
||||
if (loadedId != OverlayId_None) {
|
||||
FS_UnloadOverlay(NULL, data_0203e0e8[index]);
|
||||
gOverlayManager.mLoadedOverlays[index] = OverlayId_None;
|
||||
if (pOverlayManager->mLoadedOverlays[index] != OverlayId_None) {
|
||||
FS_UnloadOverlay(NULL, data_0203e0e8[pOverlayManager->mLoadedOverlays[index]]);
|
||||
pOverlayManager->mLoadedOverlays[index] = OverlayId_None;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user