summaryrefslogtreecommitdiff
path: root/linker_scripts/object_script.txt
AgeCommit message (Collapse)Author
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-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-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-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-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-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-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-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-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>
2021-06-28En_sb Documented and OK (#192)Parker Burnett
* en_sb OK * fixing pr suggestions * naming final struct members * undoing a name, leaving it unknown
2021-06-28BgIcicle OK and mostly documented (#180)EllipticEllipsis
* remove ZAPD submodule * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "ca229f19" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "ca229f19" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter subrepo: subdir: "tools/decomp-permuter" merged: "1e4b85a7" upstream: origin: "https://github.com/simonlindholm/decomp-permuter.git" branch: "main" commit: "1e4b85a7" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Remove asm-differ * git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ subrepo: subdir: "tools/asm-differ" merged: "eaf72269" upstream: origin: "https://github.com/simonlindholm/asm-differ.git" branch: "master" commit: "eaf72269" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove asm-processor * git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "85288fcd" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "85288fcd" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove .gitmodules file * Update REAMDE * OK * Import data * Begin naming * Delete asm references * Main type enum * Rename in functions.txt * Review changes Co-authored-by: angie <angheloalf95@gmail.com>
2021-06-26obj_hgdoor OK and partially documented (#190)kyleburnette
* obj_hgdoor OK and partially documented * Made unused variables static and ran formatter * Made all suggested changes * Made all suggested changes
2021-06-18bg_haka_tomb OK (#188)kyleburnette
* Formats files and updates functions.h * Made all suggested changes * Fixed new warning
2021-06-15bg_iknin_susceil OK (#186)kyleburnette
* 6 functions left * All but one function matched * all functions decomped * Formatted files * Added switch flag define * Made all suggested changes
2021-06-15iknv_obj ok (#183)kyleburnette
* iknv_obj ok * Documented a few more functions and updated type enum * Added engineer's changes * Changed negations at engineer's request (casts required) * Changed negations at engineer's request (casts required) * Got rid of extra parentheses Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-11z_bg_tobira01 OK (#168)Zelllll
* data merge * two funcs * one left * actor OK * file done * fix warnings with jenkins * Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update z_bg_tobira01.c * Update z_en_encount2.h * Update z_obj_bell.c * Update z_en_pametfrog.c * Update z_en_minifrog.c * Update include/functions.h Co-authored-by: Zach Banks <zjbanks@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Zach Banks <zjbanks@gmail.com>
2021-06-10ovl_en_in OK (#173)Derek Hensley
* First pass, 5 still non matching * data * cleanup * Progress on func_808F33B8 * func_808F33B8 is ugly but it matches * func_808F5728 ugly but matches * cleanup * More cleanup/doc a possible inifite loop bug * Cleanup of the switch * Readd functions returns * More progress on THE switch * Everything matches but the MACROS * OK * Add new global Animaion struct * fix arg name * PR suggestions pt 1 * PR suggestions pt 2 * Fix up a few things * Add comment about walking flag * update functions.txt * Update 7 to more explicit bits * More PR cleanup
2021-06-10Ovl_En_Pametfrog OK with partial documentation (#165)engineer124
* Init, 14 of 70 decompiled * En_Pametfrog 26/70 functions decompiled * 35/70 funcs * Fully Matching! * Documentation * Fix merge from master * PR suggestions * minor improvements * Fix functions.h * Oopsie * Oopsie Part 2 * Remove Pametfrog from split_asm.py rodata_excluded * Better use of MACROS + animation docs Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-06-10Obj_ghaka OK (#171)Parker Burnett
* getting ghaka started * two more matching funcs * functions all match, but no OK...yet.... * some clean up stuff * uhhh lets try this? * fixing save context stuff * z_obj_ghaka OK * fixing small changes * adding in new suggestions * fixing error
2021-06-09Ovl_En_Minifrog OK with partial documentation (#166)engineer124
* En_Minifrog first few funcs decompiled * more matching * En_Minifrog 3 non_matching functions left * two functions left * Start Documentation * Fully Matching! * Documentation * Fix merge with master * minor pr changes * Minor improvements * PR Suggestions + Minor docs * Fix bool * PR suggestions Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-06-09Obj_Kibako OK (#169)Nick
* Clean dist. * ovl_Obj_Kibako OK * Run clang-format * Suggested changes. * Suggested Changes * Consistency change. * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * PLAYER macro * Suggested Changes * Suggested Changes Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-09ovl_dm_char07 OK (#172)Derek Hensley
* Dm_Char07 Ok * Cleanup * Documented * Add small documentation to en_toto and run format * Better documenting of spotlight flags * PR suggestions
2021-06-09`ovl_En_Ma_Yts` OK and partially documented (#164)Anghelo Carvajal
* destroy * moar * limbdraw * some setups identified * func_80B8D6F8 * func_80B8E0BC * fix unmatching * func_80B8D12C * func_80B8D1E8 * func_80B8DBB8 * some renaiming * some renaimings * symbols * small renaming and a few functions * Almost every function done * lots of renames * Fix merge conflicts * misc notes * struct_800BD888_arg1 * some renamings and enum * func_80B8D2D8 * func_80B8DA28 * import data and cleanup * format * minor changes * Documentation pass * update enum name * Remove object XML * run format * Move EN_MA_YTS_PARSE_TYPE to header * fix conflicts * Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * move struct to z64animation * Change PARSE_TYPE macro to accept actor param * format Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-06-02Z_obj_bell Matching (#167)Parker Burnett
* ringing in the bell * another matching func * stuck on func_80A357A8, needs a z_actor func... * no luck on a fix, but got further... * matched func_80A357A8, one left * might be on the right track? saving progress... * getting closer * pushing up matching, it has warnign regarding Vecs * all functions matching * obj_bell OK, time for bed * prepping for PR * fixing suggestions
2021-06-02Ovl_Obj_HsStump Ok but one function does not match (#156)Derek Hensley
* Everything matches but func_80BDABCC * Better names, still stuck on func_80BDABCC * Some cleanup * Add param macros and document not matching * format * PR suggestions * Bring over data to c file * Retry Jenkins * Retry Jenkins take 2 * PR suggestions for comments * PR comments
2021-06-02Ovl_En_Toto OK (#163)Derek Hensley
* Lots of progress * OK * Removed casts * Run format.sh * cleanup * More cleanup * Minor Doc * More cleanup * Format * Add header description * PR comments * Convert raw pointers * Update to new gSaveContext * PR suggestions
2021-06-02Ovl_Dm_Nb OK (#162)Derek Hensley
* match but func_80C1DF18 * Everything matches * Add comment about unknown pointer * Rename vars * Update comment * format * Added header description * Remove raw pointer * Remove unnecessary foward declarations * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-05-25ovl_Obj_Milk_Bin OK (#161)Anghelo Carvajal
* First pass * second pass * Everything matches now * Fix ori * final pass * Add description * Fix warnings (I hope) * move dlist to top of the file * Fix conflicts
2021-05-22Ovl_En_Fg OK (#133)engineer124
* En_Fg Frogs 9/18 decompiled * En_Fg Frogs One Non-Matching * documentation and cleanup * final matched function * code_script * whitespace * Fixed some mistakes, EnFg_UpdateDust no longer matches? * fixed nonmatching * Minor fixes and documentation * PR suggestions * Fixed genericHeader rename to common * Fix Warnings * PR Good Documentation Suggestions * update names * more pr suggestions Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au> Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-05-20ovl_Bg_Ladder: OK (Wooden Ladder) (#135)Zach Banks
* ovl_Bg_Ladder: OK (Wooden Ladder) * Change sLadderDLists type; add comment about thisx * Add macros for BgLadder params; rename object symbols
2021-05-20Obj_moon_stone Matching (#154)Parker Burnett
* most all matching, just one func left * forgot about the object script * Moon's Tear OK * fixing suggestions * fixing actor pointers
2021-05-20Ovl_Bg_Ctower_Rot Ok (#149)Derek Hensley
* Ovl_Bg_Ctower_Rot Ok * Move enum to h file * Rename D_808E2564 to bgCtowerRotDlists * Rename D_808E2564 to bgCtowerRotDlists take 2
2021-05-19ovl_En_Torch2 OK (Elegy of Emptiness Shell) (#130)Zach Banks
* ovl_En_Torch2 OK (Elegy of Emptiness Statue) * Identify dlists; address PR comments * Rename object segment symbols
2021-05-19Ovl_Obj_Tokei_Step OK (#122)Derek Hensley
* Everything matches but func_80AD6508 * Changed func_80AD6508 to non_matching * Some cleanup * Everything matches * Finished cleanup and documentation * Updated BgMeshHeader to Collision Header * Add newline * Update functions.txt * Better function names * format * Better naming
2021-05-18`ovl_Eff_Dust` OK (#136)Anghelo Carvajal
* some easy functions Signed-off-by: Angie <angheloalf95@gmail.com> * init is cursed Signed-off-by: Angie <angheloalf95@gmail.com> * func_80919230 is weird Signed-off-by: Angie <angheloalf95@gmail.com> * I'm dumb Signed-off-by: Angie <angheloalf95@gmail.com> * func_80919768 nonmatching Signed-off-by: Angie <angheloalf95@gmail.com> * everything is wrong Signed-off-by: Angie <angheloalf95@gmail.com> * This thing still doesn't want to match Signed-off-by: Angie <angheloalf95@gmail.com> * improved a bit Signed-off-by: Angie <angheloalf95@gmail.com> * a bit of renaming, but it still doesn't work Signed-off-by: Angie <angheloalf95@gmail.com> * almost matching * func_80919768 ok * func_809199FC ok * init was dumb * add enum and other minor changes * run format
2021-05-13Ovl Bg_Ctower_Gear OK (#123)Derek Hensley
* BgCtowerGear OK * Added description header * Updated functions.txt * Added MACRO to get type * Renamed init chains to match tyype * Added one more use of Macro, and addressed PR comment * Fixed data copy error and better naming
2021-05-09EnEncount2 (Majora Baloon in Bomber's Hideout) (#108)Isghj
* EnEncount2: start * EnEncount2: got some easy functions down, but now I have a really weird unk struct * EnEncount2: draw function nowhere close * EnEncount2: cleaning/docs * EnEncount2: removed bad function attempt * EnEncount2: function name change to match mster changes * EnEncount2: corrected old BgMeshheader to CollisionHeader * EnEncount2: requested changes * EnEncount2: forgot to add these requested changes * EnEncount2: requested changes Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09En_Ginko_Man (Bank Teller) (#118)Isghj
* EnGinkoMan: init * EnGinkoMan: more matches * EnGinkoMan: that's closer at least * EnGinkoMan: better control flow at least... * EnGinkoMan: docs * EnGinkoMan: more docs * EnGinkoMan: more docs 2 * EnGinkoMan: cleaning * EnGinkoMan: missed something in savecontext * EnGinko: requested changes and further docs Co-authored-by: isghj8 <isghj8@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 01:40:46 +0000