summaryrefslogtreecommitdiff
path: root/assets/xml/overlays
AgeCommit message (Collapse)Author
2026-02-18Bombers Part 1: Rename (used) assets (#1847)Jordan Longstaff
* Bombers Part 1: Rename (used) assets * Fix duplicate definition * Suggested renames
2024-12-18Add original asset names to all assets present in overlays (#1766)Tom Overton
2024-07-11More General Cleanup (#1658)Derek Hensley
* gDs2nEyeTexAnim * sEnMm2EmptyDL * object_um_Matanimheader_007D10 * object_mnk_Matanimheader_019A20 * gTurtleEmpty2TexAnim * object_iknv_obj_Matanimheader_0113E0 * object_botihasira_Matanimheader_001A48 * gTwinmoldEmptyTexAnim * gBeaverYoungerBrotherEmptyTexAnim * gNwcEyeTexAnim * gTwinmoldEmptyTex1Anim gTwinmoldEmpty2TexAnim * gGyorgEmpty1TexAnim gGyorgEmpty2TexAnim * gBurlyGuyEmpty1TexAnim gBurlyGuyEmpty2TexAnim * gKotakeEyeTexAnim * gDmZl4EmptyTexAnim * object_cs_Matanimheader_00F6D4 * gAnju1UnusedTexAnim * Empty blobs * EnKusa_IsUnderwater * IsUnderwater functions * s on static variable names in col check * scene_texture_01_Tex_002D40 * object_ds2_Tex_0030D8 object_ds2_Tex_0034D8 object_ds2_Tex_0038D8 * object_gk * undefined_syms * object_fall2_Matanimheader_005CF0 * gTwinmoldEmpty1TexAnim typo
2024-07-09Add original asset names to all `object_t*` files (#1657)Tom Overton
2024-06-23EnOkuta (Octorok and its projectiles) OK and documented (#1641)Tom Overton
* Match EnOkuta * Match data * Use the generated reloc * Delete extern stuff and format * Extract the DL * Fix lots of stuff * Copy a lot of names over from EnSyatekiOkuta * SFX enums * Lots more stuff * Constants and other stuff * Some more stuff I missed * Name more functions using OoT/SyatekiOkuta as reference * An easy function I missed * Some floats * Getter macros * Types enum * Name the cylinder inits a little clearer * Create bodyparts enum and name all data * Name all functions * Name `timer` struct var and all temps * Name the `jumpHeight` struct var * Create damage effect enum * Name the extracted DL * Name `numConsecutiveProjectiles` * Finish docs * Document XML * Clarify that this blue Octorok isn't the shooting gallery one * Respond to reviews * Stuff --------- Co-authored-by: Synray <31429825+Synray@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-20z_map decompiled (#1032)mzxrules
* First batch of functions * more ok * z_map_data OK * More OKs, MinimapList ZAPD breaking change * func_80103A58 improvements, more OK * func_80106D5C and func_801091F0 decomped * func_801031D0 decomped and some fixes * house cleaning, more OKs more decomp * Even more OKs * func_80105C40 almost OK, more OKs * func_80108AF8 OK and more * All functions attempted * func_8010534C OK * Start documentation, rename DoorCtx * More OKs, split map_data.data, more doc * incremental clean-up, more function names * more function names * func_801068FC OK * old uncommitted changes * minor tweaks * implement easy fixes * more fixes * z_map_disp OK, implement more suggestions * delete utility program * migrate data * TransiActor ->TransitionActor * Major documentation pass * first pass of changes * warning fix attempt, revert ZFile.cpp * Fix FAKE match * Easy fixes * implement gDPLoadTextureBlock_Runtime * z_demo bss patch * Extract white square texture * Implement more suggestions * rework MapIndex/DungeonIndex * revert dungeonSceneIndex -> mapIndex in some spots, implement suggestions * more suggestions * minor nits * fix #include
2024-05-08fix song of time vtx count (#1624)Archez
2023-11-23Boss05 (Bio Deku Baba) OK and documented (#1510)Tom Overton
* Init, Destroy, Update, easy actions * Just the hard 3 + 1 left * One left * OK Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Data/bss in, extract colheader * Clean up externs * Better match for func_809EECBC * Sfx * Lot of naming * fix build * Name skel stuff * name limbdraws * name colliders * Document `object_boss05` * Port some names from Odolwa * Name bio baba types (and relatedly clean up EnPp) * Better names for the LimbDraw functions + some related vars * Name all functions * Name a lot of struct vars * Colliders and body parts * Name all struct vars (might come back for a few of these though) * Name most stack vars * Fragment states, ice data * Limb rot index * Damage effects * Enum for hit reactions * Enums for movement state/attack state * Finish up * Missed this in EnPp * Respond to reviews * Fix comment * Reverse order for postlimbdraw, etc. functions * Remove blank line at the top * Respond to review * Make a "getter" macro for the force detach timer * Respond to review --------- Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: angie <angheloalf95@gmail.com>
2023-11-21Fix most hardcoded pointers in extracted assets (#1477)Anghelo Carvajal
2023-10-03Add original asset names to all `object_l*` and `object_m*` files (#1403)Tom Overton
2023-06-17Document EnSyatekiOkuta (Shooting Gallery Octorok) (#1287)Tom Overton
* Initial docs * Tons of stuff done * Fix spacing thing now that the function is actually named * Temporarily add un-macro'd flags as comment * Name and document EnSyatekiOkuta_IsHiddenByAnotherOctorok * Finish naming all functions * Better macros + explanations * Comments on a lot of functions * Some stuff I was supposed to revert * Fix merge issue * Another merge fix * Make data static + move it in-function * Respond to engineer's review * circleOrCrossAlpha -> hitResultAlpha * Respond to more of engineer's feedback * octorokHitType -> lastHitOctorokType * Animation enum stuff
2023-06-05File Select (1 Non-Matching) (#1158)engineer124
* Everything below Main OK, and some small ones at the top * 3 more short ones * FileChoose_Main * SelectModeUpdate/Draw * SelectMode update functions done * 2 more small ones * ConfigModeDraw * SetWindowVtx * FileChoose_FadeInMenuElements * Rest of the Config Mode Update Functions * Minor cleanup * FileChoose_UpdateMainMenu * Make xml for title_static * Minor correction * One nasty draw, thanks Synray Co-Authored-By: Synray <31429825+Synray@users.noreply.github.com> * import data * some cleanup * import OoT docs * missed some docs * some progress * FileSelect_SetWindowContentVtx WIP * improve FileSelect_SetWindowContentVtx * match z_file_nameset_NES * cleanup and docs * title static * a few more functions * even more functions * small cleanup * Data Cleanup * 2 more matches * z_file_choose_80807940 OK * cleanup * fix merge master * FileSelect_DrawFileInfo wip * small cleanup * minor * fix merge * match FileSelect_DrawFileInfo * cleanup * fix merge * fix merge * sram cleanup * document select mode * many docs * more docs * more cleanup * small nitpick * consistency * more cleanup * more cleanup * small * small typos * octal bad * pr review * noop * elliptic review * more review * non-matching * oops * more suggestions * keyboard formatting * fix master * sound * padding --------- Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
2023-05-30fbdemo wipe 3 Matching (#1254)louist103
* OK * PR fixes * someone please add clang-format-11 to the AUR thanks * Add outname * Update z_fbdemo_wipe3.c * ARRAY_COUNTU
2023-05-27`z_fbdemo_wipe1` OK and assorted asset cleanup (#1244)Tom Overton
2023-03-07Documented `object_sth` and `object_ahg`, both used by `EnSth` (Moon gazer ↵Isghj
who wants to buy Ocean spiderhouse) (#1169) * object_sth/object_ahg: docs * Ssh: formatter * Apply suggestions from code review Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Oops missed one Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Seth: fixes * Sth: more requested changes * Apply suggestions from code review Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Sth/Ahg: requested changes * Apply suggestions from code review Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Sth: further function name requested changes * Sth: minor note * Sth: fix animation name * Sth: forgot to rename saved flag * Seth: change ocean wallet week reg name * Sth: some requested changes * Sth: fixed week event reg, added more * Sth/Ssh/Si: changed from two defines to 1 * Si/Sth/Ssh: mistook fanfare for sfx, token define renamed * Sth/Ssh/Sekihi: requested changes and some weekregflag docs * Sekihi: fix missing header for skull count * Sekihi: moved flag description to z64save * Sekihi: moved flag description to z64save * Sth: removed flag * Update include/z64save.h Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-11-21Add original asset names for all `object_b*` and `object_c*` files (and some ↵Tom Overton
related stuff) (#1152)
2022-10-06DmChar08 OK (#1085)Derek Hensley
* progress * progress * about to merge data. probably a bad idea * matches with ZAPD * docs * done for now * progress * about to merge data. probably a bad idea * matches with ZAPD * docs * done for now * Fix makefile and add non matching to spec * did some git stuff * Git being a problem as usual * format * PR fixes * PR fixes * PR fixes * Merge master and fixes * going to merge play * merged in the big one * docs * PR fixes * format * Clean up * transition * Better init * Glitchy animations * PR * Format * PR comments * Missed one * Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * fix conflicts * Fix conflicts * format * PR Co-authored-by: louist103 <louist103@gmail.com> Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-10-04ovl_Oceff_Storm OK (#1010)SonicDcer
* all functions matching * all functions matching * all functions matching (for real this time) * data extracted and imported * ovl_Oceff_Storm OK * reloc * pr review * texture name * renamings * renamings * Magic_Reset * pr review * gSPTextureRectangle * pr review
2022-09-30ovl_Oceff_Wipe5 OK (#1011)SonicDcer
* progress * progress * ovl_Oceff_Wipe5 OK * Co-authored-by: Derek-Hensley hensley.derek58@gmail.com * Co-authored-by: Synray synray@users.noreply.github.com * Co-authored-by: darkeye darkeye@users.noreply.github.com * pr review * pr review * Magic_Reset * fixes
2022-09-30ovl_Oceff_Wipe OK (#1008)SonicDcer
* ovl_Oceff_Wipe Decompiled * format * format * pr review * renaming * renamings * renamings * magic * pr review
2022-09-27ovl_Oceff_Wipe4 OK (#1007)SonicDcer
* ovl_Oceff_Wipe4 decompiled * pr review * renamings * renamings * Material -> Model * pr review * Magic_Reset
2022-09-24Document object_mtoride (Woodfall scene objects) (#1062)Tom Overton
* Name everything in object_mtoride * Get ready for PR * Update some of the names
2022-09-14ovl_Oceff_Wipe2 OK (#1006)Alejandro Asenjo
* ovl_Oceff_Wipe2 Decompiled * pr review * renamings * renamings
2022-09-14ovl_Oceff_Spot OK (#1004)Alejandro Asenjo
* ovl_Oceff_Spot decompiled * format * renamings and pr review * pr review * pr review
2022-09-14ovl_Oceff_Wipe3 OK (#1001)Alejandro Asenjo
* all functions matching * ovl_Oceff_Wipe3 decompiled * bss * pr review * pr review * renamings * pr review
2022-08-15ovl_Oceff_Wipe7 OK (#1009)Alejandro Asenjo
* progress * ovl_Oceff_Wipe7 OK * pr review * format * renamings
2022-08-07Document powder keg assets (#967)Tom Overton
* Document powder keg assets * Add "barrel" to one of the asset names * Update variables.txt * ptr -> fuseSegmentPtr
2022-08-07Effect Fhgflash OK (#975)Derek Hensley
* OK * format * extract tex explicitly * FHGFLASH_SHOCK_NO_ACTOR * typo * Hitmark * sZeroVec * eff
2022-07-23General Cleanup 8 (#958)Derek Hensley
* EnBigokuta * EnBji * Soldiers * Start harfgibud * Finish harfgibud * Pamela * PametFrog * format * bigslime * bji comment * PR + small cleanup of Eye Tex anims * Shikashi
2022-07-22ovl_En_Sth2 Decompiled and Documented (#898)Alejandro Asenjo
* ovl_En_Sth2 Decompiled and Documented * & * enum * space * pr review * warnings * pr review * trailing coma + format * pr review * trailing coma * review * focusOffset
2022-07-11Obj_Toudai (#892)Maide
* Obj_Toudai * PR
2022-07-11ovl_Obj_Jgame_Light decompiled (#867)Alejandro Asenjo
* ovl_Obj_Jgame_Light decompiled * xml * doc * pr review * playstate * playstate * pr review * pr review * missing macro * pr review * pr review * pr review * pr review * isOn
2022-04-24Document object_okuta and ovl_en_syateki_okuta assets (#804)Tom Overton
* Document object_okuta * Document ovl_en_syateki_okuta assets * Leg -> Arm
2022-04-07En_Syateki_Okuta (Shooting Gallery Octorok) OK (#772)Tom Overton
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK * func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK * func_80A361F4 OK * Decomp a bunch of functions * Better match for func_80A368E0 * func_80A36CB0 OK * Draw functions OK * All functions OK * Import data to C * Use object symbols * Final cleanup and generated spec * Remove something I missed * char -> UNK_TYPE1 * Respond to reviews * Remove static from unnamed variables, whoops
2022-03-29Obj_Smork (#758)Maide
* Obj_Smork * PR * PR
2022-03-29Obj_Entotu (#745)Maide
* Obj_Entotu * Time macro * PR * Merge
2022-03-27En_Gakufu OK and Documented + Related Audio Functions (#662)engineer124
* Gakufu OK, copy progress from audio WIP * Extraction * import wip in prep for audio data import * Add in `code_8019AF00.c` functions * Finish docs * Spacing * Add enum * Many PR suggestions * Another enum * PR Suggestions * Fix bss * Move comment higher * Fix bss Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-26Fire and Light arrows (#710)louist103
* fire arrow OK * Light arrows OK * Format * Assets * Mtx Mode * PR fixes * pr fixes * Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c * Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
2022-03-26En_Tanron1 (#708)Maide
* En_Tanron1 * PR * Fmt * PR and match (thanks petrie)
2022-03-26En_Horse_Game_Check (#706)Maide
* En_Horse_Game_Check * PR
2022-03-26En_Sda (#691)Maide
* En_Sda * Format hello? * PR
2022-03-24Oceff wipe6 (#686)Nick
* Uncorrupted; Not OK * Merged upstream -- actually OK * Update assets/xml/overlays/ovl_Oceff_Wipe6.xml Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * - Removed Extra 0 characters; clang-format-11 * Removed new warnings. Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24En_Bombers (#684)Maide
* En_Bombers * No need for this >: * Override * PR
2022-03-24Obj_Grass (#617)Maide
* Obj_Grass * PR * PR * PR * Match (thanks Synray)
2022-03-05En_Mm3 (#671)Maide
* En_Mm3 * PR * Merge
2022-02-19En_Sth (#625)Maide
* En_Sth * Skull tokens * PR
2022-02-19En_Bom_Bowl_Man (#616)Maide
* En_Bom_Bowl_Man * sAnimations * Fixup data * PR
2022-02-19Dm_Char01 (#589)Maide
* Dm_Char01 * Merge * Extract verts * PR
2022-02-14Add comment to Arrow_Ice xml and update DL names (#605)Tom Overton
* Add comment to Arrow_Ice xml and update DL names * Update asset names * Improve texture names
2022-01-18En_Bom (#537)Maide
* Broken * En_Bom * PR * PR * Merge * PR
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:31:47 +0000