falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update ui.c 

changed gUnk_0200AF00 to gHUD.
this change is not yet in the repo, which the nonmatch website uses
This commit is contained in:
Lemeon 2024-01-21 20:23:43 +01:00 committed by GitHub
parent 8a6d23411c
commit d40e4cee2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui.c
View File

@ -457,10 +457,10 @@ void DrawChargeBar(void) {
u32 chargeFrame; u32 chargeFrame;
tmp1 = FALSE; tmp1 = FALSE;
if (!(gUnk_0200AF00.unk_1 & 0x20)) tmp1 = gPlayerState.chargeState.action != 0; if (!(gHUD.hideFlags & HUD_HIDE_CHARGE_BAR)) tmp1 = gPlayerState.chargeState.action != 0;
if (!tmp1) return EraseChargeBar(); if (!tmp1) return EraseChargeBar();
if (gUnk_0200AF00.maxHealth > 10 * 4) if (gHUD.maxHealth > 10 * 4)
BufferPos = &gBG0Buffer[0x60]; BufferPos = &gBG0Buffer[0x60];
else else
BufferPos = &gBG0Buffer[0x40]; BufferPos = &gBG0Buffer[0x40];
@ -468,9 +468,9 @@ void DrawChargeBar(void) {
chargeTime = Div(gPlayerState.chargeState.chargeTimer + 19, 20); chargeTime = Div(gPlayerState.chargeState.chargeTimer + 19, 20);
if (chargeTime > 40) chargeTime = 40; if (chargeTime > 40) chargeTime = 40;
if (gUnk_0200AF00.unk_6 == 0 || gUnk_0200AF00.unk_7 != chargeTime) { if (gHUD.unk_6 == 0 || gHUD.unk_7 != chargeTime) {
gUnk_0200AF00.unk_6 = 1; gHUD.unk_6 = 1;
gUnk_0200AF00.unk_7 = chargeTime; gHUD.unk_7 = chargeTime;
//this calls Div and returns the result in ret.values[0] and the remainder in ret.values[1] //this calls Div and returns the result in ret.values[0] and the remainder in ret.values[1]
ret.raw = ((DivRem*)&Div)(chargeTime, 4); ret.raw = ((DivRem*)&Div)(chargeTime, 4);
@ -488,17 +488,17 @@ void DrawChargeBar(void) {
switch (gPlayerState.chargeState.action) { switch (gPlayerState.chargeState.action) {
case 4: case 4:
case 5: case 5:
gUnk_0200AF00.unk_9 += (gPlayerState.chargeState.action == 4) ? 2 : 1; gHUD.unk_9 += (gPlayerState.chargeState.action == 4) ? 2 : 1;
chargeState = gUnk_0200AF00.unk_9 >> 4 & 3; chargeState = gHUD.unk_9 >> 4 & 3;
break; break;
default: default:
chargeState = 0; chargeState = 0;
break; break;
} }
if (chargeState == gUnk_0200AF00.unk_8) return; if (chargeState == gHUD.unk_8) return;
gUnk_0200AF00.unk_8 = chargeState; gHUD.unk_8 = chargeState;
BufferPos = (u16*)(VRAM + 0xc2c0); BufferPos = (u16*)(VRAM + 0xc2c0);
DmaSet(3, gUnk_080C8F7C[chargeState], BufferPos, 0x84000030); DmaSet(3, gUnk_080C8F7C[chargeState], BufferPos, 0x84000030);