diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-06-29 17:08:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 22:08:03 +0100 |
| commit | 45eed680d613642bc3e1591f95902f6d57e0f8e6 (patch) | |
| tree | e5967531bb726e49708d5814d78c32d3a197f50c /src/code/z_lifemeter.c | |
| parent | 158d1b26b0455c2214741ebc4406130a559b8f8f (diff) | |
`code_8013EC10` and `code_80182CE0` (`z_rumble` and `sys_rumble`) (#763)
* First pass
* import bss
* cleanup warnings
* PadMgr_ControllerHasRumblePak
* z64rumble.h
* rename file to z_rumble.c
* format
* Update src/code/z_rumble.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_rumble.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* name a temp
* minor cleaning
* bss
* match code_80182CE0
* import data and cleanups
* Rename RumbleManager struct and sys_rumble file
* Rename functions from sys_rumble
* Rename parameter to distSq
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* more notes and a bit of cleaning
* Name Rumble_Add and Rumble_AddForced
* some extra notes
* Rename Rumble_Override and Rumble_Request
* document states
* minor renames
* actorfixer
* format
* very minor docs
* whoops
* remove redundant prevent_bss_reordering
* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* namefixer
* Update src/code/sys_rumble.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* fix
* Elliptic review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* minor cleanups
* Update include/z64rumble.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/sys_rumble.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_rumble.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'src/code/z_lifemeter.c')
| -rw-r--r-- | src/code/z_lifemeter.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 651afe6c0..c31cf0016 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -1,7 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" #include "interface/parameter_static/parameter_static.h" -#include "prevent_bss_reordering.h" s16 sHeartsPrimColors[3][3] = { { 255, 70, 50 }, { 255, 190, 0 }, { 100, 100, 255 } }; s16 sHeartsEnvColors[3][3] = { { 50, 40, 60 }, { 255, 0, 0 }, { 0, 0, 255 } }; |