summaryrefslogtreecommitdiff
path: root/src/code
AgeCommit message (Collapse)Author
2022-01-11`__osMalloc.c` OK (#395)Anghelo Carvajal
* __osRealloc * match __osCheckArena * cleanup * Import bss, unreferenced strings and cleanup * format * Reviews * Move convert.h to ultra64/ * Make the os_malloc.h header * potato * renames and fixes * format * small doc pass } * format * minor changes * Introduce system_malloc.h * Docs pass * fix * format * stuff * Apply suggestions from code review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * review * format * remove repeated sentence * Apply suggestions from code review Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * include headers * review * Rename __osMallocAddHeap * remove @brief * Update src/boot_O2/__osMalloc.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-11Merge branch 'master' into voiceengineer124
2022-01-11Merge branch 'master' into parameterengineer124
2022-01-11Merge branch 'master' into parameterengineer124
2022-01-11z_sound_source OK (#353)engineer124
* z_sound_source OK * Fix Pos * Lib_PlaySfxByPos * Change function names * format * Update names to match OoT * cleanup from the merge * Fix name
2022-01-10`z_actor` with some documentation, with 1 NON_EQUIVALENTs (#401)Anghelo Carvajal
* Match Player_GetHeight * Another bunch * Fix merge conflict * rename Gfx_DrawDListXlu * add WEEROR * Actor_Spawn * almost Actor_SpawnTransitionActors and Actor_Delete * A bunch of small actors * More renames * format * Some Player renames * a few more * import data * run formatter * func_800B7170 * whoops * Fix merge issues * Whoops 2 * func_800B83BC and func_800B83F8 * Actor_IsActorFacingPlayerAndWithinRange * add some prototypes * match Actor_UpdateBgCheckInfo * func_800B7678 * mark Actor_SpawnAsChildAndCutscene as non_matching * Actor_Draw * Update is chaotic * 2 new matches * func_800BC8B8 * Another bunch * function renames * run formatter * cleanup * remove unnecesary casts * add missing sfx * Fix renames * fix merge * func_800BF7CC * small bunch * another bunch * func_800BE184 non_matching * two more * split z_cheap_proc * Another bunch * another bunch * a few and a non matching * yeee * a * Actor_DrawAll non_equivalent * Actor_RecordUndrawnActor * i don't know what to put in this commit message * func_800B4B50 non matching * func_800B42F8 non matching * func_800B5040 * func_800B5814 non_equiv * func_800B6584 * func_800B6608 * func_800B6680 * func_800B7E04 * func_800B8118 * func_800b9170 * , * func_800BC4EC * func_800BA6FC * func_800BA798 * func_800BA8B8 * Actor_LoadOverlay * small cleanup * func_800BB2D0 * meh * func_800BBAC0 * func_800BC270 * func_800B5208 non matching * Fix warnings * meh * rename some ActorShadow_ functions * fairy * Flags_ * fix warnings * format * Actor_PickUp and family * func_800B8E58 * match Actor_RemoveFromCategory * another bit of docs * Match func_800B86C8 * And another bit * rename Player_GetRunSpeedLimit * func_800B9E84 * func_800BE63C * func_800BB8EC * match func_800B5814 * match func_800B9334 * cleanup * fix conflicts: first pass * another fix * actorfixer fix * fix conflicts * func_800BE680 non_equivalent * Improve func_800BE680 a bit * func_800BE680 equivalent (?) * func_800BE680 equivalent * Actor_UpdateActor equivalent * format * use some ExchangeItemID enum values * Some more cleaning * more cleanup * More name stealing from OoT * match func_800B82EC * match func_800B9D1C and a bit of cleanup * Add ACTOR_FLAGS placeholders * Renames and match func_800BE184 * last pass of name stealing * format * fix conflicts * more cleanup * more cleanup * cleanup and OVERLAY_RELOCATION_OFFSET macro * Remove prototypes of obviously internal-only functions, update variable names, forward declare where necessary, remove all `param_\d`s * remove newlines * minor rename * Use ACTOR_FLAGS in z_actor * Match func_800BE3D0 * Rename movement functions * Document Actor_CalcOffsetOrientedToDrawRotation * velX -> horizontalSpeed * A bit of documentation for actor movement functions * format * Fix merge issues * format * Format * Fix renames * fix warnings * fix conflicts * review :D * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Fix * format * Actor_SpawnSetupActors * engineer review * Update src/code/z_actor.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * A bunch of Engineer's reviews * more Engineer's review * a * whoops * run actorfixer * c'mon * :face_exhaling: * whoops * warning * More engineer's review * run format * I'm dumb * a * match func_800BE680 * Match Actor_DrawZTarget * Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor * Fix merge issue * format * update actor * Steal a bit of @Thar0 documentation from OoT's z_message * Run actorfixer * Fix renames * Match func_800B4B50 thanks to @hensldm * Improve ActorShadow_DrawFeet thanks to @hensldm * whoops * Actor_PlaySfxAtProjectedPos * Actor_UpdateActor matched by @hensldm * Match func_800BA2FC by @hensldm * Match Actor_SpawnTransitionActors by @hensldm * Match func_800BB604 by @hensldm * Match Actor_DrawAll by @hensldm * ActorShadow_DrawFeet by @hensldm * Actor_UpdateAll by @hensldm * Match func_800BCCDC by @engineer124 * Small Actor_PlaySfxAtPos by @engineer124 * ACTOR_FLAGS_ALL and a bit of cleanup * Add invisible comment * Small docs pass * Fix merge * Engineer's review * format lol * Actor_DrawDoorLock docs * Actor_SpawnShieldParticlesMetal * fix merge issues * sActorFaultClient * fix * commit message * Run actorfixer.py && format.sh * Fix warnings * fixes * format * bss * Update include/functions.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Address review * Fix merge issues, format and such * fix merge issues * Add ACTORCAT_MAX * actorList -> actorLists * Fix merge issues * format * Enable WERROR on jenkinsfile * Fix merge * Use object symbols * address review * format * review * fix merge issues * fix * VRAM_PTR_SIZE, small cleanup and format * review Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2022-01-04Merge branch 'master' into voiceengineer124
2022-01-04Merge branch 'master' into parameterengineer124
2022-01-04SubS Actor Getters OK (#475)Derek Hensley
* Bring over matching actor getters * Add arg names * Rename functions * Adjust rename_sym script to update sizes csvs * Fix wrong function prototype * whitespace * Rename functions * Fix actorfixer * Format * Add function comments and file header * Fix merge * format * Fix merge * format * Move D_0407D590 down * Fix merge * Steal idea from z_actor PR to return directly * Swap function name order * Fix merge
2022-01-04Effect_soft_sprite_old_init and particleOverlayTable OK (#520)Derek Hensley
* Migrated data * Migrate particleOverlayTable * Import data for effect_soft_sprite, add g to effect table, minor cleanup of z64effect.h * Name data * Comment out static variable in variables.h * Use better macros * PR review and other cleanup * Update bug comment
2022-01-04EnItem00 OK (#519)Derek Hensley
* Match three nonmatchings * Remove duplicate parens * turn u32 into s32 * fix thiefbird * Remove some unnessesary casts * Fix merge
2022-01-04Graph OK (#511)Derek Hensley
* Match Graph_FaultAddrConvFunc * Remove undef
2021-12-30Some minigame docsengineer124
2021-12-30Another two functions namedengineer124
2021-12-30More docs & cleanupengineer124
2021-12-292 more functions, a few namesengineer124
2021-12-29Match two minigame functionsengineer124
2021-12-29Match Interface_LoadItemIconengineer124
2021-12-29New macro, fixes many functions, more namesengineer124
2021-12-28Match `func_80116114`engineer124
2021-12-28More small functionsengineer124
2021-12-28Rupees_ChangeByengineer124
2021-12-28Attempt Item_Give, needs a lot of work stillengineer124
2021-12-28clean up dataengineer124
2021-12-28Interface_DrawMagicBar OKengineer124
2021-12-27Update Parameter_Staticengineer124
2021-12-27more docsengineer124
2021-12-27Better score, better docs for DrawClockengineer124
2021-12-27Extra spaces looks badengineer124
2021-12-27Improve docs and score of `Interface_DrawClock`engineer124
2021-12-27Merge branch 'master' into parameterengineer124
2021-12-27Fix split dataengineer124
2021-12-27Bigslime OK and Documented (#361)engineer124
* git subrepo pull tools/asm-differ --force subrepo: subdir: "tools/asm-differ" merged: "d218cdf0" upstream: origin: "https://github.com/simonlindholm/asm-differ.git" branch: "main" commit: "d218cdf0" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/graphovl --force subrepo: subdir: "tools/graphovl" merged: "f5fe93d7" upstream: origin: "https://github.com/AngheloAlf/graphovl.git" branch: "master" commit: "f5fe93d7" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/ZAPD --force subrepo: subdir: "tools/ZAPD" merged: "e7a8a48c" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "e7a8a48c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * Bring Bigslime over from old branch * Format * Improve docs * format * More cleanup * Fix Zero Vectors Name * Improve docs * Spelling/Grammar * Small typo * Extra space * Fix zapd merge conflict * tab * Fix remaining names * format * Better documentation * format * fix * Add names to identity matrices * Minor Cleanup * easier to read comments * Another touch-up * Missed a spot * one more... * typo * Another typo * Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime * PR Feedback * Fix variable * Add in gZeroVec3f in new prs * Fix gZeroVec3f * gZeroVec3f * PR Feedback, move lots of static data inside functions * Use z_actor decomp of `func_800BE680` for better macro name * Naming gone wrong, but fixed now * Fix dList * Add an extra line of docs about shadows for a function * dList -> shadowDList * Next round of PR feedback * Document object file, still need to double check some * Small cleanup * Improve and fix many docs, unname unknown material texture * format * Oops * Clean up blobs from object file * Aha! I finally get what's going on * Remove Bigslime undefined_syms * Remove more undefined symbols Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27z_kaleido_manager and z_kaleido_scope_call OK (#489)Lucas Shaw
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data * z_kaleido_manager OK * add to functions.h variables.h and variables.txt * init * rename parameters in func_80163700 * rename func_80163700 to KaleidoManager_FaultAddrConvFunc * change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match * ran format, uintptr_t * made suggested changes
2021-12-27code_80194710 OK (Audio libultra_code_O2) (#474)engineer124
* code_80194710.c OK * Add new line after variable declaration * format * Function declarations * Name changes to match OoT * Rename file * s32 -> size_t
2021-12-27Small cleanupengineer124
2021-12-27Match 8 BgCheck functions (7 remaining) (#496)engineer124
* Match CollisionPoly_CheckYIntersect * Match CollisionPoly_SphVsPoly * Match StaticLookup_AddPolyToSSList * Match BgCheck_CheckStaticCeiling * Match BgCheck_SphVsFirstStaticPolyList * Match BgCheck_Allocate * Match BgCheck_CheckLineImpl * Match BgCheck_SphVsDynaWallInBgActor * Update src/code/z_bgcheck.c Co-authored-by: mzxrules <mzxrules@gmail.com> * Add comment about in-function static bss Co-authored-by: mzxrules <mzxrules@gmail.com>
2021-12-27[Object] Bigpo object documentation (+ some gameplay_keep) (#525)Isghj
* Bigpo: object documentation starts and already issues * Bigpo: almost all named * Bigpo: done with object except ubused blobs * Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass * Bigpo: forgot to remove sym and replace everywhere, with formater pass * Bigpo: forgot about actorfixer * Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now * Bigpo: warnings * Bigpo: remove extern for gameplay_keep display list reference from aqua * EnBigpo: suggested fixes to header calls and function name Co-authored-by: Isghj8 <isghj8@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-27Decompile and clean up some effect files (#342)Roman971
* Decompile various effect files and cleanup z_effect.c * Decompile z_eff_tire_mark.c and cleanup structs * Small cleanups * Apply most review suggestions * Apply more review suggestions * Change eff_shield_particle vertices to be extracted as an asset * Add relevant effect functions to actorfixer.py
2021-12-27En_Elf (#371)Maide
* En_Elf * En_Elf * PR * PR * Format
2021-12-27Some docsengineer124
2021-12-27Three day timer Draw function WIP: "func_80119610"engineer124
2021-12-26Interface_Update fully OK (copy decomped func from z_player_lib)engineer124
2021-12-26Interface_Update OK (except for data-splitting issues)engineer124
2021-12-26Names and Docsengineer124
2021-12-26Interface_Draw down to score of 315engineer124
2021-12-26Interface_Draw is getting really close nowengineer124
2021-12-26Interface Draw Attempt, now its compilingengineer124
2021-12-25introduce parameter_static wipengineer124
2021-12-23More functions, mainly small onesengineer124