summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
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-04EnColMan OK (#479)kyleburnette
* EnColMan OK * Fix description at top of file * Made suggested changes * Make suggested changes * Format * Include gameplay_keep and use symbols
2022-01-04En_Fish (#450)Maide
* En_Fish * R * PR * PR * Update src/overlays/actors/ovl_En_Fish/z_en_fish.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04Object_Kankyo (1 non-matching) (#445)Maide
* Object_Kankyo * Removing permuter * PR * Re-add description * PR
2022-01-04En_St (#443)Maide
* En_St * Warning * PR * undef * PR
2022-01-04En_Wiz_Fire (#406)Maide
* En_Wiz_Fire * Remove padding * PR * PR * Object * Undef * PR
2022-01-04En_Go (3 non-matching) (#405)Maide
* En_Go * PR * PR * Object * Undef * PR
2022-01-04pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK (#385)kyleburnette
* pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK * Made tharo's suggestions * Update pfsgetstatus.c * Made suggested changes (other than uintptr_t)
2022-01-03En_Fishing (3 non-matching) (#378)Maide
* En_Fishing * PR * PR * Object * Undef * PR * format
2022-01-01En_Kusa2 (#363)Maide
* En_Kusa2 * PR * Warnings * PR * Match * pepega
2021-12-28En_Talk_Gibud (Gibdos in the well) OK and somewhat documented (#486)Tom Overton
* Good start * More progress * More progress, need to try importing data now * Import data to C * Match a tricky item function * Matched another item function * Improve definition of EnTalkGibudUnkStruct * func_80AFFD3C OK * Draw functions done * EnTalkGibud_Init OK * EnTalkGibud OK * Document item and switch flag stuff * Name all static variables * Enum for animations * Document type * Document limb stuff * Tons of documentation * Document effect stuff * Document most unknown struct vars * Name most functions * Name final function + document text IDs * Organize forward declarations * Name stack variables * Document damage effects * Document limbs * One final pass * Respond to Anghelo's review * Respond to Anghelo's second review * Add space to force Jenkins to rerun (testing PR dashboard, please ignore) * Removing previously added space * Fix limb enum to add LIMB_NONE * Run ./format.sh, whoops * Respond to hensldm review + small cleanup * Respond to engineer's review * Fix item enum * This is a legacy PR, so using autogenned object symbols * Fix merge conflict * Move Talk_Gibud specific enums to .c
2021-12-28Obj_Tokeidai (Clock Tower) OK and mostly documented (#442)Tom Overton
* Migrate data to C * ObjTokeidai_Init OK * ObjTokeidai_Destroy OK * func_80AB2BBC OK * func_80AB3BB0 OK * func_80AB29F8 OK * func_80AB27B4 OK * func_80AB2834 OK * func_80AB2790 OK * func_80AB28C8 OK * ObjTokeidai_Update OK * func_80AB4040 OK * func_80AB3010 OK * func_80AB3CCC OK * func_80AB3240 OK * func_80AB3C50 OK * func_80AB4080 OK * func_80AB4160 OK * func_80AB319C OK * func_80AB3BE8 OK * func_80AB3BD8 OK * func_80AB3B34 OK * func_80AB3A7C OK * func_80AB3ED0 OK * func_80AB39BC OK * func_80AB38B0 OK * func_80AB3880 OK * func_80AB363C OK * func_80AB36C4 OK * func_80AB3808 OK * func_80AB365C OK * func_80AB3598 OK * func_80AB3544 OK * func_80AB34CC OK * func_80AB3370 OK * func_80AB32F0 OK * ObjTokeidai_Draw OK * func_80AB4894 OK * func_80AB4664 OK * func_80AB4394 OK * Use compiled reloc * Initial documentation pass * Little more documentation * Last bit of first pass documentation * Finish documentation * Respond to review feedback * Respond to Anghelo's feedback * Incorporate new enum * Respond to engineer's feedback * Respond to engineer's feedback * Update comments because the things I thought were unused ARE actually used * Switch to using "Open" instead of "Transform" * Run ./format.sh * Respond to engineer + hensldm by removing some macros * Fix func_801A3F54 argument * Fix func_801A3F54 argument Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * This is a legacy PR, so using autogenned object symbols * Move enum to .c * Revert "Move enum to .c" This reverts commit de13c50f0aac35470cec29bc90665c780055651f. * Move tokeidai-specific defines to .c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-12-28En_Geg (#436)Maide
* En_Geg * Format comments * PR * Object * undef * PR
2021-12-28Effect_Ss_Stick (#464)LtPeriwinkle
* Effect_Ss_Stick OK * fix spec * space between declarations and code * Gfx -> Gfx[], fix spacing * add deku stick to description * add fragment to file description * use autogenned gameplay_keep symbol
2021-12-28Building on Macs (#513)EllipticEllipsis
* Building on Macs * Add Mac building documentation * Review * Update for new z64compress * Review * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "155a463a5" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "155a463a5" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * Fix some obvious warnings * Rewrite docs * -; * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "fd5a7f434" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "fd5a7f434" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
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-27contchannelreset OK (#428)EllipticEllipsis
* contchannelreset OK * Add to functions.h * Rename argument
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_Fz (#528)Maide
* En_Fz * UNK_TYPE1 * AC WHY * gameplay_keep * a
2021-12-27En_Aob_01 (#440)Maide
* En_Aob_01 * PR * Object * Fix weird capitalisation * undef
2021-12-27En_Elf (#371)Maide
* En_Elf * En_Elf * PR * PR * Format
2021-12-27Obj_Iceblock (#367)Maide
* Obj_Iceblock * PR * PR * Object * Undef
2021-12-27En_Akindonuts (#349)Maide
* En_Akindonuts * Enums * Rebase * PR * PR * Object * Uncomment blob * Undef
2021-12-27Door_Warp1 (2 non-matching) (#347)Maide
* Door_Warp1 * Rebase * Rebase * PR * Object * Format * Undef * def more * Whoops
2021-12-22En_Tru (1 non-matching) (#325)Maide
* En_Tru * Fixups * PR * The meme * I rebased by accident sorry * Add object memes * Type
2021-12-21En_Gs (#431)Maide
* En_Gs * PR * PR * PR * Update src/overlays/actors/ovl_En_Gs/z_en_gs.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-19Name coordinate transformation matrix similar to OoT (#499)engineer124
* name coordiante transformation names similar to OoT * update actorfixer
2021-12-19Code_800f07c0 OK with some documentation (#373)Derek Hensley
* Matched func_800F07C0 * Matched func_800F0888 * Matched func_800F0944 * Matched func_800F09B4 * Matched func_800F0A94 * Matched func_800F0E94 * Matched func_800F0EEC * Matched func_800F0F28 * Matched func_800F0FF0 * Matched func_800F10AC * Matched func_800F112C * Matched func_800F0DD4 * Matched func_800F0CE4 * Matched func_800F0A20 * Matched func_800F0BB4 * Fix functions.h * Migrated data and add some doc comments, having BSS issues * BSS fix * Fix merge conflict * Document * Run Formatter * Actually save functions.h * Rename UnusedNPC to EnHy * Change some rets and run format * PR review * Fix merge conflict * Minor touchups * Fix renamed func * Change char to UNK_TYPE1 * Add header * Rename two functions * Fix capital X's in undefined_syms * Convert char to UNK_TYPE1 in EnDoor * Change huge ternary into if else for readability * Fix up EnIn * Better whitespace * Format * Revert UNK_TYPE1s in EnDoor * Rename file * Missed rename in undefined_syms
2021-12-19sys_ucode OK (#432)EllipticEllipsis
* sys_ucode OK * Update file split of data * Format * Name symbols, sizes -> u32 * Correct undefined_syms * Format
2021-12-19Importing Audio Init Params (#471)engineer124
* Import audio init params * Add comments describing what these sizes represents * Fix variables.txt * Remove leading zero's from gTatumsPerBeat * Name variables
2021-12-19pause (Frame Advance) OK (#455)Derek Hensley
* Matched * Rename and format * typo * Missed renames * Revert "Missed renames" This reverts commit 64d9f7046407eac71b849420457968e3b38fc4d8. * Revert "typo" This reverts commit 81696364d3db71b6085fda1aa99855def390628e. * Revert "Rename and format" This reverts commit aec7d245e896777d70eb7024c336f76ed2a32c7f. * Rename functions * Add header explaining frame advance * Header * Format
2021-12-18Initial object file xmls (#312)Tharo
* git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "3c00dcb3" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "3c00dcb3" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Object xmls * Fix bss reordering * Setup has warnings now * Fix object_gi_reserve01 dlist names * rm xml -> c make rule * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "ba947126" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "ba947126" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * SPBranchList related warnings gone * Remove some mis-detected animations * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "405fc13e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "405fc13e" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * scene related setup warning gone * Fix * Newlines
2021-12-16Tutorial (#362)EllipticEllipsis
* ObjTree OK, data imported * EnMs OK, data imported * And the spec * OK * Some minor edits * A lot of preliminary stuff * Mostly complete beginning * First draft of other functions doc * Whoops, forgot the GlobalContext pad * Draw functions (minus colour), create Data * Data * gitignore, some progress on documenting * Review comments, continue documenting * spec * Finish off documentation * undefined_syms * Add a couple of todos * One more * At least add tools for object decomp * Start conversion table stuff * Document ObjTree * Document EnMs * Add more tables to conversions * Maide's review * Review * Review * Typos and incomplete thoughts * Update vscode.md * Correct function/variable names * Review suggestions * Format * Missed one * Rename functions and format * Fix ObjTree * Update actorfixer.py, fix some variable names * Some review * Review suggestions * More review * Hopefully fix all the thisx references * Missed one
2021-12-07z_vr_box_draw OK (#481)Lucas Shaw
* z_vr_box_draw OK * ok * Removed z_vr_box_draw.data.s, its actually z_sram_NES.data.s * Added enum SkyboxId
2021-12-07Importing Audio Sfx Params (#472)engineer124
* Import audio sfx params * Add TODO: description for this file
2021-12-06Dm_Stk (#350)Maide
* Dm_Stk * PR
2021-12-06Fault and Fault_Drawer (3 MATCHING and 1 NON_MATCHING) (#434)Derek Hensley
* Matched last functions except Fault_FindNextStackCall * Bss in drawer and cleanup * Update define and format * PR comments * Formating PR suggestions * Small format * Fault_FindNextStackCall * Change grays to dark gray and light gray
2021-12-06Elf_Message OK (#457)Derek Hensley
* Matched * Rename function
2021-12-01En_Cow 🐮 (#493)Rozelette
* OK * Address feedback * Adjust comparison
2021-11-23z_bgcheck.c (#357)mzxrules
* first few functions * two more almost matching functions * Rebase to NBS, get it to compile * BgCheck_RaycastFloorStaticList OK, fix-up some functions * BgCheck_SphVsStaticWall OK! and a few others * more z_bgcheck NON_MATCHINGS * OK more functions, reorganize external reference #defines * More functions OK, more struct fixes * More OKs * Decomp all the way to the end of bgcheck * All functions attempted * Rename functions * formatting, data migration * Give names to unk structs, rename some structs, fix some non-equivalent functions * WaterBox_GetSurfaceImpl OK * BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source. * BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings * pr change requests * fix crc maybe * implement more changes * implement alf's changes
2021-11-20En_Tk (#338)Maide
* En_Tk * PR * Warnings Co-authored-by: root <root@Careface.localdomain>
2021-11-20Audio BGM Macros (#460)engineer124
* Introduce bgms * Fill in bgm enums * Rename bgm to clearer names * Fix spacing * Fix "No_Music" define * remove comment * Improve bgm names, found another seqId function * Another seqId function * Another name change * Woods of Mystery -> Sarias Song * add saria's song bgm to pierre * Another bgm function found! * Add bgm's to `gSaveContext.seqIndex`
2021-11-20cartrominit OK (#412)EllipticEllipsis
* cartrominit OK * spec * Rename a couple of variables
2021-11-19`z_jpeg`, `jpegutils` and `jpegdecoder` OK (#322)Anghelo Carvajal
* this is a disaster * two more * func_800F470C * split and rename jpegutils and jpegdecoder * match jpegutils * match jpegdecoder.c * audio_rodata * data split * Split rsp * Steal documentation from OoT * cleanup * Format * remove removed members in JpegContext * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/jpegdecoder.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> * Apply suggestions from code review 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> * Update src/code/jpegutils.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review renames * true * Some type fixes * Update include/z64.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * add comment * Update src/code/z_jpeg.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * format * bss fix * decr * format * z64jpeg.h * Add stdbool * Rename audio_init_params * whoops * whoops++ * whoops# * remove extra dumb variables in variables.txt * fix Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-19Introducing z64audio.h (#459)engineer124
* Copy over z64audio.h from audio WIP * Cleanup z64audio.h * PR Suggestions * Improvements from Audio doc WIP * More cleanup * Remove a few structs, Introduce OcarinaSongId * More cleanup from audio docs WIP * Fix
2021-11-19Import abi.h from OoT (#466)engineer124