Skip to content

Create space for 4 bytes copied from ROM filesystem #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
queueRAM wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Create space for 4 bytes copied from ROM filesystem #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions include/uv_memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ typedef struct {
u16 unk22;
} UVBlockCounts;

typedef struct {
UVBlockCounts counts;
s32 unk24;
} UVBlockMeta;

typedef struct {
void* UVSY[1];
void* UVMD[0x190];
Expand Down Expand Up @@ -56,8 +61,8 @@ extern void* D_802B6E30[LEVEL_TEXTURE_COUNT];
extern uvLevelData gLevelData;
extern Unk802B53C0* D_802B53C0;

extern UVBlockCounts gUVBlockCounts; // D_802B53C8
extern UVBlockOffsets gUVBlockOffsets; // D_802B53F0
extern UVBlockMeta gUVBlockCounts;
extern UVBlockOffsets gUVBlockOffsets;

void mio0_decompress(void* src, u8* dst);

Expand Down
6 changes: 3 additions & 3 deletions src/kernel/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,15 +358,15 @@ void uvLevelInit(void) {
switch (tag) {
case 'COMM':
_uvMediaCopy(&gUVBlockCounts, source, length);
gLevelData.unk1608 = gUVBlockCounts.unk0;
gLevelData.unk1608 = gUVBlockCounts.counts.unk0;
break;
default:
break;
}
}
uvFile_80223F30(temp_v0);
if (gUVBlockCounts.uvVersion != UV_KERNEL_VERSION) {
_uvDebugPrintf("uvLevelInit: dbase [ver %d] and kernel [ver %d] out of date\n", gUVBlockCounts.uvVersion, UV_KERNEL_VERSION);
if (gUVBlockCounts.counts.uvVersion != UV_KERNEL_VERSION) {
_uvDebugPrintf("uvLevelInit: dbase [ver %d] and kernel [ver %d] out of date\n", gUVBlockCounts.counts.uvVersion, UV_KERNEL_VERSION);
}
}

Expand Down
33 changes: 16 additions & 17 deletions src/kernel/texture.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ParsedUVTR* _uvParseUVTR(u8*);
ParsedUVBT* _uvParseUVBT(u8*);

Unk802B53C0* D_802B53C0;
UVBlockCounts gUVBlockCounts;
UVBlockMeta gUVBlockCounts;
UVBlockOffsets gUVBlockOffsets;
void* D_802B6E30[LEVEL_TEXTURE_COUNT];
u16 D_802B7600[1000];
Expand All @@ -68,7 +68,7 @@ void uvMemInitBlockHdr(void) {
u32 tag;
UVBlockHeader* var_a0;

uvMemSet(&gUVBlockCounts, 0, sizeof(gUVBlockCounts));
uvMemSet(&gUVBlockCounts.counts, 0, sizeof(gUVBlockCounts.counts));
sp64 = uvFileReadHeader(SEGMENT_ROM_START(filetable));
romOffset = SEGMENT_ROM_START(filesys);

Expand All @@ -82,46 +82,46 @@ void uvMemInitBlockHdr(void) {
gUVBlockOffsets.UVSY[0] = romOffset;
break;
case 'UVAN':
gUVBlockOffsets.UVAN[gUVBlockCounts.UVAN++] = romOffset;
gUVBlockOffsets.UVAN[gUVBlockCounts.counts.UVAN++] = romOffset;
break;
case 'UVFT':
gUVBlockOffsets.UVFT[gUVBlockCounts.UVFT++] = romOffset;
gUVBlockOffsets.UVFT[gUVBlockCounts.counts.UVFT++] = romOffset;
break;
case 'UVBT':
gUVBlockOffsets.UVBT[gUVBlockCounts.UVBT++] = romOffset;
gUVBlockOffsets.UVBT[gUVBlockCounts.counts.UVBT++] = romOffset;
break;
case 'UVMD':
gUVBlockOffsets.UVMD[gUVBlockCounts.UVMD++] = romOffset;
gUVBlockOffsets.UVMD[gUVBlockCounts.counts.UVMD++] = romOffset;
break;
case 'UVCT':
gUVBlockOffsets.UVCT[gUVBlockCounts.UVCT++] = romOffset;
gUVBlockOffsets.UVCT[gUVBlockCounts.counts.UVCT++] = romOffset;
break;
case 'UVTX':
gUVBlockOffsets.UVTX[gUVBlockCounts.UVTX++] = romOffset;
gUVBlockOffsets.UVTX[gUVBlockCounts.counts.UVTX++] = romOffset;
break;
case 'UVEN':
gUVBlockOffsets.UVEN[gUVBlockCounts.UVEN++] = romOffset;
gUVBlockOffsets.UVEN[gUVBlockCounts.counts.UVEN++] = romOffset;
break;
case 'UVLT':
gUVBlockOffsets.UVLT[gUVBlockCounts.UVLT++] = romOffset;
gUVBlockOffsets.UVLT[gUVBlockCounts.counts.UVLT++] = romOffset;
break;
case 'UVLV':
gUVBlockOffsets.UVLV[gUVBlockCounts.UVLV++] = romOffset;
gUVBlockOffsets.UVLV[gUVBlockCounts.counts.UVLV++] = romOffset;
break;
case 'UVSQ':
gUVBlockOffsets.UVSQ[gUVBlockCounts.UVSQ++] = romOffset;
gUVBlockOffsets.UVSQ[gUVBlockCounts.counts.UVSQ++] = romOffset;
break;
case 'UVTR':
gUVBlockOffsets.UVTR[gUVBlockCounts.UVTR++] = romOffset;
gUVBlockOffsets.UVTR[gUVBlockCounts.counts.UVTR++] = romOffset;
break;
case 'UVTP':
gUVBlockOffsets.UVTP[gUVBlockCounts.UVTP++] = romOffset;
gUVBlockOffsets.UVTP[gUVBlockCounts.counts.UVTP++] = romOffset;
break;
case 'UVSX':
gUVBlockOffsets.UVSX[gUVBlockCounts.UVSX++] = romOffset;
gUVBlockOffsets.UVSX[gUVBlockCounts.counts.UVSX++] = romOffset;
break;
default:
gUVBlockOffsets.unk1838[gUVBlockCounts.unk1C++] = romOffset;
gUVBlockOffsets.unk1838[gUVBlockCounts.counts.unk1C++] = romOffset;
break;
}
romOffset += var_a0->size;
Expand Down Expand Up @@ -1325,4 +1325,3 @@ s32 func_80227E5C(s32 arg0, s32 arg1) {
}
return FALSE;
}

Loading