refactor: remove blinking expiration animations from rotten and cursed apples
This commit is contained in:
1 parent
adda5db2f4
commit
8559159fc0
4 files changed
+7
-17
No files matched your search
+2
-12
@@ -129,14 +129,9 @@ void draw_apples_rotten(const GameState &state, const RenderAssets &assets,
|
||||
if (oamId >= 128) {
|
||||
return;
|
||||
}
|
||||
const bool blink = (apple.ticksRemaining <= EVIL_ITEM_BLINK_TICKS);
|
||||
const bool is_hidden =
|
||||
blink && ((apple.ticksRemaining <= EVIL_ITEM_FAST_BLINK_TICKS)
|
||||
? ((state.ticks % 2) == 0)
|
||||
: (((state.ticks / 2) % 2) == 0));
|
||||
oamSet(&oamSub, oamId, apple.x * 8, apple.y * 8, 0, 0, SpriteSize_8x8,
|
||||
SpriteColorFormat_256Color, assets.gfx_apple_rotten, -1, false,
|
||||
is_hidden, false, false, false);
|
||||
false, false, false, false);
|
||||
oamId++;
|
||||
}
|
||||
}
|
||||
@@ -148,14 +143,9 @@ void draw_apples_cursed(const GameState &state, const RenderAssets &assets,
|
||||
if (oamId >= 128) {
|
||||
return;
|
||||
}
|
||||
const bool blink = (apple.ticksRemaining <= EVIL_ITEM_BLINK_TICKS);
|
||||
const bool is_hidden =
|
||||
blink && ((apple.ticksRemaining <= EVIL_ITEM_FAST_BLINK_TICKS)
|
||||
? ((state.ticks % 2) == 0)
|
||||
: (((state.ticks / 2) % 2) == 0));
|
||||
oamSet(&oamSub, oamId, apple.x * 8, apple.y * 8, 0, 0, SpriteSize_8x8,
|
||||
SpriteColorFormat_256Color, assets.gfx_apple_cursed, -1, false,
|
||||
is_hidden, hflip, false, false);
|
||||
false, hflip, false, false);
|
||||
oamId++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user