mirror of
https://github.com/zeldaret/mm.git
synced 2024-11-24 05:19:53 +00: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>
257 lines
6.0 KiB
C
257 lines
6.0 KiB
C
#include <stdlib.h>
|
|
#include <stdint.h>
|
|
#include <getopt.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <inttypes.h>
|
|
#include <sys/stat.h>
|
|
#include <errno.h>
|
|
|
|
#define VTXDIS_VER "0.1"
|
|
|
|
#define SWAP16(x) (((x & 0xFF00) >> 8) | ((x & 0x00FF) << 8))
|
|
|
|
typedef struct {
|
|
int16_t pos[3]; /* 0x00 */
|
|
int16_t flag; /* 0x06 */
|
|
int16_t tpos[2]; /* 0x08 */
|
|
uint8_t cn[4]; /* 0x0C */
|
|
} Vtx; /* 0x10 */
|
|
|
|
static char *filename = NULL;
|
|
static char *data = NULL;
|
|
static int offset = 0;
|
|
static int data_len = 0;
|
|
static int count = 0;
|
|
|
|
const struct option cmdline_opts[] = {
|
|
{ "offset", required_argument, NULL, 'o', },
|
|
{ "length", required_argument, NULL, 'l', },
|
|
{ "file" , required_argument, NULL, 'f', },
|
|
{ "version", no_argument, NULL, '~', },
|
|
{ "help", no_argument, NULL, '?', },
|
|
{ "count", required_argument, NULL, 'c', },
|
|
{ 0, 0, 0, 0 },
|
|
};
|
|
|
|
static uint32_t parse_int(const char *num){
|
|
uint32_t ret = 0;
|
|
char outnum[21];
|
|
if(strlen(num) > 2 && num[0] == '0' && (num[1] == 'x' || num[1] == 'X')) {
|
|
strncpy(outnum, &num[2], 20);
|
|
sscanf(outnum, "%"SCNx32, &ret);
|
|
} else if(strlen(num) == 0){
|
|
ret = -1;
|
|
} else {
|
|
strncpy(outnum, num, 20);
|
|
sscanf(outnum, "%"SCNu32, &ret);
|
|
}
|
|
return ret;
|
|
|
|
}
|
|
|
|
static void print_usage(void)
|
|
{
|
|
puts("vtxdis version " VTXDIS_VER "\n"
|
|
"Usage:\n"
|
|
" vtxdis -f/--file FILE [options]\n"
|
|
" vtxdis -?/--help\n"
|
|
" vtxdis --version\n"
|
|
"Options:\n"
|
|
" -f, --file The file path to extract vertex data from.\n"
|
|
" -c, --count The number of vertices to extract.\n"
|
|
" -l, --length The amount of data to extract vertices from.\n"
|
|
" -o, --offset The offset into file to start reading vertex data.\n"
|
|
" -?, --help Prints this help message\n"
|
|
" --version Prints the current version\n"
|
|
);
|
|
}
|
|
|
|
static void print_version(void){
|
|
puts("Version: " VTXDIS_VER);
|
|
}
|
|
|
|
static void print_vtx_data(Vtx *vtx, int vtx_cnt)
|
|
{
|
|
printf("{\n");
|
|
for(int i = 0; i < vtx_cnt; i++)
|
|
{
|
|
Vtx *v = &vtx[i];
|
|
|
|
printf(" VTX(%d, %d, %d, %d, %d, 0x%02X, 0x%02X, 0x%02X, 0x%02X),\n", v->pos[0], v->pos[1], v->pos[2], v->tpos[0], v->tpos[1], v->cn[0], v->cn[1], v->cn[2], v->cn[3]);
|
|
}
|
|
printf("}\n");
|
|
}
|
|
|
|
static void parse_file(void)
|
|
{
|
|
int alloc_size = 0;
|
|
struct stat sbuffer;
|
|
stat(filename, &sbuffer);
|
|
if(errno != 0){
|
|
perror("Count not stat file.");
|
|
exit(1);
|
|
}
|
|
|
|
/* sanity checks */
|
|
if(count > 0)
|
|
{
|
|
alloc_size = sizeof(Vtx) * count;
|
|
if((offset > 0 && (offset + alloc_size) > sbuffer.st_size) || alloc_size > sbuffer.st_size)
|
|
{
|
|
printf("Requested data is beyond file boundaries.");
|
|
exit(1);
|
|
}
|
|
}
|
|
else if(data_len > 0)
|
|
{
|
|
alloc_size = data_len;
|
|
|
|
if((offset > 0 && (offset + alloc_size) > sbuffer.st_size) || alloc_size > sbuffer.st_size)
|
|
{
|
|
printf("Requested data is beyond file boundaries.");
|
|
exit(1);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (offset > 0)
|
|
{
|
|
alloc_size = sbuffer.st_size - offset;
|
|
}
|
|
else
|
|
{
|
|
alloc_size = sbuffer.st_size;
|
|
}
|
|
}
|
|
|
|
if(alloc_size % sizeof(Vtx) != 0)
|
|
{
|
|
printf("Requested data size is not a multiple of sizeof(Vtx). Requested size is %8x", alloc_size);
|
|
exit(1);
|
|
}
|
|
|
|
FILE *file = fopen(filename, "rb");
|
|
if(!file){
|
|
perror("Could not open file");
|
|
exit(1);
|
|
}
|
|
|
|
if(offset > 0){
|
|
if(fseek(file, offset, SEEK_SET)){
|
|
perror("Could not seek file");
|
|
fclose(file);
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
Vtx *data = NULL;
|
|
data = malloc(alloc_size);
|
|
if(!data){
|
|
fclose(file);
|
|
perror("Could not allocate vtx data");
|
|
exit(1);
|
|
}
|
|
|
|
if(!fread(data, alloc_size, 1, file)){
|
|
perror("Could not read from file");
|
|
fclose(file);
|
|
free(data);
|
|
exit(1);
|
|
}
|
|
|
|
fclose(file);
|
|
|
|
int vtx_cnt = alloc_size / sizeof(Vtx);
|
|
for(int i = 0; i < vtx_cnt; i++){
|
|
Vtx *v = &data[i];
|
|
|
|
v->pos[0] = SWAP16(v->pos[0]);
|
|
v->pos[1] = SWAP16(v->pos[1]);
|
|
v->pos[2] = SWAP16(v->pos[2]);
|
|
v->flag = SWAP16(v->flag);
|
|
v->tpos[0] = SWAP16(v->tpos[0]);
|
|
v->tpos[1] = SWAP16(v->tpos[1]);
|
|
}
|
|
|
|
print_vtx_data(data, vtx_cnt);
|
|
free(data);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int opt;
|
|
int argv_idx = 0;
|
|
while(1){
|
|
argv_idx++;
|
|
opt = getopt_long(argc, argv, "o:l:f:c:v?", cmdline_opts, NULL);
|
|
if(opt == -1){
|
|
break;
|
|
}
|
|
switch(opt){
|
|
case 'd':
|
|
data = optarg;
|
|
break;
|
|
case '~':
|
|
print_version();
|
|
return 0;
|
|
case '?':
|
|
print_usage();
|
|
return 0;
|
|
case 'l':
|
|
data_len = parse_int(optarg);
|
|
break;
|
|
case 'o':
|
|
offset = parse_int(optarg);
|
|
break;
|
|
case 'f':
|
|
filename = optarg;
|
|
break;
|
|
case 'c':
|
|
count = parse_int(optarg);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (filename == NULL && data == NULL)
|
|
{
|
|
printf("Must specify -f or -d\n");
|
|
print_usage();
|
|
exit(1);
|
|
}
|
|
|
|
if(data_len < 0)
|
|
{
|
|
printf("Invalid -l/--length parameter passed.");
|
|
print_usage();
|
|
exit(1);
|
|
}
|
|
|
|
if(offset < 0)
|
|
{
|
|
printf("Invalid -o/--offset parameter passed.");
|
|
print_usage();
|
|
exit(1);
|
|
}
|
|
|
|
if(count < 0)
|
|
{
|
|
printf("Invalid -c/--count parameter passed.");
|
|
print_usage();
|
|
exit(1);
|
|
}
|
|
|
|
if(count > 0 && data_len > 0)
|
|
{
|
|
printf("Cannot specify both -c/--count and -l/--length.");
|
|
print_usage();
|
|
exit(1);
|
|
}
|
|
|
|
if(filename != NULL)
|
|
{
|
|
parse_file();
|
|
}
|
|
|
|
return 0;
|
|
} |