summaryrefslogtreecommitdiff
path: root/src/code
AgeCommit message (Collapse)Author
2021-09-29Main OK (#329)EllipticEllipsis
* Main OK, use defines where known * Couple more defines * Tharo's review * Fix lifemeter bss
2021-09-28`ovl_select`: ZELDA MAP SELECT matched and documented (#310)Anghelo Carvajal
* basic functions * errr * Progress, kinda * func_808016E8 * func_808019FC and func_80801A64 * Import data * Format * some progress * func_808013B8 * func_80801620 * fix stuff * func_80800930 * improve func_80800A44 a bit * At least it is equivalent now * matches! * small renames * Use generated reloc * move functions * Renaming a lot of stuff * Some functions renames * Rename members * Add translations for everything * Run formatter * Update include/alloca.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * review changes * review comments * Update src/overlays/gamestates/ovl_select/z_select.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/gamestates/ovl_select/z_select.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-09-27sys_math, cosf OK and documented, sinf, coss, sins documented (#289)EllipticEllipsis
* OK, data imported, document * spec * Match cosf, document sinf and cosf * Some more documentation, switch fu back * Format * Little more documentation * Document coss too * Move macros * Review, add some .s * Fix headers, review
2021-09-22`ovl_daytelop` OK (#277)Anghelo Carvajal
* eeeee * nonequivalents * draw * Import data * Match Daytelop_LoadGraphics * draw kinda better * extract daytelops and gameover * SEGMENT_ROM macros * Use extracted symbols for daytelop * match Daytelop_Draw * Fix bss * draw cleanup * Daytelop_Update from non equivalent to non matching * Some renames and spec * Run formatter * enum * sfx * Use SEGMENT_ROM_START macros everywhere * more macros * run formatter * Add description * update variables.txt * Remove extra stuff in gbi.h * Would this fix it? * and again * whoops * Apply suggestions from code review Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Tharo's suggestions * match Daytelop_Update * run formatter * fix merge issues Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-09-02En_Kgy (#244)Maide
* En_Kgy * NBS * PR * PR * PR
2021-09-01En_Holl (Loading Halls/Holes) OK and mostly documented. (#270)rylieb
* EnHoll_Destroy() matching. * EnHoll_Update() matching. * EnHoll_Draw() matching and mostly documented. * func_808999B0() matching and mostly documented. * En_Holl OK (some asm remains) * Renamed macros. * func_80899B88 matching, but control flow could use some work. * Got rid of GOTO in func_80899B88. * Removed as many returns and magic numbers as currently possible. * Renamed previous two functions to EnHoll_ChangeRooms and EnHoll_VisibleIdle. * EnHoll_SetAlwaysZero matching. * EnHoll_TransparentIdle matching. * func_8089A0C0 matching and mostly documented. * func_8089A238 matching and mostly documented. * Deleted last GLOBAL_ASM pragma. * Final documentation for En_Holl PR. * Switched spec to generated reloc. * Clean up macros. * Rename functions. * Simplify name of ActionFunc array. * Renamed globalCtx->unk_18878 to bgCoverAlpha. * Ran format.sh. * Added c file header. * Update src/overlays/actors/ovl_En_Holl/z_en_holl.c add trailing comma to sActionFuncs[] Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_En_Holl/z_en_holl.c replace UNK_TYPE with s32. Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Run format.sh. * s32 pad and declaration formatting * Remove comma in EnHoll_TransparentIdle. * Renamed sThis to sInstancePlayingSound. * renamed gfxP to dl * Improved affine transformation documentation. * ran format.sh * Updated documentation to be doxygen compatible. * Extracted assets. * fix bss * Update src/overlays/actors/ovl_En_Holl/z_en_holl.c replace bitmask == 0 with ! Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Rename extracted asset variables. * Renamed argument to macro functions to match .c * renamed Vertices to Vtx. * Renamed Vtx and DL. * Update src/overlays/actors/ovl_En_Holl/z_en_holl.c Shorten documentation. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Apply suggestions from code review Newline changes for readability. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Holl/z_en_holl.c * Update src/overlays/actors/ovl_En_Holl/z_en_holl.c Change oldCurrRoom to tempRoom. * Apply suggestions from code review engineer124's suggestions Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-09-01EnBigpo (Big Poh) (#250)Isghj
* EnBigpo: start * EnBigpo: uhh, this struct is weird * EnBigpo: progress * EnBigpo: so many of these functions are tiny * EnBigpo nasty four loop function * EnBigpo: hate draw functions * EnBigpo: all functions attempted * EnBigpo: data migrated, does not OK, 2 bytes off... * Multi: Attempting to OK, issues * EnBigpo: more docs * EnBigpo: more docs2 * EnBigpo: more docs and cleaning * EnBigpo: removed data to try to find the issues, matched a draw function thanks to Tharo * EnBigpo: progress? maybe not * EnBigpo: matched another function * EnBigpo: overwrite limbdraw matches now * EnBigpo: one more nonmatching rejected * EnBigPo: not actual progress, probably * Match Init, down to single stack pointer on second func * EnBigPo OK * EnBigpo: docs and cleaning * EnBigpo: more docs and cleaning * EnBigpo: back to OK with no warnings * EnBigpo: more docs and cleaning * EnBigpo: docs and cleaning * EnBigpo: hmm, rename_sym doesn't like renaming system functions but I'm 98% sure I know what these are * Multiple: changed some function names, maybe changed too much... hmm * EnBigpo: even more changes to docs * EnBigpo: formater pass * EnBigpo: small fixes * EnBigpo: c file description * Apply suggestions from code review Apply camera suggestions from eng124 Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: updating all requested changes and reverting one incorrect macro * Apply suggestions from code review Some of eng124's recommendations, need to add the last by hand Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: back to OK * EnBigpo: Minor cleanup changes * Functions fixed: added function changes to actorfixer and fixed dinofos * EnBigpo: BINANG_ROT180 * Apply suggestions from code review First batch of requested changes, the simpler ones that shouldn't require checking Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * EnBigpo: fixes to recommended changes, back to OK * EnBigpo: move idleTimer docs out of struct * Sprite: removed old commented out pragma, it matches, I still dont get it * EnBigpo: more changes I had to check first * EnBigpo: more requested changes, and some macro uses found * EnBigpo: forgot a requested change * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigPo: missed a disphead array access * Apply suggestions from code review More requested changes Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: more hex to dec * EnBigpo: more hex to dec 2 * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: build being weird * EnBigpo: weird, rename_sym didn't catch this earlier * Tools: fixed actorfixer to use Play_CameraSetAtEye forgot I blew this change away trying to get build again, * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * EnBigpo: cutscene functions changed name to indicate they are stages * EnBigpo: Rename Particles to Effect * EnBigpo: changed draw function names, changed function comment format * EnBigpo: renamed limbdraw functions, formater pass Co-authored-by: isghj8 <isghj8@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-08-18z_construct OK (#267)EllipticEllipsis
* z_construct OK * Rename
2021-08-18Migrated a lot of `boot` bss, matched a few NON_MATCHINGs in `boot` (#266)EllipticEllipsis
* Import bss to boot_main and idle, match last function in idle * Some pointer cleanup in idle, spec * Clean up idle, add build.c, add bss to CIC6105 * Import rand bss * sptask bss and a macro * sptask updated to use libultra macros * siacs.c bss * Macros in CIC and idle * controller bss * seteventmesg bss * spec * pimgr and piacs bss * initialize OK, threadsave, initialize, pimgr bss * Match DmaMgr_Start * Fix bss reorder using separate file * Small cleanup of hex/dec in buffer sizes * Add comment, remove unused bss from spec * Merge remote-tracking branch 'upstream/master' into boot_bss * Format * Delete files * remove commented-out structs * Bit more cleanup * Addressed reviews * Format
2021-08-18`system_malloc` OK (#261)Anghelo Carvajal
* move system_malloc to boot_O2 * Rename StartHeap into SystemArena * match * fake system_malloc data * fix return types * Rename Alloc to Malloc * Update tools/disasm/files.txt Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * fix spec Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-15z_lifemeter (#247)Andzura
* z_lifemeter done. * fix new warning I didn't saw. add variables.txt * suggested changes * add new texture ptrs to undefined_sym, changed heartTex & temp to TexturePtr in LifeMeter_Draw * change hex literal to decimal and other small suggestions * change bool to u32; change hexa literal to decimal in LifeMeter_IsCritical; renamed undefined sym to their D_02 addresses * re-applied format.sh on z_lifemeter * coding style fixes * fix typo in undefined_sym * named func and vars. * changed modulo check * add extra line after var declaration in LifeMeter_Draw Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * changed unkTimer to camelCase; timer constant as decimal; flip some comparison in LifeMeter_Draw * uncomment & rename func_ in functions.h * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Andzura <andzura@andzura.fr> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-08-15Color_RGBAu32 (#253)Derek Hensley
* Renamed deprecated RGB5A1 to RGBA16 * Cleanup shopkeeper structs with Color_RGBAu32 and Vec3f * Rename functions with RGB5A1 in them * BSS fix
2021-08-08z_face_reaction OK (#255)Anghelo Carvajal
* match function and split data * import data * Rename function and variable * format data * Fix data * { 0 } * Update src/code/z_face_reaction.c Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com> * Rename return variable in en_ossan * textId * Rylie's review * Try to format this properly * Format again Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>
2021-08-08Script fixes, Type 1 cylinders fixed, rename `main` (#256)EllipticEllipsis
* Fix actor_symbols.py * Temporary fix to rename_sym.sh * Fix the few Type1 cylinders * Rename main -> Main * chmod rename_global_asm, fix asm in rename_syms * Format
2021-08-08Daiku2 (#228)Maide
* Daiku2 * PR * Macros * NBS * PR * Format
2021-08-07sched.c OK (#248)Tharo
* sched * Minor fixes * Format headers in the ultra64 folder, bitshifts in defines * Fix PI_STATUS_ERROR * Update variables
2021-08-06En_Dinofos (#235)Maide
* En_Dinofos * PR * NBS * PR * PR
2021-08-04Fix gcc warnings (#246)Anghelo Carvajal
* fix a huge amount of warnings * fix another big bunch * fix remaining warnings * Run formatter
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_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-26Matched func_8012EF0C and correct D_801C2380 (#227)EllipticEllipsis
* Match func_8012EF0C and correct D_801C2380 * format * Review suggestions
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-17Introduce DamageTable formatting and macros (#211)EllipticEllipsis
* 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 * Fix colchkinfoinit, add damage_table * DMG macros, format existing DamageTables * Convert preset damage tables to new format
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-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-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-01z64player.h and Player struct work (#195)EllipticEllipsis
* Rename Player, name some of its struct vars, add collision flag macros to actors missing them * Name Player_GetMask/RemoveMask, add a few macros * Format * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Fix unk_14B in a non-matching Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
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-17Add current missing functions prototypes (#181)Anghelo Carvajal
* First bash * Another batch * Another bunch * Update actorfixer * run format * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Suggestion * context renaming * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Fix renamings * fix Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-15ovl_En_GirlA OK and documented (#182)Derek Hensley
* EnGirlA Matches * Convert func to boolean * Cleanup * missed a little cleanup * Update with new MACRO * revert z_en_item00.c macro, and add one more macro * Documented * Format macros.h * Fix VTX format * rename isBought to isOutOfStock * PR suggestions * Document a bug * PR comments
2021-06-11Importing Sound Effects from MM3D (#179)engineer124
* Add sfx & update Audio_PlayActorSound2 * more sfx * Match Enemies sfxId * Update with PR * Update sfx for new pr * Fix commit
2021-06-10effect_soft_sprite matching! (#177)engineer124
2021-06-10Match z_effect.c (#176)engineer124
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-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-25partially finish `code_0x8012EC80`, document all of gSaveContext (#138)Zelllll
* not ok, why? * OK! * fix data * finish data etc * work on save context * save finished * first func done * roomInf * done for now * add missing file * add most og names for struct members * fix accidental change * Update z_en_ginko_man.c * Update z_scene.c * maybe fix stuff hopefully * proto * sasa * Update include/z64save.h Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update z64save.h Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-20General Cleanup (#155)engineer124
* minor fixes * Consolidate into globalCtx * fix error * Fix Warnings Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-05-20Misc fixes (#159)Anghelo Carvajal
* Fix `extract_assets` not properly checking if scenes files were updated * fix `first_diff.py` path due to the baserom renaming * FlexSkeletonHeader and other stuff * fix some SkeletonHeader instead of FlexSkeletonHeader * Add blob compilation to makefile * CURRENT_DAY and type swaps * Remove extra cast * run format * zbanks suggestions
2021-05-19z_view matching (#134)Zach Banks
2021-05-18code_0x8017FEB0 OK (#137)Anghelo Carvajal
* almost every function * atans ok * import data and rodata * format `atan_first_8th_array` * fix signature and rodata * rename to angle * Rename the functions to match their OoT counterparts * rename code_0x8017FEB0 to sys_math_atan
2021-05-18Fix all warnings raised by IDO (#152)Zach Banks
* Fix all warnings raised by IDO, ignore trailing commas * Set -woff=624,...; keep const in printf functions * Remove redefined macros in irqmgr.c * Remove DECR macro & reformat * Address PR comments from AngheloAlf
2021-05-18Format everything (#141)Anghelo Carvajal
* Add trailing comma * Run format and add some missing trailing commas * Enforce the same clang-format version for everybody * z_en_m_fire1
2021-05-09Scene Changes (#114)Zelllll
* match function * major cleanups * rename switch functions * use graph_alloc to fix fake matches * more documentation * more matches, lots of changes * lots more work * format * Update z_scene_proc.c * very hard lagrange interpolation function OK! * remove any remaining * documentation done, only two functions left * a few more things * one function left! * document another oot leftover * last function decompiled, not matched yet * scene_proc complete * start work on z_scene * done with z_scene * remove unessecary typedefs * fix some things to remove warnings * Add z_scene_table and decomp data * Delete ctx.c * add draw cfg enum * cleanup * most scene table functions done * done for now * all scene files done * Update include/z64scene.h Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * add missing macros * fix some renames * scene texture file rename * added temporary structs so it still builds * more structs * even more old structs * fix boyo * should fix compile error * lets hope nothing broke * ub comment back Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-01(Mostly) Decompile PreRender.c (#105)Zelllll
* start prerender * match func_8016FDB8 * fix fake af match * actually add prerender * Delete ctx.c * test * lots of oot transfers * lots of new functions done * match even more functions * slowly thread functions * two prerender functions left * some docs * make names more consistent with oot * ready for pr? * Update PreRender.c
2021-04-29Adds in scene support (#117)Kenix3
* 1 scene done, Z2_SOUGEN OK * All scenes OK * Makefile improvements * Use WIP ZAPD branch as submodule * Add spawn rotation flag macro * Fix bad merge * Move scenes to be in their own subfolders * Rename and restructure extracted baserom files * Progress tracking for assets * Add asset progress to csv * Use master ZAPD * Use distclean like in OOT * Fix up a few things with the makefile * Fix scenes not being dumped from ELF Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
2021-04-19sys_slowly OK (#101)Rozelette
* sys_slowly OK * Feedback * rename type member