summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2021-10-11En_Fu (#343)Maide
* En_Fu * Fix non-matching, thanks Anon58
2021-10-11Decomp sleep.c (#293)Anghelo Carvajal
2021-10-11`flg_set.c` OK and documented (#335)EllipticEllipsis
* Draw OK, Update very much not * Flag table imported * Update OK * Actually OK this time * Begin documenting * Rename some stuff * Rename functions * spec * Review * Format * Anghelo's review * Fix lifemeter bss * Format * Missed one * idle.c bss
2021-10-11En_Sw (6 non-matching) (#295)Maide
* En_Sw * spec * Sw * Fix
2021-10-11En_Poh (#291)Maide
* En_Poh * PR * PR * Fix wrong float
2021-10-10En_Owl (#271)Maide
* En_Owl * a * PR * a * Rebase
2021-09-30Arrow_Ice OK (#314)Tom Overton
* Migrate data and ArrowIce_Init OK * ArrowIce_Destroy OK (also define func_80115D5C in functions.h, maybe a bad thing???) * ArrowIce_SetupAction OK * func_809224DC OK * ArrowIce_Update OK * func_809227F4 OK (but with hacky float constant) * func_809225D0 OK and use float constant in func_809227F4 * func_80922628 OK * ArrowIce_Draw OK * Migrate D_80924200.s to C * Apply better names in ice_gfx, and document Draw slightly * Name struct vars to match OoT * Update function names to match OoT * Explain that arrow's timer and hitFlags came from OoT * Update spec + "migrate" bss to C * Do a hex -> decimal conversion I missed * Remove blank line in-between headers * Remove extraneous forward declare * Move initialization of arrow up one line * Remove parentheses * Use else if * Use decrement operation * Use decimal for an alpha calculation * Switch func_80115D5C to take GameState* * Put pad on the top of Draw * Move initialization of arrow up (again) * Early return from Update if we're killed * Extract assets instead of putting them in the repo * Add explanatory comment to top of file * += 1 -> ++ * Use VEC3F_LERPIMPDST macro * Force a jenkins rerun by adding a space * Remove the space from the last commit * Move literal to the back of the conditional * Respond to review feedback * Add ArrowIce_LerpFiredPosition to functions.txt
2021-09-29`z_nmi_buff` OK, `code_8010C1B0` split and OK (#334)EllipticEllipsis
* nmi_buff OK, code_8010C1B0 split and OK * COLD_RESET * spec * Fix lifemeter bss * Rename variable
2021-09-29ShrinkWindow OK (#303)EllipticEllipsis
* OK, small amount of documentation, import bss * Remove comments * Actually commit functions.txt * Add renames to actorfixer.py, review
2021-09-29sethwinterrupt OK (#301)EllipticEllipsis
2021-09-29Main OK (#329)EllipticEllipsis
* Main OK, use defines where known * Couple more defines * Tharo's review * Fix lifemeter bss
2021-09-29`ovl_En_Test4` with 1 non-matching (#319)Anghelo Carvajal
* Decompile update and stuff * Decompile some more * func_80A41FA4 non_matching * init is a disaster * Import bss * match func_80A41D70 * Improve func_80A42AB8 a bit * equivalent EnTest4_Init * Import data * CLOCK_TIME * Run formatter * func_80A42AB8 may be equivalent now, not completely sure * match func_80A42AB8 * Some minor renames * Name some struct members * Format * format in bigpo * fix merge issue * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Description: Day transition effects * Un-rename unk_144 * Update include/macros.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * sIsLoaded * Update src/overlays/actors/ovl_En_Test4/z_en_test4.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * review * format * daytemp Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
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-28`ovl_opening` OK (#300)EllipticEllipsis
* ovl_opening OK * un-format z64save.h * Actually change the other uses of nextCutsceneIndex * format * Review * engineer's review * Get it to match again
2021-09-28Thiefbird (#290)Maide
* Thiefbird * Fix enums * Rename funcs * PR
2021-09-28En_Zot (#320)Maide
* En_Zot * PR
2021-09-28Obj_Etcetera (Deku Flower) OK and somewhat documented (#326)Tom Overton
* Migrate data to C * ObjEtcetera_Init OK * ObjEtcetera_Destroy OK * ObjEtcetera_Update OK * func_80A7C690 OK * func_80A7C718 OK * func_80A7C168 OK * func_80A7BE8C OK * Make the draw functions take Actor* * CollisionCheck_SetAC should take a Collider * func_80A7BDC8 OK (with silly dummy label meme) * func_80A7C1F0 OK * unk_276 is almost certainly a u16 since I constantly have to cast it, so just retype it * func_80A7BF08 OK * Some minor cleanup * Convert D_80A7C80C to array of CollisionHeader* * Finish defining struct to prepare for func_80A7C308 * func_80A7C308 OK * Move gameplay_keep symbols to variables.h * Explanatory comment at the top * Type gameplay_keep animation headers too * Update the spec (why do I always forget this?) * Rename func_80A7BDC8 to ObjEtcetera_PerformFlutter (name still up for debate) * Name objIndex * Document the types of flowers * Name displayListPtr * Name burrowFlag and provide a macro * Name specialFlutterScale and clean up some things with newer understanding * Give the draw functions (bad) names * Name ObjEtcetera_Idle * Name ObjEtcetera_Setup (name sucks but oh well lol) * Name ObjEtcetera_ReturnToIdle. These names all suck but they're a start * Document some of ObjEtcetera_Idle's behavior * Name and document objectIds * Remove the burrow macro because it's frankly more confusing for now * Name the draw functions something slightly better * MUCH better names for things + more documentation * Clean up ObjEtcetera_Setup a bit * Call it NUMBER_OF_FLOWER_TYPES instead * A few more name changes * Link -> Player in comments * displayListPtr -> dList * Trailing commas + format * Move initialization of type up * Improve conditional check * Use BGCHECK_SCENE macro * Move initialization of floorBgId up * Use documentation comment style * Match ObjEtcetera_DoNormalOscillation without a dummy label * param_2 -> arg1 * Insert blank line after scoped pad * OBJETCETERA_TYPE -> DEKU_FLOWER_TYPE * Cleanup and rename enum * Break up ObjEtcetera_Setup a bit and convert DekuFlowerType to an s32 to remove warnings * Whoops, run format * Delete leading 0 on struct comments * Rename pad to requiredScopeTemp to match my other PR
2021-09-27En_Rd (#316)Maide
* En_Rd * PR * a
2021-09-27`ovl_title` OK (#311)EllipticEllipsis
* OK, asset XML made and symbols imported * Missed a GLOBAL_ASM * Remove data from spec * engineer's review * Correct arg * Un-format functions.h * Hopefully fix it
2021-09-27obj_aqua OK (#321)emilybrooks
* setup * almost done * only 3 floating point registers swapped * forgot newline * Audio_PlaySoundAtPosition * review suggestions * missed a hex number * matched func_80ACBDFC
2021-09-27boot_0x80086760 OK and documented (#288)EllipticEllipsis
* boot_80086760 OK, added fp header, resplit data * Some more documentation, data imported with unions * Sweep data under the rug * Move the fp header properly * Format * include/fp.h header guards Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Engineer's review * Fix typo Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Rename header * while (true) Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.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-25En_Syateki_Man (#269)Maide
* En_Syateki_Man * a
2021-09-25Obj_Syokudai (Torch) OK and mostly documented (#306)rylieb
* Started uncommenting statics, but then realized this actor has BSS, lol. * Import .data and .bss. Run format.sh. * ObjSyokudai_Init OK and mostly documented. * ObjSyokudai_Destroy OK and fully documented. * ObjSyokudai_Draw OK and partially documented. * Good progress on ObjSyokudai_Update, but NOT OK. * Instruction match, but needs regalloc and stack. * Stack is closer now. * Obj_Syokudai OK, no new warnings, ran formatter. * Documented .data and .bss variables. * Final documentation pass before PR. * Add header, fix build errors. * Use COLTYPE_METAL and COLTYPE_WOOD macros. * Apply suggestions from code review engineer124's suggestions. Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review engineer124: WaterBox* instead of UNK_PTR Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c engineer124: AC_HARD -> AC_HIT so Jenkins stops complaining Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Hopefully fix Jenkins via z_bg_lotus WaterBox*. * Rename sp2C to waterBox in BgLotus. * Run format.sh. * Update include/functions.h Change func_800F22C4 param_1 from s8 to s16. Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Change func_801A5CFC param_1 to sfxId in prototype * Document interactions. * Run formatter. * Clarify that posDiff is relative to stick *tip*. * Changed interaction comparisons to better fit enum * snuffTimer enum * Added more #defines. Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-09-23printutils OK, add `va_end` to variadic functions (#294)EllipticEllipsis
* printutils OK * Add va_end to every variadic function
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-21Bg_Hakugin_Post (#258)Maide
* Bg_Hakugin_Post * PR * a * PR * a
2021-09-19En_Railgibud (#268)Maide
* En_Railgibud * Match func_80BA57F8 (thanks Petrie, Simon, Anghelo) * Match func_80BA5E18, thanks to engineer * a * PR
2021-09-19En_Skb (#262)Maide
* En_Skb * a * a * a * Func namesW
2021-09-02En_Dns (#241)Maide
* En_Dns * NBS * PR * PR * Fix warnings * PR Co-authored-by: Angie <angheloalf95@gmail.com>
2021-09-02En_Kgy (#244)Maide
* En_Kgy * NBS * PR * PR * PR
2021-09-02ObjMakeoshihiki OK (#272)gamestabled
* ObjMakeoshihiki OK * suggested changed Co-authored-by: gamestabled <gamest@bl.edu>
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-01En_Dodongo (#242)Maide
* En_Dodongo * NBS * PR * PR * PR * PR
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-09-01En_Dnq (#240)Maide
* En_Dnq * NBS * PR * PR * PR
2021-08-24En_Dnk (#237)Maide
* En_Dnk * NBS * PR * PR
2021-08-24Fix functions.h (#273)Maide
* functions.h * PR
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-10Sort boot files (#260)Tharo
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-08Matched last function in Ovl_en_encount2 (#252)Derek Hensley
* Matched last function * Format * Fix Gfx arrays
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-08En_Dg (#233)Maide
* En_Dg * Macros & Anim struct * NBS * PR * PR * Sort funcs/externs
2021-08-08En_Dnp (#239)Maide
* En_Dnp * PR * NBS * PR * PR
2021-08-08Daiku2 (#228)Maide
* Daiku2 * PR * Macros * NBS * PR * Format