summaryrefslogtreecommitdiff
path: root/src/code
AgeCommit message (Collapse)Author
2022-10-22ovl_fbdemo_wipe5 OK (#1015)chloe!!
* ovl_fbdemo_wipe5 OK * format * add trailing newline * bring over gbi.h * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * minor clenaups * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Chloe <> Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-21Match 4 functions in BGcheck, remove nonequivalency in DynaPoly_ExpandSRT ↵petrie911
and BgHakaBombwall (#1128) * match 1 * more matches * one thing * cleaned up conditionals * move bss * format * I swear that's all of the () Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
2022-10-16Introduce `actor_table.h` (#985)Anghelo Carvajal
* Make actor_table.h * DECLARE_OVERLAY_SEGMENT * InitVars * Remove InitVars from actor headers * format * Use table for ActorID enum * Move segment symbols declarations back to segment_symbols.h * add newline to actor_table.h * Add effects back to segnt_symbols.h * Update include/tables/actor_table.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * name unused parameters Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * Revert "name unused parameters" This reverts commit 14fe63313a32b4779ccfb6cf71cb227542a3958f. * Remove `const` from InitVars * Add underscore to unused parameters * ActorID -> ActorId * bss * missing symbols and bss * lower diff a bit Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16`ovl_En_Nb` OK (#1030)Anghelo Carvajal
* mips2c general pass * EnNb_Init * EnNb_Destroy * EnNb_Update * draw functions * func_80BBFE8C * func_80BC0D84 non_matching * func_80BBFE60 and minor fixes * a bunch of functions * And another bunch * An attempt to the last function * import data * Match func_80BC0D84 * Use extracted symbols instead of hardcoded ones * Match last function * format * Update the reloc in the spec * regconvert and draw * Small docs pass * actorfixer and format * Minor renames * schedule * cleanups * namefixer * minor cleanups * yeet printing stuff * Schedule and anims cleanup * stateFlags * Name limbs and anims * Name more stuff in the asset * Finish naming simple stuff * format * merge fixes * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * EnNb_UpdateSkelAnime Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * fix typo * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * MTXMODE_APPLY * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * format * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * clamps 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> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16Rename elf_message to QuestHint (sync with oot) (#1124)fig02
* rename elf_message to QuestHint * port more things and review * command arg name * Update include/z64scene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_scene.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-15`z_player_lib`: Part 2 (#938)Anghelo Carvajal
* preparations * import data * PLAYER_STATE1 * PLAYER_STATE2 * PLAYER_STATE3 * import bss * format stuff * bss cleanup * more cleaning and some naming * face * cleaning up link human object a bit * Remove PHYSICAL_TO_VIRTUAL2 * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * /* CAT */ Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming some stuff on objects * format * invert flags endian * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * drawmask Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming * another round of human object naming * enum renames * sActionModelGroups and use enum as types * PlayerAnimType * PLAYER_MODELTYPE_ * determined ranges of PlayerModelType * name PLAYER_MODELGROUP_DEFAULT * format * sheath * dlist groups placeholder namse * PLAYER_MODELGROUP_BOTTLE * Some fierce deity naming * Right hands * zora skel dlists * deku limb dlists * left hands * name most modelgroups * more hand naming * regs as dec * fix in horse * Use BUTTON_ITEM_EQUIP macro * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * reformat D_801AED58 * Sword sheaths * swords and shields * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * playerForm on Player_DrawImpl * fomat * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update assets/xml/objects/gameplay_keep.xml Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex)) Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * singular limb enum names * fix bss * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * name goron shielding limbs * name limb * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * bss * bss * format * namefixer * bss * bss * bss * bss * format * bss * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * fix bss Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15Replace `Actor_MarkForDeath` with `Actor_Kill` (#1118)Tom Overton
* Replace `Actor_MarkForDeath` with `Actor_Kill` * Replace if-else with early returns, as per hensldm's review * Respond to Elliptic's review * Redundant spelling
2022-10-15Match 3 Functions (z_actor OK, z_mir_ray OK, z_mir_ray3 OK) (#1122)engineer124
* match MirRay_ReflectedBeam * match Actor_DrawLensActors * match func_80B9E8D4 * void
2022-10-13Rename audio context (#1114)engineer124
2022-10-13z_kaleido_collect.c (1 non-matching) and Mostly Documented (Pause Menu Quest ↵engineer124
Page) (#1108) * import quest docs * cleanup * eol * temp change to non-eq * more missed stuff * fix questVtx * PR suggestions * adjust comment * missed two * PR Suggestions
2022-10-13Import Camera Data (#1097)engineer124
* import camera data * cleanup * easier-to-read cam-hud-visibility * PR Suggestions * fix camflag macros * fix bss * camera data summary * small cleanup * cleanup camera data * cam data mode enums
2022-10-05z_kaleido_map.c OK and Documented (Pause Menu Map Page) + related icon_item ↵engineer124
statics (dungeon/field/jpn) (#1094) * import pause menu map page * better owl-warp docs * fix func name * missed some owlwarps * fix merge from master * fix scene region code * PR Suggestions * add comment * add description of gWorldMapImageTex, thanks @EllipticEllipsis * clearup docs * missed a comma * bad formatter, drop comment * more cleanup
2022-10-04z_overlay and z_fbdemo_dlftbls (Transition overlay handling), clean up a lot ↵petrie911
of u32s used to store pointers (#1073) * overlay matches * prototypes * fbdemo too * virtual to physical * names, cleanup, etc * bss reordering * uintptr stuff * fixed now? * one fix * headers and such * fixes'n'stuff * XXX action * docs of a sort * useless error codes * n * format * header? I barely know her! Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
2022-10-04Fbdemo_circle OK (#1024)Parker Burnett
* some progress, nasty draw func only thing to do * pushing for engineer * matching with no warnings * fixes * minor names * PR feedback * fixes for PR * docs * PR comments * fixing format and found bit shift
2022-10-04Format Script Update (#904)Derek Hensley
* Bring over format.sh and .clang-tidy and run it * Little fixes * Adjustments * Jenkins kick * Jenkins kick 2 * format * small fixes * Bring over new formatter by Roman Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Force use of clang-11 * check_format * Update error messages * Fix from Tharo for python3.6 Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Just use nproc to determine num jobs for check format * Update error message * AnimatedMat_DrawStepOpa texture arg -> matAnim * Fix enTwig draw prototype * Tidying up * Bring over fixes in OoT #1387 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Fix * Update doc tools * PR Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2022-10-02audio_synthesis.c OK and Documented (#1090)engineer124
* import synth docs * cleanup * small followup cleanup * PR Suggestions, small cleanup * fix bss * PR suggestion * fix enum * PR Suggestions
2022-10-02Eff Srchball OK (#1092)Derek Hensley
* OK * Some docs and cleanup * flags -> params * Remove todo * Small cleanup * Description and dls * Format * bug tag * Update bug comment * Update src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Format Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-02View & Shrink_Window Docs (#1049)engineer124
* view and shrink_window docs * cleanup * move func declaration to header * move struct to local * PR Suggestions * g to s
2022-09-30Rename SetupIndex to Layer (#1099)Derek Hensley
* Rename setupIndex to Layer * ()
2022-09-30Quake & Distortion Cleanup (#1102)engineer124
* quake cleanup * cleanup * more cleanup * remove cast * q comes before r... * unname goron function, leave it to another PR * PR Suggestions
2022-10-01z_kaleido_mask.c Ok and Documented (Pause Menu Mask Page) (#1093)engineer124
* import mask docs * cleanup * some PR * fix merge from master * fix merge * move cursor result
2022-09-30Audio Sequences: Scene/Ambience/SeqFlags Functions OK (#1033)engineer124
* import audio scene seq docs * cleanup * fix scene cmd * small fixes * more PR suggestions * missed comment * rename spot to resume * cleanup comments * SEQ_IO_VAL_NONE * Empty-Commit * another PR suggestion
2022-09-30SceneNum -> SceneId (#1036)Derek Hensley
* sceneNum -> sceneId * horse data scene -> sceneId * Clean up scene table * format * PR comments * Some more * It helps if you actually save the file * PR * Remove comment * Format * Conflicts
2022-09-29`z_parameter`: Timers (#1031)engineer124
* import timers from parameter branch * more cleanup * small namechange * improved docs * more cleanup * one more namechange * another small cleanup... * fix destroy * plurals * revert graphic function names * PR suggestions, better docs * revert namechange, better postman timer name * oops * fix merge * fix merge * fix bss * PR Suggestions
2022-09-28`z_parameter`: Hud Visibility (#942)engineer124
* Begin interface alpha docs * More Interface Alpha * cleanup docs * Minor fixes * Apply Discord Discussions * More discussions * More suggestions from OoT * fix merge
2022-09-27z_kaleido_item.c Ok and Documented (Pause Menu Item Page) (#1027)engineer124
* import wip from kaleido * small cleanup * add for-loop comments * pr review 1 * spacing * Update src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-09-24Item cleanup: Item drops, rupees, signs (#1048)engineer124
* item cleanup * pr suggestions Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-09-24Gamestates Cleanup (#1047)Derek Hensley
* Setup * ConsoleLogo * TitleSetup * MapSelect * FileSelect * Daytelop * Save file * PreNMI * Final cleanup and format * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * DayTelop * Split off setup * split of prenmi * readd SET * shorten some gamestate member names * Add comment about init * Update include/z64.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Small cleanup of comments * PR Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-09-24Audio: Various Cleanup and Docs (#1034)engineer124
* cleanup and docs * pr suggestions * audio errors * fix bss * Empty-Commit
2022-09-24ActorContext Flags (#1060)engineer124
* actor context flags * bracket cleanup * comment out recursive name-fixer * Empty-Commit
2022-09-24Document object_bdoor (Boss Doors) (#1087)Tom Overton
2022-09-24`z_kaleido_prompt.c` Ok and Documented (Pause Menu Save/Continue Prompt. ↵engineer124
Unused) (#1045) * kaleido prompt ok * fix pauseCtx
2022-09-24OK (#1040)Derek Hensley
2022-09-24Effect Dfire OK (#1038)Derek Hensley
* OK * rename function * MTXMODE enum * PR * Format * % -> & * note
2022-09-24Effect Deaddb OK (#1037)Derek Hensley
* OK * Add description * format * Fix EffectSsDeadDbInitParams size comment
2022-09-24Effect DtBubble OK (#1017)Derek Hensley
* OK * Some cleanup * Format * Name enum
2022-09-24Effect Dust OK (#1016)Derek Hensley
* OK * Some cleanup * Description * format * Better name * whoops * Array count * Name dust texture arrays * Fix * static * Update dust tex outnames
2022-09-14Add enum for tatl hint id (#993)Parker Burnett
* first round, need to investigate the others * naming the remainder * changed my mind on the name * foooooormat * fixing a number * ...another one... * names galore * PR feedback * fixing * fixes * 4mat * adding "POE_SISTER" * forgot a rename
2022-09-14`z_parameter`: Magic (#934)engineer124
* Document magic * Cleanup * Few fixes * PR Suggestions, More Lens Docs * Few comments * missed a spot * Better macros/names * Deactivate Lens * more PR suggestions * fix names
2022-08-15General Cleanup 11 (#992)Derek Hensley
* char -> UNK_TYPE1 * SubS fixes * func_800B8500 * macros * misc * A few more GET_{ACTOR} vs {ACTOR}_GETw * More Macros * fix * PARSE_TYPE -> GET_TYPE * 1 more
2022-08-15Purge `ExchangeItemID` enum (#1026)Anghelo Carvajal
* Purge ExchangeItemID enum * Add stff to namefixer * Rename FISHING_ROD
2022-08-15Matched several functions (#1020)petrie911
* matchmaker, matchmaker * more matches * one fix * I'll format you good * cleanup Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
2022-08-15Make names related to animations more consistent (#998)Tom Overton
* Make names related to animations more consistent * Standardize on sAnimationInfo * Respond to hensldm's review * Standardize on ChangeAnim * Respond to hensldm's review * Small formatting thing * Consistency after merging master * A few more things I missed * Respond to Elliptic's review * Some more stuff that was requested
2022-08-15Entrance Macro (#987)Derek Hensley
* POC * fix * Fix typo * token POC * The rest * small cleanup * More small cleanup * ENTRANCE * arg renames * EntranceIndex -> Entrance * format * PR * PR2 * Remove layer from entrance macro * namefixer plus comments * format
2022-08-15Audio Sfx (code_801A5BD0 and selected sfx functions in code_8019AF00.c) OK ↵engineer124
and Documented (#798) * Rename functions * code_801A5BD0 OK * PR 1, improve spacing * Rename unused struct * Rename Sfx Variables * PR Feedback, update names * Add comment * cleanup vars * Fix merge * Rework documentation, include more functions in sfx system * PR suggestions * fix AudioSfx_MuteBanks * missed enum * more cleanup * more suggestions
2022-08-15Decompile Camera Helper Functions (#1023)engineer124
* helper functions * more pr suggestions
2022-08-15Effect Deaddd OK (#1019)Derek Hensley
* OK * cleanup * Add unused comment
2022-08-09aisetnextbuf.c OK (code_80194790.c) (#982)engineer124
* aisetnextbuf OK * format * Function headers * Add comment
2022-08-09Decompile and Document Camera `z_play` functions (#933)engineer124
* Document z_play camera functions * cleanup function names * PR Suggestion * Fix master merge, add comments * fix merge * small fix Co-authored-by: angie <angheloalf95@gmail.com>
2022-08-07Effect EnFire OK (#977)Derek Hensley
* OK * Gameplay keep fire * & * &2 * PR * Fire textures * Second mask