mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 19:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup z_lifemeter (#552)

Browse source 
* 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>
This commit is contained in:
Zelllll 2021-01-10 15:33:58 -06:00 • committed by GitHub
parent bda5b83346
commit a0e2ce7211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 305 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_parameter.c
View file

@ -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) &&