summaryrefslogtreecommitdiff
path: root/linker_scripts
AgeCommit message (Collapse)Author
2025-08-19Handwritten asm: OS functions, libm_vals (#1821)Tharo
* Handwritten asm: OS functions, libm_vals * rm hardware_regs.ld * andi -> and, addiu -> addu * CACHE macro
2025-08-07parameters.s (#1820)Tharo
2025-01-27Extract Incbins (#1776)Derek Hensley
* extract incbins infastructure * rspboot incbin * rsptext incbin * rspdata incbin * aspMainStack incbin * ipl3 incbin
2024-12-28Match SysCfb_Init without extra symbols (#1780)Derek Hensley
2024-12-19Remove gSystemHeap and the system_heap spec segment, use _buffersSegmentEnd ↵Tharo
to represent the start of the system heap (#1767)
2024-12-13[Audio 9/9] Loose ends (#1755)Tharo
* [Audio 9/9] Loose ends * Fix sampleconv memset bug * Doc updates from oot
2024-12-10Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)Tom Overton
* more matches * more functions * merge, I hope * wrath done-ish * 5 nonmatchings * more matchings * more improvements * more stuff * stuff * docs part 1 / infinity * more docs * . * more adjustments * linked assets * Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!) * more stuff * play part 2 * lol merge * update * unk types * SWEET GOOGLY MOOGLY IT MATCHES * cam fixes * adjust damage stuff * if? * stuff * signs * macro stuff. clean up later * names * Some small cleanup * cleanup and docs * more cleanup * Wrath shadow docs * Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging * Update functions.txt * Types cleanup * Some low hanging fruit * Undefined_syms.txt * More static -> battle handler * Lots of naming cleanup * Remove z_boss_07_dmgtbl.inc The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things. * Get most of the limb stuff named (and actually update the spec) * Some minor cleanup * Updating the repo with what we talked about in discord * Some syncing with Odolwa and other misc name stuff * Some Odolwa/Bio Baba sync * Another bit of Odolwa/Bio Baba sync * Name a lot of incarnation limb variables * Finalize the incarnation intro variable stuff * Fix a goof * `incarnationWrathTransition` variables * `generalCollider` and always use "tentacle" * Completely remove "shot," always use "projectile" * Clean up `Boss07_Mask_Draw` * Name `maskShakeTimer` * Give better names to a few more things * Some beam-related struct vars * undefined_syms * More beam names * More beam stuff * Beam, pt 100000 * Some intro struct members * Some timers * More non-beam stuff, back to beam * Done with beam finally * All but one of the subcam variables, some other stuff * Some variable names and cleanup * More cleanup * jumpSfxTimer -> landSfxTimer * actionState -> subAction and a little bit of syncing with Odolwa * A couple more variables sync * Buncha variables * Lots of non-whip variables * Commit what I have before starting on some of the grab stuff * All but one struct var done * Lots of header cleanup * Finish the header file * Fix build after merging main * Damage effect enums * Update damage effect enums for Incarnation and Wrath * Update damage effect enums for Mask and Remains * First pass at top damage effects * Do a few sub action enums so I have something to show * Fix the damage effect enums, clean up a lot of subaction enums * All remaining sub action enums, cleanup damage effect enums, other misc cleanup * Finish enums * Finish data * Push up what I have * Consistency * scroll -> texScroll * low hanging fruit * PR + small fix * Happy with >20% of functions * Happy with >40% of functions * Happy with >60% of functions * Happy with >75% of functions * Happy with >90% of functions * Happy with >95% of functions * Happy with `Boss07_Wrath_DeathCutscene` * Happy with `Boss07_Mask_FireBeam` * Happy with `Boss07_Wrath_CheckWhipCollisions` * Happy with everything but `Boss07_Mask_Draw` * Happy with all functions I think? * Clean up forward declarations * Write a half-decent file header * Fix after merging * Fix some minor stuff here and there * Minor fix in the file header because I forgot I renamed this * Respond to engineer's review * Respond to Anghelo's review * Replace as many actor lookups with for-loops as I can in Odolwa/Majora * Change the comment about the hookshot from a `@note` to a `@bug` * `drag` -> `deceleration` * Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam` * Use decimal numbers in the various `FillShadowTex` functions --------- Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: petrie911 <pmontag@Monday.localdomain> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: petrie911 <petrie911@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-09-19Remove include_data_with_rodata spec hack by incremental link of z_game_over ↵Derek Hensley
(#1691)
2024-08-27[Audio 6/?] Build Soundfonts and the Soundfont Table (#1675)Tharo
* [Audio 6/?] Build Soundfonts and the Soundfont Table * Fix bss * Maybe fix warnings * Improve lots of error messages * Suggested changes from OoT PR * Suggested changes * Make soundfont_table.h generation depend on the samplebank xmls since they are read, report from which soundfont the invalid pointer indirect warning originates from
2024-08-17[Audio 5/?] Build the Samplebank Table (#1674)Tharo
* [Audio 5/?] Build the Samplebank Table * OoT suggested changes * Fix format specifier * Moved linker_scripts files used in final linker to linker_scripts/final * Populate OTHER_DIRS with linker_scripts subdirs * Unhide the partial link command
2024-07-31EnBsb (Captain Keeta) OK (#1667)Derek Hensley
* Match EnBsb * A couple nicer matches * clean up * PR review * hitmark enum * PR Review 2 --------- Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
2024-07-28Misc Cleanup (#1665)Derek Hensley
* prefix in-function static data in z_scene_proc with s prefix in-function static data in z_eff_blure with s prefix in-function static data in Graph_TaskSet00 with s prefix in-function static data in Fault_SetOptions with s * Use uintptr_t in main * hardware_regs.ld * Remove some unessary blob comments * object_link_child_TLUT_00DA80 * object_kz texture and tlut * initialize typos
2024-07-28z_en_zl4 OK (#1663)engineer124
* match zl4 * cleanup
2024-07-24ovl_En_Knight OK (#1659)Tharo
* En_Knight matching * Cleanup * Fix * Documentation Pass * Suggested changes. Use IGOS_LIMB_* whenever it's guaranteed that the skeleton is gIgosSkel, still using KNIGHT_LIMB_* whenever it's ambiguous * Remove related undefined syms * More suggested changes * BODYPART_NONE and bodypart enum * Suggested changes * Braces Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * csCamId Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Various suggestions * EnKnight_UpdateLimbCollider -> EnKnight_SetColliderSphere * Yase/Debu -> Thin/Wide * csCam -> subCam * Format * Fix * animTranslation -> animMovement, dmgEffect -> drawDmgEff * More brackets Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> --------- Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2024-07-11More General Cleanup (#1658)Derek Hensley
* gDs2nEyeTexAnim * sEnMm2EmptyDL * object_um_Matanimheader_007D10 * object_mnk_Matanimheader_019A20 * gTurtleEmpty2TexAnim * object_iknv_obj_Matanimheader_0113E0 * object_botihasira_Matanimheader_001A48 * gTwinmoldEmptyTexAnim * gBeaverYoungerBrotherEmptyTexAnim * gNwcEyeTexAnim * gTwinmoldEmptyTex1Anim gTwinmoldEmpty2TexAnim * gGyorgEmpty1TexAnim gGyorgEmpty2TexAnim * gBurlyGuyEmpty1TexAnim gBurlyGuyEmpty2TexAnim * gKotakeEyeTexAnim * gDmZl4EmptyTexAnim * object_cs_Matanimheader_00F6D4 * gAnju1UnusedTexAnim * Empty blobs * EnKusa_IsUnderwater * IsUnderwater functions * s on static variable names in col check * scene_texture_01_Tex_002D40 * object_ds2_Tex_0030D8 object_ds2_Tex_0034D8 object_ds2_Tex_0038D8 * object_gk * undefined_syms * object_fall2_Matanimheader_005CF0 * gTwinmoldEmpty1TexAnim typo
2024-07-04ovl_bg_dblue_elevator OK and documented (#1654)TrulyNaN
* Creating branch for ovl_bg_dblue_elevator's PR. * OK * Screwing with my Debian install. Safety commit. * Applied first pass of review comments to PR and added authors. Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: AngheloAlf <angheloalf95@gmail.com> * Found some review comments I missed and applied the suggestions. * Added enum for water flow and renamed waterSurfaceYPos to waterSurfacePosY * Forgot to add last contribution. Co-authored-by: Tom-Overton <tom.overton@outlook.com> --------- Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: AngheloAlf <angheloalf95@gmail.com> Co-authored-by: Tom-Overton <tom.overton@outlook.com>
2024-06-23EnOkuta (Octorok and its projectiles) OK and documented (#1641)Tom Overton
* Match EnOkuta * Match data * Use the generated reloc * Delete extern stuff and format * Extract the DL * Fix lots of stuff * Copy a lot of names over from EnSyatekiOkuta * SFX enums * Lots more stuff * Constants and other stuff * Some more stuff I missed * Name more functions using OoT/SyatekiOkuta as reference * An easy function I missed * Some floats * Getter macros * Types enum * Name the cylinder inits a little clearer * Create bodyparts enum and name all data * Name all functions * Name `timer` struct var and all temps * Name the `jumpHeight` struct var * Create damage effect enum * Name the extracted DL * Name `numConsecutiveProjectiles` * Finish docs * Document XML * Clarify that this blue Octorok isn't the shooting gallery one * Respond to reviews * Stuff --------- Co-authored-by: Synray <31429825+Synray@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-20ovl_En_Death and ovl_En_Minideath (#1645)Tharo
* En_Death new build system edition * Fix merge * Matched * Fix merge * Some names * Suggested changes * Further suggested changes * Add value comments to MinideathAction
2024-06-14Small general cleanup (#1644)Derek Hensley
* m2ctx.py * check warnings * vimode includes * bgcheck includes * padmgr includes * sprintf * z_std_dma * sys_ucode * z64voice * z64lib * z64effect_ss * segment_symbols.h * padutils * main * stdarg.h * fault * bzero * undefined_syms * z64rumble
2024-06-01Even more general cleanup (#1640)Derek Hensley
* floats * obj_lightblock externs * Couple more floats * slime floats * undefined_syms * Move some tools to the tools folder * format * Update src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2024-05-17Change tooling for better elf correctness (#1632)Anghelo Carvajal
* Add addresses for makerom and boot segments * Mark entrypoint as the entry of the elf * Add extra labels to macro.inc * Use dlabel, jlabel and endlabel in disassembly * Make jlabel global * git subrepo pull tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "92b9ec72f" upstream: origin: "git@github.com:simonlindholm/asm-processor.git" branch: "main" commit: "92b9ec72f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * Use `dlabel`s for non-functions in .text * Add linker asserts * Move framebuffer_lo to before the makerom segment to avoid `dot moved backwards` warnings * fix * Improve assert message * fix * Third fix * Fix four * Move undefined_syms to linker_script folder * Make second linker script file to avoid abusing undefined_syms * Update Makefile Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Rename to extra.ld * Use entrypoint symbol on ROM header --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2021-08-03Overhaul the build system (#234)Tharo
* 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>
2021-07-28En_pamera is good to go (#222)Parker Burnett
* all functions decomped, just need the OK * ....5 differing words.... * Pamera OK * addressing PR comments, plus some documenting * addressing some of the comments * another small typo... * wrapping up PR comments
2021-07-28ovl_en_trt Ok and Documented (#225)Derek Hensley
* First pass: Matched everything but func_80A8E26C * Matched func_80A8E26C * Documented * Cleanup * Some renames * Update EnTrt struct * Move init chain out of the function * Change unreferenced rodata implementation * Texture stuff * PR suggestions from other PRs that apply here * Fix syntax error and other cleanup * add cutscene state enum * PR suggestions except color * Update src/overlays/actors/ovl_En_Trt/z_en_trt.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Trt/z_en_trt.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Trt/z_en_trt.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Better bitflags * Fix Co-authored-by: Derek Hensley <d.hensley@tempered.io> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-07-28En_Minislime OK and Documented (#231)engineer124
* Get Minislime code from Bigslime Branch * format * PR Feedback, add Damage Effects Enum, add +1 use of Room Coordinates Macro
2021-07-28ovl en sob1 OK and Documented (#224)Derek Hensley
* All but two match * format * Matched the last two functions * Merge updates * Bring data over as a comment * Brought data over * Cleanup and start documenting * Documented * Removed NON_MATCHING define * Actually save the .h file * Format and add items comment * Add comment * Add header to .c file * Cleanup * Rename EnSob1_GetGoodbyeBombShop * Update items comment * Final cleanup * Rename InitialUpdate * PR suggestions except enum for objIndices * Add todo about objIndices index enum * Change char to UNK_TYPE1 for padding * Textures and convert weekEvents to hex * PR suggestions * Format * Cleanup function declaration and add cutscene state enum * Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: Derek Hensley <d.hensley@tempered.io> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-07-27Reduce the amount of Overlays with rodata issues (#212)Anghelo Carvajal
* Player C file * Fix rodata issue in player and remove some actors that doesn't have rodata issues from the list * Check every asm with rodata issues * Add fishing relocs and change clang-format version to a generic one * undo clang-format version
2021-07-26En_hg Decompiled (#221)Parker Burnett
* starting on en_hg * working on another func * fixing some stuff in ghaka, and tweaks in en_hg * fixing some stuff * fixing state flags * all functions matching just data issues * en_hg OK * fixed to give OK * some docs, and fixes * fixing warnings * fixing some things * fixing warning * adding pr comments * fixing a typo
2021-07-26ovl_en_ossan OK and documented (#223)Derek Hensley
* Lots of progress, some came for OOT WIP * Some small cleanup * Fix merge conflict * Bring over updated z_en_girla.h * Fix merge error * some cleanup * fix msgcontext and add sfx ids * func_808AAB30 is ugly but it matches * Cleanup * More cleanup and matched func_808AA8E8 * Matched last two functions * Brought over data as a comment * Figured out data, but not late rodata * Document EnOssan * Cleanup * Added ShopItemIds * Cleanup * Switch left and right stick prompts * Remove testing NON_MATCHING define * Cleanup * Add header to .c file * Adjust header * Rename InitCutscenes to GetCutscenes * Cleanup * Cleanup before merge with upstream * More cleanup * Lower case Shopkeeper * More cleanup * More general cleaning * Found the late rodata issue * Format * Rename InitalUpdate * PR suggestions except texture stuff * Texture stuff * Rename Texture typedef to UNK_TEXPTR * One more rename * Remove * from TexturePtr arrays * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Derek Hensley <d.hensley@tempered.io> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-07-25ovl_en_suttari OK (#219)Derek Hensley
* Decomp pass * Fix merge conflict' * Convert damage table to new format * Cleanup function declarations * Some cleanup * Cleanup and minor docs * Add Header and Scene stuff * More light docs and cleanup * Rename one more function * Remove duplicate macro * PR suggestions except naviActor change * Change navi to tatl * Update include/functions.h Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Suttari/z_en_suttari.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Suttari/z_en_suttari.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-07-21`ovl_En_Ma_Yto`: Cremia OK and mostly documented (#209)Anghelo Carvajal
* EnMaYto_Update * init * func_80B8E84C * CURRENT_DAY and run format * a few other functions * symlink to diff.py * identify lots of functions * and more functions * small * and a bunch more * Another bunch * small * another bunch of functions * And so on * Another bunch * func_80B8E6E0 * func_80B8E938 * func_80B8EA38 * Fix conflicts * Another bunch * two functions * func_80B9083C * func_80B8FA14 * OK * Import data * params and a bit of function renaming * Minor reorder in object_script * Fix merge issues and warnings * Rename a few stuff * fix merge issues * And more renames * More renames * And moreeee * Almost everything renamed * Clock time and reformat * Fix merge issues and add some undeclared functions * Reorder alphabetically * run format * Minor styling stuff * review changes * Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Kenix's suggestions * engineer's suggestions * Run formatter * whoops Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-07-21EnTuboTrap and EnWeatherTag OK (#220)engineer124
2021-07-21Match Remaining En_Niw Functions (En_Niw OK) (#218)engineer124
* Niw OK * Fix snake case * PR Cleanup * Improve docs from PR suggestions
2021-07-21En_Bji_01 (Shikashi) OK and partially documented. (#217)rylieb
* EnBji01_Init OK and Partially Documented. * EnBji01_Destroy OK and Fully Documented. * func_809CCE98 OK and partially documented. * Removed goto in func_809CCE98(). * func_809CD6C0 matching and partly documented. * Pasted raw mips_to_c into EnBji01_Update(). * EnBji01_Update() matching and partially documented. * EnBji01_Update() matching and partially documented. * func_809CDA4C() matching and partially documented. * func_809CDA4C actually matching this time, and partially documented. * func_809CDB04() matching and partially documented. * func_809CD028() matching and mostly documented. * func_809CD6B0() matching. * func_809CD328() matching and partially documented. * func_809CCDE0() matching and partially documented, func_8013E950() prototyped. * func_809CD634() and func_809CD70C() matching and partially documented. func_801A5BD0() prototyped. * func_809CD77C() matching and mostly documented. All functions now matching. * Imported data from ovl_En_Bji_01_data.asm to z_en_bji_01.c. Updated object_script.txt and code_script.txt. Ran format.sh. Builds OK. * Documented all of the unks in Shikashi's struct. Build still OK. * Fixed new warning in Bg_Haka_Tomb resulting from my new prototype of func_8013E3B8(). * Renamed remaining instances of unk160 to cutscenes. * Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h Remove unnecessary comment about compiler padding. Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c Correct stack declaration spacing. Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h Remove unnecessary comment about compiler alignment padding. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c Remove unnecessary padding comment. Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Apply suggestions from code review Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Batch commit for comments during code review. * Apply suggestions from code review (trailing Us) Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Deleted exteraneous space at the bottom of En_Bji_01 struct in the header file. * Used params enum for switch cases. * Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h Co-authored-by: Parker Burnett <burnettparker@gmail.com> * Apply suggestions from code review replacing magic numbers with limb enums Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Renamed func_809CD328 to EnBji01_DialogueHandler per code review. Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Parker Burnett <burnettparker@gmail.com>
2021-07-20EnClearTag OK and documented (#214)engineer124
* merge main * Match Init * Clear_Tag OK * Full documentation * More docs * Fix function * Fix MakeFile for assets and Fix texture swapped names * Fix name * Improve name and remove pad * Can't stop the minor tweeks * Adding potential Makefile fixes * Minor name change * Another name fix... and format * PR Suggestion & Add Overlay File Description * Re-documentation to match OoT WIP (more to come) * Finish docs from OoT * Fix merge and format * Minor touch-ups * Cleaner conditional
2021-07-19AudioMgr OK and Mostly Documented (#208)engineer124
* AudioMgr OK * Cleanup * Improve naming from PR Feedback
2021-07-19Ovl_En_Fsn Ok and Documented (#204)Derek Hensley
* First decomp pass: Matched everything w/ data * Minor cleanup of func_80AE2F78 * Documented * Format * Some cleanup and PR suggestions * Format * Add the word player to a few functions to specify it is the player trying to buy * Add controller macros * Move common shopkeeper defines * name unk274 and add note to unk27A * Remove macros and just use flag defines * Convert Controller Macros to take globalCtx * Fix merge conflicts
2021-07-19z_quake OK and documented (#213)engineer124
* Create z_quake.c file * Match all quake functions with OoT counterparts (quake2 left) * z_quake OK * Document first half of quake * More docs * more cleanup * remember to format! * PR Suggestions * More PR Suggestions
2021-07-17en_invadepoh OK (#200)kyleburnette
* Applied changes to master on new branch * some docs * minor change * Slight improvement to last draw func * Got rid of all warnings * Removed extra text file * Readded warnings text file * Fixed warnings text file * Some cleanup, added engineer's new matched functions! * Marked non-equivalent functions as such * Improved last draw func (still non-equivalent) * Made most of anghelo's suggested changes * Slightly better code for func_80B4A350, though it's not matching still * Engineer matched 2 funcs so I'm pushing those * Added a function from engineer and one of my own * Fixed warning * Slightly better code for func_80B44C80 * Slightly better code for func_80B44C80 * Matched func_80B44C80 * Pushing engineer's matched draw func. All rodata funcs matched! * Build NOT OK - rodata. Pushing anyway because I did a lot of work and it's close * Build NOT OK (see previous commit) - func_80B440B8 matched * Build NOT OK (see previous commit) - func_80B43BC8 matched * All funcs matched! Build not OK still though * almost ok * OK now * Fixed some warnings * Fixed more warnings * More warnings work * Fixed all warnings (I think) * Fixed all warnings (I think) * Moderate amount of cleanup * More cleanup * More cleanup and some slight documentation * Decent amount of documentation * More documentation * Fixed build (forgot to replace one struct member) * More documentation and cleanup * Fixed merge conflict, added binang_sub macro usages, and otherwise added most of the suggested changes f git commit * Organized things a bit, added a few more CLOCKTIME macros * Added extra output to timeconvert.py * Formatting * Made all suggested changes * 'Downgraded' timeconv script to version without seconds * Added a macro for part of the params usages plus an enum * Actually fixed header file (didn't save before) * Renamed milk get item in enum * Fixed GI enum update Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: Zelllll <elilee968@gmail.com> Co-authored-by: angie <angheloalf95@gmail.com>
2021-07-15C file for Fishing, some changes to collider scripts, a few minor cleanups ↵EllipticEllipsis
(#210) * Improve match in EnFirefly_Draw * Vestigial fishing files, add enums * Improve scripts, add ColChkInfo one * Some minor actor cleanup (static etc) * C file for Fishing, remove some local vars from variables.h * Remove comma and format * Newline * Review suggestions
2021-07-15ovl obj raillift OK and Mostly Documented (#201)Derek Hensley
* First pass: matched everything with data * Better matching of data and ObjRaillift_Init * Documented * Added clarifying comment * Change 0 and 1 to false and true for isColorful * PR Comments * PR name suggestions Co-authored-by: Derek Hensley <d.hensley@tempered.io>
2021-07-13En_Guruguru OK and partially documented (#203)kyleburnette
* En_Guruguru OK and partially documented * Renamed texture arrays * Made text ID array static * Made most of the suggested changes
2021-07-13Match Remaining Obj_Lightswitch Functions (Obj_Lightswitch OK) (#207)engineer124
* Obj_Lightswitch OK * Minor improvement * PR Cleanup
2021-07-13en_baisen OK and mostly documented (#205)kyleburnette
* en_baisen OK and mostly documented * Fixed warning * Made all suggested changes
2021-07-13z_olib.c OK and Documented (#202)engineer124
* z_olib.c OK * Clean-Up Clamp * Take out extra space
2021-07-13`ovl_En_Ma4` matched and mostly documented (#199)Anghelo Carvajal
* First pass * limbdraw * another one * lots of stuff * stuff * big one * func_80ABEB6C * The NON_MATCHING that matches in reality * "Fix" some cases * Fix merge issues * fix func_80ABF254 * match a pair * func_80ABF7C8 * func_80ABE1C4 * func_80ABF354 * func_80ABF534 * Import data * Limb fixes * Minor renames * Fix merge issues * A few renames * Rename half the functions * More renames * More renaming * documentation finished * Format * fix typo * whoops * Fix merge issues * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update variables names Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-07-08ovl_Obj_Ending Data brought over (#196)Derek Hensley
* ObjEnding Matches but with unkStruct and no data * Removed inital code comments * Added data as a comment * Add missing semicolon * Addressed PR comments * Added data * Cleanup * Some documentation * Change 0 to NULL * Remove redundant array size * Cleanup * Fix Format * Rename D_80C25CE0 * Change this to thisx for indexing sGraphics * Change this to thisx * PR suggestions * rename graphics Co-authored-by: Derek Hensley <d.hensley@tempered.io>
2021-07-05Document most of global context (#198)Zelllll
* doesn't build for some reason..? * some formatting fixes * windows calculator is trash * fix! * fix2 * most of global context documented * interfacectx * hopefully fix interface * document restrictions * envCtx done * revert accidental change * fix * pause ctx done * fixxxxxxxxxxxxxxx * remove unintended zapd change * fix..? * format files * Update include/z64.h Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * ocarinstaff * Update include/z64.h Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update include/z64.h Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * suggestions * fix mistake in pausectx * typo * door context * renames * all nb removed * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * fix kanfont, new docs * format files, merge master * fix typo in linker script * extract asm properly * door context rename * fixes in door context Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-07-05EnFirefly OK and mostly documented (#194)EllipticEllipsis
* Data imported, 8/30 functions done * OK * Delete ASM references, add SFX * Named functions * more naming * Type the nop ActorFunc correctly * A couple more bits of documentation * Sorted object_script * Merge remote-tracking branch 'upstream/master' into Firefly * format * Update other includes * Review suggestions * Review changes; named Actor_Noop * Format
2021-07-01En_Niw (Cucco) (#191)Isghj
* EnNiw: Rebase of WIP to work on collsion init almost matches EnNiw: WIP EnNiw: running low, and too many not-matches for my liking EnNiw: WIP 3 * EnNiw: update to master * EnNiw: fix late rodata * wtf is going on * EnNiw: update is a thing, glad I'm doing it last * EnNiw: likely branch mysery * EnNiw: a horrible little draw function * EnNiw: nope, feather draw still fucked * EnNiw: fixing merge issues with master * EnNiw: update is no longer non-matching * EnNiw: cleaning/docs * EnNiw: cleaning/docs 3 * EnNiw: more docs 4 * EnNiw: OKs again now that data was removed * EnNiw: Docs and cleaning 5 * EnNiw: Docs and cleaning 6 * EnNiw: Docs/cleaning and changed a function and that changed a bunch ugh * EnNiw: format and make check * EnNiw: data re-merged, and matches * EnNiw: forgot about these * EnNiw: another attempt at feather draw, still not even close * Multiple: now that we know the last paramter is a flag, change all to hex * Player: fix wrong padding * EnNiw parameter name consistency Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c REG Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnNiw: Likely suggestions first easy suggestions first, then I'll attempt the stuff I'm not sure will match Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnNiw: compiling again * EnNiw: more suggestions added * EnNiw: last of minor changes * EnNiw: shorten overly long float * EnNiw: feather counts as define * EnNiw: add c file description * EnNiw: Some Suggested Changes Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * EnNiw: more suggestions * EnNiw: More suggestions Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * EnNiw: moved OPEN_DISPS to contentional location, still not close * BgIcicle/EnSb: renamed func_800B78B8 to Actor_UpdateBgCheckInfo Co-authored-by: isghj8 <isghj8@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 13:35:47 +0000