diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-08-18 16:12:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 11:12:35 -0400 |
| commit | fa95f9e6e881457b4a711809a1bf62480cea2c82 (patch) | |
| tree | 45c9af66b2506ff3edf4787d6fc9deb8fe5edc68 /src/code | |
| parent | 49922b4856655a48389dbc45138930650e252dea (diff) | |
Migrated a lot of `boot` bss, matched a few NON_MATCHINGs in `boot` (#266)
* 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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_lifemeter.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index e2a91199d..bbfad829f 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -169,7 +169,7 @@ void LifeMeter_UpdateColors(GlobalContext* globalCtx) { s32 LifeMeter_SaveInterfaceHealth(GlobalContext* globalCtx) { gSaveContext.health = globalCtx->interfaceCtx.health; - + return 1; } @@ -227,7 +227,7 @@ void LifeMeter_Draw(GlobalContext* globalCtx) { OPEN_DISPS(gfxCtx); - if ((gSaveContext.health % 0x10) == 0){ + if ((gSaveContext.health % 0x10) == 0) { fullHeartCount--; } offsetY = 0.0f; @@ -342,8 +342,8 @@ void LifeMeter_Draw(GlobalContext* globalCtx) { } else if (curCombineModeSet != 3) { curCombineModeSet = 3; func_8012C654(gfxCtx); - gDPSetCombineLERP(OVERLAY_DISP++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, - 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(OVERLAY_DISP++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, + ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); } posY = 26.0f + offsetY; posX = 30.0f + offsetX; @@ -353,11 +353,11 @@ void LifeMeter_Draw(GlobalContext* globalCtx) { halfTexSize = 8.0f; halfTexSize *= 0.68f; gSPTextureRectangle(OVERLAY_DISP++, (s32)((posX - halfTexSize) * 4), (s32)((posY - halfTexSize) * 4), - (s32)((posX + halfTexSize) * 4), (s32)((posY + halfTexSize) * 4), G_TX_RENDERTILE, - 0, 0, (s32) temp_f4, (s32) temp_f4); + (s32)((posX + halfTexSize) * 4), (s32)((posY + halfTexSize) * 4), G_TX_RENDERTILE, 0, 0, + (s32)temp_f4, (s32)temp_f4); } else { Mtx* mtx; - + if ((ddCount < 0) || (ddCount < i)) { if (curCombineModeSet != 2) { curCombineModeSet = 2; @@ -401,7 +401,7 @@ void LifeMeter_UpdateSizeAndBeep(GlobalContext* globalCtx) { interfaceCtx->lifeSizeChangeDirection = 0; if (func_801233E4(globalCtx) == 0 && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && LifeMeter_IsCritical() && func_801690CC(globalCtx) == 0) { - //func_801233E4 and func_801690CC : Check if in Cutscene + // func_801233E4 and func_801690CC : Check if in Cutscene play_sound(NA_SE_SY_HITPOINT_ALARM); } } |