mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-01 01:38:54 -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>
202 lines
5.1 KiB
C
202 lines
5.1 KiB
C
#ifdef __linux__
|
|
#define _POSIX_C_SOURCE 199309L
|
|
#endif
|
|
|
|
#include <stdarg.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#include "yaz0.h"
|
|
#include "util.h"
|
|
|
|
// TODO: Windows support
|
|
static unsigned long int get_time_milliseconds(void)
|
|
{
|
|
#ifdef __linux__
|
|
struct timespec tspec;
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &tspec);
|
|
return (tspec.tv_sec * 1000) + tspec.tv_nsec / 1000000;
|
|
#else
|
|
// dummy
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
static void print_report(unsigned long int time, size_t compSize, size_t uncompSize)
|
|
{
|
|
unsigned int minutes = time / (1000 * 60);
|
|
float seconds = (float)(time % (1000 * 60)) / 1000;
|
|
|
|
printf("compression ratio: %.2fKiB / %.2fKiB (%.2f%%)\n"
|
|
"time: %um %.3fs\n",
|
|
(float)compSize / 1024, (float)uncompSize / 1024,
|
|
(float)compSize * 100 / (float)uncompSize,
|
|
minutes, seconds);
|
|
}
|
|
|
|
static void compress_file(const char *inputFileName, const char *outputFileName, bool verbose)
|
|
{
|
|
size_t uncompSize;
|
|
uint8_t *input = util_read_whole_file(inputFileName, &uncompSize);
|
|
uint8_t *output = malloc(uncompSize * 2); // TODO: figure out how much space we need
|
|
unsigned long int time;
|
|
|
|
if (verbose)
|
|
{
|
|
printf("decompressing %s\n", inputFileName);
|
|
time = get_time_milliseconds();
|
|
}
|
|
|
|
// compress data
|
|
size_t compSize = yaz0_encode(input, output, uncompSize);
|
|
|
|
if (verbose)
|
|
time = get_time_milliseconds() - time;
|
|
|
|
// make Yaz0 header
|
|
uint8_t header[16] = {0};
|
|
header[0] = 'Y';
|
|
header[1] = 'a';
|
|
header[2] = 'z';
|
|
header[3] = '0';
|
|
util_write_uint32_be(header + 4, uncompSize);
|
|
|
|
// write output file
|
|
FILE *outFile = fopen(outputFileName, "wb");
|
|
if (outFile == NULL)
|
|
util_fatal_error("failed to open file '%s' for writing", outputFileName);
|
|
fwrite(header, sizeof(header), 1, outFile);
|
|
fwrite(output, compSize, 1, outFile);
|
|
fclose(outFile);
|
|
|
|
free(input);
|
|
free(output);
|
|
|
|
if (verbose)
|
|
print_report(time, compSize, uncompSize);
|
|
}
|
|
|
|
static void decompress_file(const char *inputFileName, const char *outputFileName, bool verbose)
|
|
{
|
|
size_t compSize;
|
|
uint8_t *input = util_read_whole_file(inputFileName, &compSize);
|
|
size_t uncompSize;
|
|
uint8_t *output;
|
|
unsigned long int time = 0;
|
|
|
|
// read header
|
|
if (input[0] != 'Y' || input[1] != 'a' || input[2] != 'z' || input[3] != '0')
|
|
util_fatal_error("file '%s' does not have a valid Yaz0 header", inputFileName);
|
|
uncompSize = util_read_uint32_be(input + 4);
|
|
|
|
// decompress data
|
|
output = malloc(uncompSize);
|
|
|
|
if (verbose)
|
|
{
|
|
printf("decompressing %s\n", inputFileName);
|
|
time = get_time_milliseconds();
|
|
}
|
|
|
|
yaz0_decode(input + 16, output, uncompSize);
|
|
|
|
if (verbose)
|
|
time = get_time_milliseconds() - time;
|
|
|
|
// write output file
|
|
FILE *outFile = fopen(outputFileName, "wb");
|
|
fwrite(output, uncompSize, 1, outFile);
|
|
fclose(outFile);
|
|
|
|
free(input);
|
|
free(output);
|
|
|
|
if (verbose)
|
|
print_report(time, compSize, uncompSize);
|
|
}
|
|
|
|
static void usage(const char *execName)
|
|
{
|
|
printf("Yaz0 compressor/decompressor\n"
|
|
"usage: %s [-d] [-h] [-v] INPUT_FILE OUTPUT_FILE\n"
|
|
"compresses INPUT_FILE using Yaz0 encoding and writes output to OUTPUT_FILE\n"
|
|
"Available options:\n"
|
|
"-d: decompresses INPUT_FILE, a Yaz0 compressed file, and writes decompressed\n"
|
|
" output to OUTPUT_FILE\n"
|
|
"-v: prints verbose output (compression ratio and time)\n"
|
|
"-h: shows this help message\n",
|
|
execName);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int i;
|
|
const char *inputFileName = NULL;
|
|
const char *outputFileName = NULL;
|
|
bool decompress = false;
|
|
bool verbose = false;
|
|
|
|
// parse arguments
|
|
for (i = 1; i < argc; i++)
|
|
{
|
|
char *arg = argv[i];
|
|
|
|
if (arg[0] == '-')
|
|
{
|
|
if (strcmp(arg, "-d") == 0)
|
|
decompress = true;
|
|
else if (strcmp(arg, "-v") == 0)
|
|
verbose = true;
|
|
else if (strcmp(arg, "-h") == 0)
|
|
{
|
|
usage(argv[0]);
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
printf("unknown option %s\n", arg);
|
|
usage(argv[0]);
|
|
return 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (inputFileName == NULL)
|
|
inputFileName = arg;
|
|
else if (outputFileName == NULL)
|
|
outputFileName = arg;
|
|
else
|
|
{
|
|
puts("too many files specified");
|
|
usage(argv[0]);
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (inputFileName == NULL)
|
|
{
|
|
puts("no input file specified");
|
|
usage(argv[0]);
|
|
return 1;
|
|
}
|
|
if (outputFileName == NULL)
|
|
{
|
|
puts("no output file specified");
|
|
usage(argv[0]);
|
|
return 1;
|
|
}
|
|
|
|
if (decompress)
|
|
decompress_file(inputFileName, outputFileName, verbose);
|
|
else
|
|
compress_file(inputFileName, outputFileName, verbose);
|
|
|
|
return 0;
|
|
}
|