mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-05 03:07:33 -04:00
7743e5a2c4
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
150 lines
3.6 KiB
C
150 lines
3.6 KiB
C
#include "global.h"
|
|
|
|
u8 sYaz0DataBuffer[0x400];
|
|
u8* sYaz0CurDataEnd;
|
|
u32 sYaz0CurRomStart;
|
|
u32 sYaz0CurSize;
|
|
u8* sYaz0MaxPtr;
|
|
u8* D_8009BE20;
|
|
|
|
void* Yaz0_FirstDMA() {
|
|
u32 pad0;
|
|
u32 dmaSize;
|
|
u32 curSize;
|
|
|
|
sYaz0MaxPtr = sYaz0CurDataEnd - 0x19;
|
|
|
|
curSize = (u32)sYaz0CurDataEnd - (u32)sYaz0DataBuffer;
|
|
dmaSize = (curSize > sYaz0CurSize) ? sYaz0CurSize : curSize;
|
|
|
|
DmaMgr_DMARomToRam(sYaz0CurRomStart, sYaz0DataBuffer, dmaSize);
|
|
sYaz0CurRomStart += dmaSize;
|
|
sYaz0CurSize -= dmaSize;
|
|
return sYaz0DataBuffer;
|
|
}
|
|
|
|
void* Yaz0_NextDMA(void* curSrcPos) {
|
|
u8* dst;
|
|
u32 restSize;
|
|
u32 dmaSize;
|
|
OSPri oldPri;
|
|
|
|
restSize = (u32)sYaz0CurDataEnd - (u32)curSrcPos;
|
|
|
|
dst = (restSize & 7) ? (sYaz0DataBuffer - (restSize & 7)) + 8 : sYaz0DataBuffer;
|
|
|
|
bcopy(curSrcPos, dst, restSize);
|
|
dmaSize = ((u32)sYaz0CurDataEnd - (u32)dst) - restSize;
|
|
if (sYaz0CurSize < dmaSize) {
|
|
dmaSize = sYaz0CurSize;
|
|
}
|
|
|
|
if (dmaSize != 0) {
|
|
DmaMgr_DMARomToRam(sYaz0CurRomStart, dst + restSize, dmaSize);
|
|
sYaz0CurRomStart += dmaSize;
|
|
sYaz0CurSize -= dmaSize;
|
|
if (!sYaz0CurSize) {
|
|
sYaz0MaxPtr = dst + restSize + dmaSize;
|
|
}
|
|
} else {
|
|
oldPri = osGetThreadPri(NULL);
|
|
osSetThreadPri(NULL, 0x7F);
|
|
osSyncPrintf("圧縮展開異常\n");
|
|
osSetThreadPri(NULL, oldPri);
|
|
}
|
|
|
|
return dst;
|
|
}
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 magic; // Yaz0
|
|
/* 0x04 */ u32 decSize;
|
|
/* 0x08 */ u32 compInfoOffset; // only used in mio0
|
|
/* 0x0C */ u32 uncompDataOffset; // only used in mio0
|
|
} Yaz0Header; // size = 0x10
|
|
|
|
#define YAZ0_MAGIC 0x59617A30 // "Yaz0"
|
|
|
|
s32 Yaz0_DecompressImpl(u8* src, u8* dst) {
|
|
u32 bitIdx = 0;
|
|
u8* dstEnd;
|
|
u32 chunkHeader = 0;
|
|
u32 nibble;
|
|
u8* backPtr;
|
|
s32 chunkSize;
|
|
u32 off;
|
|
u32 magic;
|
|
|
|
magic = ((Yaz0Header*)src)->magic;
|
|
|
|
if (magic != YAZ0_MAGIC) {
|
|
return -1;
|
|
}
|
|
|
|
dstEnd = dst + ((Yaz0Header*)src)->decSize;
|
|
src = src + sizeof(Yaz0Header);
|
|
|
|
do {
|
|
if (bitIdx == 0) {
|
|
if ((sYaz0MaxPtr < src) && (sYaz0CurSize != 0)) {
|
|
src = Yaz0_NextDMA(src);
|
|
}
|
|
|
|
chunkHeader = *src++;
|
|
bitIdx = 8;
|
|
}
|
|
|
|
if (chunkHeader & (1 << 7)) { // uncompressed
|
|
*dst = *src;
|
|
dst++;
|
|
src++;
|
|
} else { // compressed
|
|
off = ((*src & 0xF) << 8 | *(src + 1));
|
|
nibble = *src >> 4;
|
|
backPtr = dst - off;
|
|
src += 2;
|
|
|
|
chunkSize = (nibble == 0) // N = chunkSize; B = back offset
|
|
? *src++ + 0x12 // 3 bytes 0B BB NN
|
|
: nibble + 2; // 2 bytes NB BB
|
|
|
|
do {
|
|
*dst++ = *(backPtr++ - 1);
|
|
chunkSize--;
|
|
} while (chunkSize != 0);
|
|
}
|
|
chunkHeader <<= 1;
|
|
bitIdx--;
|
|
} while (dst != dstEnd);
|
|
|
|
D_8009BE20 = dstEnd;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void Yaz0_Decompress(u32 romStart, void* dst, u32 size) {
|
|
s32 status;
|
|
u32 pad;
|
|
u8 sp80[0x50];
|
|
u8 sp30[0x50];
|
|
|
|
if (sYaz0CurDataEnd != NULL) {
|
|
while (sYaz0CurDataEnd != NULL) {
|
|
Sleep_Usec(10);
|
|
}
|
|
}
|
|
|
|
sYaz0CurDataEnd = sYaz0DataBuffer + sizeof(sYaz0DataBuffer);
|
|
sYaz0CurRomStart = romStart;
|
|
sYaz0CurSize = size;
|
|
status = Yaz0_DecompressImpl(Yaz0_FirstDMA(), dst);
|
|
|
|
if (status != 0) {
|
|
sprintf(sp80, "slidma slidstart_szs ret=%d", status);
|
|
sprintf(sp30, "src:%08lx dst:%08lx siz:%08lx", romStart, dst, size);
|
|
Fault_AddHungupAndCrashImpl(sp80, sp30);
|
|
}
|
|
|
|
sYaz0CurDataEnd = NULL;
|
|
}
|