mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-09 05:44:26 +00:00
Code Issues Projects Releases Wiki Activity

HealthMeter_ -> Health_ (#1202)

Browse source 
* HealthMeter_ -> Health_

* PR Suggestion
This commit is contained in:
engineer124 2022-05-08 00:18:42 +10:00 • committed by GitHub
parent 5cc5cf5a7e
commit 80186ec1ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/functions.h
View file

@ -942,11 +942,11 @@ void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src);
void func_80078884(u16 sfxId); void func_80078884(u16 sfxId);
void func_800788CC(u16 sfxId); void func_800788CC(u16 sfxId);
void func_80078914(Vec3f* arg0, u16 sfxId); void func_80078914(Vec3f* arg0, u16 sfxId);
void HealthMeter_Init(GlobalContext* globalCtx); void Health_InitMeter(GlobalContext* globalCtx);
void HealthMeter_Update(GlobalContext* globalCtx); void Health_UpdateMeter(GlobalContext* globalCtx);
void HealthMeter_Draw(GlobalContext* globalCtx); void Health_DrawMeter(GlobalContext* globalCtx);
void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx); void Health_UpdateBeatingHeart(GlobalContext* globalCtx);
u32 HealthMeter_IsCritical(void); u32 Health_IsCritical(void);
void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type); void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type);
void Lights_PointNoGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius); void Lights_PointNoGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius);
void Lights_PointGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius); void Lights_PointGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius);

2
src/code/z_construct.c
View file

@ -146,7 +146,7 @@ void func_801109B0(GlobalContext* globalCtx) {
osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x" osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x"
HealthMeter_Init(globalCtx); Health_InitMeter(globalCtx);
Map_Init(globalCtx); Map_Init(globalCtx);
interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0; interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0;

12
src/code/z_lifemeter.c
View file

@ -111,7 +111,7 @@ s16 sBeatingHeartsDDEnv[3];
s16 sHeartsDDPrim[2][3]; s16 sHeartsDDPrim[2][3];
s16 sHeartsDDEnv[2][3]; s16 sHeartsDDEnv[2][3];
void HealthMeter_Init(GlobalContext* globalCtx) { void Health_InitMeter(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
interfaceCtx->unk_228 = 0x140; interfaceCtx->unk_228 = 0x140;
@ -144,7 +144,7 @@ void HealthMeter_Init(GlobalContext* globalCtx) {
sHeartsDDEnv[0][2] = sHeartsDDEnv[1][2] = HEARTS_DD_ENV_B; sHeartsDDEnv[0][2] = sHeartsDDEnv[1][2] = HEARTS_DD_ENV_B;
} }
void HealthMeter_Update(GlobalContext* globalCtx) { void Health_UpdateMeter(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
f32 factor = interfaceCtx->heartColorOscillator * 0.1f; f32 factor = interfaceCtx->heartColorOscillator * 0.1f;
f32 ddFactor; f32 ddFactor;
@ -295,7 +295,7 @@ static void* sHeartDDTextures[] = {
gDefenseHeartThreeQuarterTex, gDefenseHeartThreeQuarterTex,
}; };
void HealthMeter_Draw(GlobalContext* globalCtx) { void Health_DrawMeter(GlobalContext* globalCtx) {
s32 pad[5]; s32 pad[5];
void* heartBgImg; void* heartBgImg;
u32 curColorSet; u32 curColorSet;
@ -498,7 +498,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
CLOSE_DISPS(gfxCtx, "../z_lifemeter.c", 606); CLOSE_DISPS(gfxCtx, "../z_lifemeter.c", 606);
} }
void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx) { void Health_UpdateBeatingHeart(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
if (interfaceCtx->beatingHeartOscillatorDirection != 0) { if (interfaceCtx->beatingHeartOscillatorDirection != 0) {
@ -507,7 +507,7 @@ void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx) {
interfaceCtx->beatingHeartOscillator = 0; interfaceCtx->beatingHeartOscillator = 0;
interfaceCtx->beatingHeartOscillatorDirection = 0; interfaceCtx->beatingHeartOscillatorDirection = 0;
if (!Player_InCsMode(globalCtx) && (globalCtx->pauseCtx.state == 0) && if (!Player_InCsMode(globalCtx) && (globalCtx->pauseCtx.state == 0) &&
(globalCtx->pauseCtx.debugState == 0) && HealthMeter_IsCritical() && !Gameplay_InCsMode(globalCtx)) { (globalCtx->pauseCtx.debugState == 0) && Health_IsCritical() && !Gameplay_InCsMode(globalCtx)) {
func_80078884(NA_SE_SY_HITPOINT_ALARM); func_80078884(NA_SE_SY_HITPOINT_ALARM);
} }
} }
@ -520,7 +520,7 @@ void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx) {
} }
} }
u32 HealthMeter_IsCritical(void) { u32 Health_IsCritical(void) {
s32 criticalHealth; s32 criticalHealth;
if (gSaveContext.healthCapacity <= 0x50) { if (gSaveContext.healthCapacity <= 0x50) {

6
src/code/z_parameter.c
View file

@ -3060,7 +3060,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
if (pauseCtx->debugState == 0) { if (pauseCtx->debugState == 0) {
Interface_InitVertices(globalCtx); Interface_InitVertices(globalCtx);
func_8008A994(interfaceCtx); func_8008A994(interfaceCtx);
HealthMeter_Draw(globalCtx); Health_DrawMeter(globalCtx);
func_80094520(globalCtx->state.gfxCtx); func_80094520(globalCtx->state.gfxCtx);
@ -3980,7 +3980,7 @@ void Interface_Update(GlobalContext* globalCtx) {
} }
} }
HealthMeter_UpdateBeatingHeart(globalCtx); Health_UpdateBeatingHeart(globalCtx);
D_80125A58 = func_8008F2F8(globalCtx); D_80125A58 = func_8008F2F8(globalCtx);
if (D_80125A58 == 1) { if (D_80125A58 == 1) {
@ -3993,7 +3993,7 @@ void Interface_Update(GlobalContext* globalCtx) {
} }
} }
HealthMeter_Update(globalCtx); Health_UpdateMeter(globalCtx);
if ((gSaveContext.timer1State >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && if ((gSaveContext.timer1State >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) &&
(msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & PLAYER_STATE2_24) && (msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & PLAYER_STATE2_24) &&

2
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -6893,7 +6893,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) {
s32 sp34; s32 sp34;
if ((this->unk_664 != NULL) || if ((this->unk_664 != NULL) ||
(!(heathIsCritical = HealthMeter_IsCritical()) && ((this->unk_6AC = (this->unk_6AC + 1) & 1) != 0))) { (!(heathIsCritical = Health_IsCritical()) && ((this->unk_6AC = (this->unk_6AC + 1) & 1) != 0))) {
this->stateFlags2 &= ~PLAYER_STATE2_28; this->stateFlags2 &= ~PLAYER_STATE2_28;
anim = func_80833338(this); anim = func_80833338(this);
} else { } else {