summaryrefslogtreecommitdiff
path: root/src/code/z_lifemeter.c
AgeCommit message (Collapse)Author
2025-06-04Remove "z64" prefix from all headers (#2518)fig02
* z64 - a * z64 - b * z64 - c * z64 - d * z64 - e * z64 - f * z64 - g * z64 - h * z64 - i * z64 - l * z64 - m * z64 - o * z64 - p * z64 - q * z64 - r * z64 - s * z64 - t * z64 - v * restore file * fix merge * fix merge --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-02-19Reduce overlay dependencies on global.h (8) (#2478)mzxrules
* move variables into z64environment.h * z_room.h * z64sram.h, z64ss_sram.h, z64font.h, kanread.h * z64lifemeter.h, z64debug.h, debug_arena.h * buffers.h * remove z_bgcheck global * gamealloc.h * suggestions * .bdd
2025-02-16Reduce overlay dependencies on global.h (7) (#2472)mzxrules
* z64env_flags, z64quest_hint_commands * z64cutscene_spline, z64save.h moved from z64.h * bss * pr suggestion * bss * suggestions
2024-09-11Cleanup gSPMatrix, rename `Matrix_New` -> `Matrix_Finalize`, add ↵Dragorn421
`MATRIX_FINALIZE_AND_LOAD` (#1983) * clean up gSPMatrix usage * add weird hybrid macro gSPMATRIX_SET_NEW * Matrix_NewMtx, MATRIX_NEW -> Matrix_Finalize, MATRIX_FINALIZE * gSPMATRIX_SET_NEW -> MATRIX_FINALIZE_AND_LOAD * format
2024-01-09Create debug macros for common functions (#1597)cadmic
* Create debug macros for common functions * Revert NDEBUG change * MALLOCR -> MALLOC_R * DEBUG -> OOT_DEBUG * Use the same name for debug and non-debug matrix functions * Fix file/line argument order * Revert g[s]DPNoOp[Tag] * Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug * MTXF_TO_MTX -> MATRIX_TO_MTX
2023-09-06Document pause states (excluding gameover) (#1483)Dragorn421
* Document PauseContext.state * Very light docs surrounding pause states * PAUSE_STATE_UNPAUSE -> PAUSE_STATE_RESUME_GAMEPLAY and comment on purpose in the enum * PAUSE_STATE_MAIN -> PAUSE_STATE_6 * format * Player_InitDrawPause -> Player_InitPauseDrawData
2023-08-15Document z_lib Sfx Functions (#1470)engineer124
* document lib sfx * rename functions
2023-08-13Split `SaveContext` into sub-structs (#1393)Dragorn421
* Split SaveContext struct * run formatter * Remove temporary-until-split stuff in z_sram * . * run formatter
2022-06-06Fix asset file includes to always start with assets/ (#1260)Roman971
* Fix asset includes to consistently start with assets/ * Fix header paths in asset xmls to start with assets/ * Remove -Iassets from compiler options
2022-06-03Add enum for setup dls and name `z_rcp.c` functions (#1196)Dragorn421
* Introduce `SetupDL` enum * wip * wip * Remove comments on each setupdl index * Name setup dl functions by setupdl index * `Gfx_SetupDl` -> `Gfx_SetupDL` * Run formatter * globalctx -> play * fix regressions * `Gfx_SetupDL` -> `Gfx_SetupDL_` (add separating underscore) * `CallSetupDL` -> `SetupDL`
2022-05-21PlayState Rename (#1231)fig02
* global context -> play * fix PlayState* PlayState
2022-05-18Gameplay_ -> Play_ and this (#1229)fig02
2022-05-07HealthMeter_ -> Health_ (#1202)engineer124
* HealthMeter_ -> Health_ * PR Suggestion
2022-02-13Run formatter (#1139)Dragorn421
2022-01-23lifemeter_z.c documentation (#1092)hatal175
* lifemeter documentation * Review fixes * Rename oscillator members * Do no use true/false with direction * Rerename oscillators
2022-01-11Document undocumented matrix functions (#955)Dragorn421
* Document `func_800D1694` as `Matrix_TranslateRotateYXZ` * Document `func_800D1FD4` as `Matrix_ReplaceRotation` * Cleanup `Matrix_RotateAxis` * Document `func_800A7EC0` as `SkinMatrix_SetRotateAxis` * Document `func_800D2A34` and `func_800D2A98` as `Matrix_SetTranslateScaleMtx`(`F`) * Document mostly unused functions at the end of `sys_matrix.c` * Add in-use renamed functions to `namefixer.py` * Add `Matrix_SetTranslateScaleMtx2` to `namefixer.py` * Run formatter * Fix namefixer.py mistake from #952 * Format clang-11.1 * Fix `Matrix_TranslateRotateYXZ` wrongly documented, it actually is `Matrix_SetTranslateRotateYXZ` * VS Code is stellar at refactoring (no) * Run formatter * Come on VS Code * Improve `Matrix_ReplaceRotation` docs * Fix typo * Fix namefixer.py
2021-08-15Global Context And General Cleanup (#863)Zelllll
* door context * renames * done * fix unintended change * all nb gone * more nb gone * merge fishing * fix size commentX * door changes suggested by dragorn * fix accidental semicolon * another * change all texture pointers to void* * error fix and format * Update src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * fix ostime * correct mistake in SkyboxContext * probably fix nonmatching * Update include/z64.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * roman's suggestions, fix incorrect type definition in z64scene.h * typo in struct * make typedef use u8 array * forgot one * pull in master and format.sh Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-06-15Interface improvements (#822)Zelllll
* Add symbols, does NOT build OK * parameter OK with syms * Use `static` more and inline arrays * wip docs * Start on Interface_Draw, NOT OK yet * rename variables since interface dev is weird * nonmatching for now * kaleido * Update src/code/z_parameter.c Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Make most texture rectangles use shifts * fix symbols for all interface things * done with interface_draw for now * Update z_parameter.c * format files * fix wrong function calls * fix bss * improvements in matching * remove button enum for now * (void)0 to fix warning * make conditional look nicer * fix * fix wrong combiner * Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format * remove "HUD" naming * review suggestions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-05-02Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803)Roman971
* Decompile ovl_kaleido_scope + minor cleanups * Add a common header for ovl_kaleido_scope * Start cleaning up and documenting kaleido_scope (+ some interface docs) * Improve and fix some kaleido_scope non matchings * Match KaleidoSetup_Init * Extract icon_item_fra/ger_static files * Add more documentation and matches to kaleido_scope * Improve the z_kaleido_collect.c non matching * Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c * Update most kaleido variables to be static * Improve GS flag macros * Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script * Various minor fixes and improvements * Minor fixes and review changes * Review changes part 2 * Rename gSetTileCustom to gDPSetTileCustom * Review changes part 3
2021-02-24lifemeter fixes (#709)Zelllll
2021-02-13Fix most compiler warnings in the boot and code segments (#674)Tharo
* Less warnings in boot & code segments * few more warnings gone * Ran formatter * z_view warning gone * -> 1 * f31 -> 31 * Remove function casts * Few more small improvements * Separate declaration and assignment in func_80091738 and Item_Give Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-01-24Decompile Gameplay_Keep and fix all existing decompiled objects (#595)Zelllll
* First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-12z_lifemeter OK (#622)Synray
* z_lifemeter OK There were a few versions that matched, so the duplicate `ddfactor` might be fake. The `if (interfaceCtx)` at the start seems to be required. I think `sHeartsPrimFactors[0]` vs `sHeartsDDPrimFactors[ddtype]` is real, because the asm loads `sHeartsDDPrimFactors` for each access, while it only loads `sHeartsPrimFactors` once. It could have something to do with `reduceixa` in uopt. * Make vars function-static * Fix names
2021-01-10Cleanup z_lifemeter (#552)Zelllll
* z_lifemeter cleanup finished, one non-matching * made Health_UpdateData a bit better, nowhere near matching still * lifemeter done for now * fixed define issue * improve z_lifemeter, still doesn't match * z_lifemeter done * Rename functions * Add files via upload * Update Health_Update.s * fix missing symbols in asm file * Update Health_Update.s * Update Health_Update.s * fixed stuff * Add files via upload * Delete Health_Update.s * Rename things according to Roman's suggestions * lifemeter done hopefully * fix unused asm that for some reason didn't merge * fix feedback * compiles right now Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-11-19Three new matching functions (#492)petrie911
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * match * new matches * format * need to kill the asm, too * whoops dlists * one more match * no more temp * let's fix Gameplay_ChangeCameraStatus while we're at it * formatted
2020-10-29Use macros for oGfxCtx accesses (#465)fig02
* fix colliderinit typo * fix initchain * reloc * add defines * add defines * missed some on merge * rename gfxCtx and add comment * remove space
2020-10-11Decompile z_sram.c (#431)Random
* Decompile z_sram.c * rename Sram_CalcChecksum to Sram_WriteSaveSlot * progress * done i think * add original name comments * temp substructs * minor fixes * review * review 2 * fix Co-authored-by: fig <fig02srl@gmail.com>
2020-10-03libultra cleanup (#215)Random
* cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes
2020-09-18Decompile Player (#387)Roman971
* Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-08-29Introduce OPEN_DISPS/CLOSE_DISPS macros (#360)Roman971
2020-07-16Change Colors To Decimal (#260)fig02
* fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-06-30Fix and improve some non matchings (#229)Roman971
2020-05-01Decompile z_map_exp.c (2 non matchings left) (#104)Roman971
Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-04-16Decompile z_play.c and Match/Document some of z_view.c (#74)Roman971
* Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-05Fixes in PR #50 (3)Random
- Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-04Decompile graph.cRandom
- decompile `graph.c` (2 non-matchings left) - decompile `z_game_dlftbls.c` - add noop macros in `gbi.h`
2020-03-23Fix remaining non matchingsRoman971
2020-03-22Format all src C filesRoman971
2020-03-17First proper commit.Jack Walker
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 05:58:16 +0000