1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 08:16:11 +00:00

sDmaMgrDataExistError -> sDmaMgrIsRomCompressed bool

This commit is contained in:
Dragorn421 2021-12-23 23:37:22 +01:00
parent 88474d7cb5
commit 7689cade11
No known key found for this signature in database
GPG key ID: 8ACAE4BA399BD6B0

View file

@ -11,7 +11,7 @@ s32 sDmaMgrCurFileLine;
u32 D_80009460 = 0; u32 D_80009460 = 0;
u32 gDmaMgrDmaBuffSize = 0x2000; u32 gDmaMgrDmaBuffSize = 0x2000;
u32 sDmaMgrDataExistError = 0; u32 sDmaMgrIsRomCompressed = false;
// dmadata filenames // dmadata filenames
#define DEFINE_DMA_ENTRY(name) #name, #define DEFINE_DMA_ENTRY(name) #name,
@ -292,7 +292,7 @@ void DmaMgr_ProcessMsg(DmaRequest* req) {
} }
if (!found) { if (!found) {
if (sDmaMgrDataExistError) { if (sDmaMgrIsRomCompressed) {
DmaMgr_Error(req, NULL, "DATA DON'T EXIST", "該当するデータが存在しません"); DmaMgr_Error(req, NULL, "DATA DON'T EXIST", "該当するデータが存在しません");
return; return;
} }
@ -388,14 +388,14 @@ void DmaMgr_Init(void) {
(u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart)); (u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart));
osSyncPrintf("dma_rom_ad[]\n"); osSyncPrintf("dma_rom_ad[]\n");
sDmaMgrDataExistError = 0; sDmaMgrIsRomCompressed = false;
name = sDmaMgrFileNames; name = sDmaMgrFileNames;
iter = gDmaDataTable; iter = gDmaDataTable;
idx = 0; idx = 0;
while (iter->vromEnd != 0) { while (iter->vromEnd != 0) {
if (iter->romEnd != 0) { if (iter->romEnd != 0) {
sDmaMgrDataExistError = 1; sDmaMgrIsRomCompressed = true;
} }
osSyncPrintf( osSyncPrintf(