summaryrefslogtreecommitdiff
path: root/src/code/z_player_lib.c
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2023-03-30 20:26:35 +1100
committerGitHub <noreply@github.com>2023-03-30 20:26:35 +1100
commitf3c811d29865e9445341fc3300a107b9e686e608 (patch)
treed793ac78eda6b8b3943eae20b5a06a8468a730be /src/code/z_player_lib.c
parent6685a4775e440b247f3db62db4162dccbf0775ea (diff)
`z_parameter`: Buttons (part 9) (#1192)
* import button docs * cleanup * sync timer val * add flag comments * Update src/code/z_parameter.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_parameter.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_parameter.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * fix merge master --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/code/z_player_lib.c')
-rw-r--r--src/code/z_player_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 6e7d0222c..bff81e8c9 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -2169,15 +2169,15 @@ void Player_DrawBlastMask(PlayState* play, Player* player) {
OPEN_DISPS(play->state.gfxCtx);
- if (player->unk_B60 != 0) {
+ if (player->blastMaskTimer != 0) {
s32 alpha;
gSegments[0xA] = VIRTUAL_TO_PHYSICAL(player->maskObjectSegment);
AnimatedMat_DrawOpa(play, Lib_SegmentedToVirtual(&object_mask_bakuretu_Matanimheader_0011F8));
- if (player->unk_B60 < 11) {
- alpha = (player->unk_B60 / 10.0f) * 255;
+ if (player->blastMaskTimer <= 10) {
+ alpha = (player->blastMaskTimer / 10.0f) * 255;
} else {
alpha = 255;
}