1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 10:21:18 +00:00

Clean out z64.h (#2484)

* Clean out z64.h

* fix version include

* overlay.h

* pr suggestion

* try fixing main.c

* add back forward declare

* fix bss

* header guard

* prefix
This commit is contained in:
fig02 2025-02-22 14:01:09 -05:00 committed by GitHub
parent 2e4d7a1101
commit 5ddb3e68b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
36 changed files with 199 additions and 157 deletions

View file

@ -1,5 +1,14 @@
#include "global.h"
typedef struct ISVDbg {
/* 0x00 */ u32 magic; // "IS64"
/* 0x04 */ u32 get;
/* 0x08 */ u8 unk_08[0xC];
/* 0x14 */ u32 put;
/* 0x18 */ u8 unk_18[0x8];
/* 0x20 */ u8 data[0xFFE0];
} ISVDbg; // size = 0x10000
#define gISVDbgPrnAdrs ((ISVDbg*)0xB3FF0000)
#define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0)))

View file

@ -51,6 +51,13 @@ void* Yaz0_NextDMA(u8* curSrcPos) {
return dst;
}
typedef struct Yaz0Header {
/* 0x00 */ char magic[4]; // Yaz0
/* 0x04 */ u32 decSize;
/* 0x08 */ u32 compInfoOffset; // only used in mio0
/* 0x0C */ u32 uncompDataOffset; // only used in mio0
} Yaz0Header; // size = 0x10
void Yaz0_DecompressImpl(u8* src, u8* dst) {
Yaz0Header* header = (Yaz0Header*)src;
u32 bitIdx = 0;

View file

@ -6,6 +6,19 @@
s32 gCurrentRegion = 0;
typedef struct LocaleCartInfo {
/* 0x00 */ char name[0x18];
/* 0x18 */ u32 mediaFormat;
/* 0x1C */ union {
struct {
u16 cartId;
u8 countryCode;
u8 version;
};
u32 regionInfo;
};
} LocaleCartInfo; // size = 0x20
void Locale_Init(void) {
#if !PLATFORM_GC
ALIGNED(4) u8 regionInfo[4];

View file

@ -33,7 +33,7 @@
#include "global.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ntsc-1.2:46 pal-1.0:44 pal-1.1:44"
"ntsc-1.2:76 pal-1.0:74 pal-1.1:74"
StackEntry sDmaMgrStackInfo;
OSMesgQueue sDmaMgrMsgQueue;