summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
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-10-07more improvementspetrie911
2021-10-06more matchingspetrie911
2021-10-055 nonmatchingspetrie911
2021-10-04Run ./format.sh on master again (#348)Tom Overton
2021-10-03Cleanupengineer124
2021-10-03Match osVoiceStartReadDataengineer124
2021-10-03Match osVoiceControlGainengineer124
2021-10-03Voice progressengineer124
2021-09-30setglobalintmask OK (#299)EllipticEllipsis
2021-09-30Match last function in z_prenmi, add DISPS macros to ArmsHook (#305)EllipticEllipsis
* preNMI OK, added DISP macros to ArmsHook * Decimal colours in preNMI * SCREEN_WIDTH * engineer's review
2021-09-30resetglobalintmask OK (#298)EllipticEllipsis
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-29wrath done-ishpetrie911
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-29Fix some dummy label matches (#331)Tom Overton
* Fix some dummy label matches * Remove dummy label in z_en_railgibud * Remove dummy label from z_door_ana.c * Remove dummy label from z_obj_raillift.c * Remove dummy label from z_en_minislime.c * A few more dummy label fixes * Run format, whoops * Add single line between pad and code * Add OPEN/CLOSE_DISPS to GameState_Draw * Add the padding in game.c too (how did I forget this???) * Run format.sh * pad -> requiredScopeTemp
2021-09-29sethwinterrupt OK (#301)EllipticEllipsis
2021-09-29Improve check new warnings (#308)EllipticEllipsis
* Change check_new_warnings to output stderr to console too * Colour warnings and functions in check_new_warnings * Remove unneeded prototype in EnDai * Add multithreading options, colour to output, help * Give Jenkins a script again * Test * Remove tput warnings, hopefully * Try -T dumb * Undo test warning
2021-09-29Main OK (#329)EllipticEllipsis
* Main OK, use defines where known * Couple more defines * Tharo's review * Fix lifemeter bss
2021-09-29merge, I hopepetrie911
2021-09-29Merge remote-tracking branch 'upstream/master' into Majorapetrie911
2021-09-29more functionspetrie911
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-28ovl_En_Ending_Hero6 OK (#333)Connor Anderson
* All functions in z_en_ending_hero6.c matching * Add data to z_en_ending_hero6.c * Remove duplicate declarations * Add symbols to undefined_syms.txt * Address initial PR comments * Add heading, rename variables, and remove U suffix * Further variable renamings according to PR suggestions
2021-09-28Thiefbird (#290)Maide
* Thiefbird * Fix enums * Rename funcs * PR
2021-09-28Obj_MineMaide
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-27merge masterpetrie911
2021-09-27more matchespetrie911
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-27afterprenmi.c OK (#297)EllipticEllipsis
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-25Merge remote-tracking branch 'upstream/master' into voiceElliptic Ellipsis
2021-09-25Add Tharo's documentation commentsElliptic Ellipsis
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-22ovl_obj_lightblock OK (#282)emilybrooks
* initial commit * review suggestions * changed opacity to alpha * changed to multiple of 10
2021-09-21position OK (#296)EllipticEllipsis
* position OK * Actually remove the function pragmas
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-19 23:02:54 +0000