Fix palette groups

This commit is contained in:
octorock
2022-12-22 23:47:13 +01:00
parent c280188436
commit ea9b7e7848
20 changed files with 742 additions and 724 deletions
+6 -6
View File
@@ -225,9 +225,9 @@ void PlayerUpdate(Entity* this) {
static void HandlePlayerLife(Entity* this) {
u32 temp;
gUnk_0200AF00.unk_2f = 0;
gUnk_0200AF00.unk_2d = 0;
gUnk_0200AF00.unk_2e = 0;
gHUD.unk_2f = 0;
gHUD.unk_2d = 0;
gHUD.unk_2e = 0;
if ((gPlayerEntity.contactFlags & 0x80) && (gPlayerEntity.iframes > 0))
SoundReq(SFX_86);
@@ -255,7 +255,7 @@ static void HandlePlayerLife(Entity* this) {
return;
#ifdef EU
if ((gUnk_0200AF00.unk_1 == 0) && gRoomTransition.frameCount % 90 == 0) {
if ((gHUD.hideFlags == HUD_HIDE_NONE) && gRoomTransition.frameCount % 90 == 0) {
temp = gSave.stats.maxHealth / 4;
if (temp > 24)
temp = 24;
@@ -276,7 +276,7 @@ static void HandlePlayerLife(Entity* this) {
if (gSave.stats.health <= temp) {
gRoomVars.unk2 = 1;
if ((gUnk_0200AF00.unk_1 == 0) && gRoomTransition.frameCount % 90 == 0) {
if ((gHUD.hideFlags == HUD_HIDE_NONE) && gRoomTransition.frameCount % 90 == 0) {
EnqueueSFX(SFX_LOW_HEALTH);
}
}
@@ -323,7 +323,7 @@ static void sub_080171F0(void) {
sub_080028E0(&gPlayerEntity);
if (gPlayerState.flags & PL_CLONING)
gUnk_0200AF00.unk_2f = 1;
gHUD.unk_2f = 1;
sub_08078180();
gPlayerState.field_0x7 &= ~0x80;