Skip to content

Commit

Permalink
[Anniversary] [th01] Sariel: Restore the leaf splash animation
Browse files Browse the repository at this point in the history
Part of P0234, funded by Ember2528.
  • Loading branch information
nmlgc committed Mar 5, 2023
1 parent 77792bf commit 80ee9b2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions th01/main/boss/b20m.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2378,7 +2378,10 @@ void near pattern_swaying_leaves(int &frame, int spawn_interval_or_reset)
}
} else if(flag[i] <= LF_SPLASH_DONE) {
if(leaf_on_screen(i)) {
grc_sloppy_unput(left[i].to_pixel(), top[i].to_pixel());
grc_sloppy_unput(
left[i].to_pixel() + ((LEAF_W / 2) - (LEAFSPLASH_W / 2)),
top[i].to_pixel() + ((LEAF_H / 2) - (LEAFSPLASH_H / 2))
);
}
if(flag[i] == LF_SPLASH_DONE) {
flag[i] = LF_LEAF;
Expand Down Expand Up @@ -2415,12 +2418,9 @@ void near pattern_swaying_leaves(int &frame, int spawn_interval_or_reset)
leaf_put(vo, first_bit, i, sSPARK);
} else if(flag[i] <= LF_SPLASH_DONE) {
if(leaf_on_screen(i)) {
// ZUN bug: Another missing conversion to screen pixels,
// resulting in the entire leaf splash animation never being
// actually rendered, and becoming effectively unused.
grc_put_8(
left[i].v, // should be pixels
top[i].v, // should be pixels
left[i].to_pixel() + ((LEAF_W / 2) - (LEAFSPLASH_W / 2)),
top[i].to_pixel() + ((LEAF_H / 2) - (LEAFSPLASH_H / 2)),
GRC_SLOT_LEAFSPLASH,
(flag[i] - LF_SPLASH),
V_WHITE
Expand Down

0 comments on commit 80ee9b2

Please sign in to comment.