mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 06:54:14 -04:00
Tharo
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>
170 lines
6.1 KiB
C
170 lines
6.1 KiB
C
#include "global.h"
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010CB80.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010CD98.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010CFBC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010D2D4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010D480.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010D7D0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010D9F4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010DC58.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010DE38.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010E028.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010E968.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010E9F0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EA9C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EB50.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EBA0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EC54.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EE74.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_ChangeAlpha.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EF9C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010F0D4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010F1A8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80110038.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80111CB4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801129E4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112AF4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112AFC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112B40.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112BE4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112C0C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Item_Give.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801143CC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114978.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801149A0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114A9C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114B84.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114CA0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114E90.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114F2C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114FD0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115130.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801152B8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801153C8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115428.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011552C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801155B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115764.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115844.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115908.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801159c0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801159EC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115A14.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Parameter_AddMagic.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115D5C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115DB4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116088.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116114.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116348.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116918.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116FD8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801170B8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80117100.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80117A20.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80117BD0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80118084.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80118890.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80118BA4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80119030.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80119610.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011B4E0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011B5C0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011B9E0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011BF70.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011C4C4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011C808.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011C898.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011CA64.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011E3B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011E730.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011F0E0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80120F90.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80121064.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801210E0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80121F94.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80121FC4.s")
|