diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-01-10 15:33:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 16:33:58 -0500 |
| commit | a0e2ce7211ebc312db6fb470b7481e644d583f32 (patch) | |
| tree | f82bfb366b228621400944bfcbc1f157f13551f1 /src/code/z_parameter.c | |
| parent | bda5b83346773bdf2111c890f58feb37dee75b28 (diff) | |
Cleanup z_lifemeter (#552)
* 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>
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index fede83307..66b9a0483 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3082,7 +3082,7 @@ void Interface_Draw(GlobalContext* globalCtx) { if (pauseCtx->flag == 0) { Interface_InitVertices(globalCtx); func_8008A994(interfaceCtx); - Health_Draw(globalCtx); + HealthMeter_Draw(globalCtx); func_80094520(globalCtx->state.gfxCtx); @@ -4035,7 +4035,7 @@ void Interface_Update(GlobalContext* globalCtx) { } } - Health_HandleCriticalAlarm(globalCtx); + HealthMeter_HandleCriticalAlarm(globalCtx); D_80125A58 = func_8008F2F8(globalCtx); if (D_80125A58 == 1) { @@ -4048,7 +4048,7 @@ void Interface_Update(GlobalContext* globalCtx) { } } - Health_UpdateData(globalCtx); + HealthMeter_Update(globalCtx); if ((gSaveContext.timer1State >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) && |