Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Maintenance] [th01] Use a common macro for sloppy unblitting of .GRC sprites 

Part of P0193, funded by Ember2528.
This commit is contained in:
nmlgc 2022-05-08 20:03:18 +02:00
parent 1371c85526
commit 1173a58289
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
th01/formats/grc.hpp
View File

@ -37,4 +37,9 @@ void grc_free(main_grc_slot_t slot);
void grc_put_8( void grc_put_8(
screen_x_t left, vram_y_t top, main_grc_slot_t slot, int image, int col screen_x_t left, vram_y_t top, main_grc_slot_t slot, int image, int col
); );
// For some reason, all code assumes .GRC entities to be 48×32, rather than
// 32×32. Why?!
#define grc_sloppy_unput(left, top) \
egc_copy_rect_1_to_0_16(left, top, 48, 32);
/// ------------------------------------------ /// ------------------------------------------

21
th01/main/boss/b20m.cpp
View File

@ -169,11 +169,6 @@ inline void sariel_grc_free(void) {
grc_free(GRC_SLOT_LEAFSPLASH); grc_free(GRC_SLOT_LEAFSPLASH);
} }
// For some reason, all of this code assumes .GRC entities to be 48×32, rather
// than 32×32. Why?!
#define sloppy_unput_32x32(left, top) \
egc_copy_rect_1_to_0_16(left, top, 48, 32);
// Vortex and debris sprites (BOSS6GR1.GRC) // Vortex and debris sprites (BOSS6GR1.GRC)
// ---------------------------------------- // ----------------------------------------
@ -484,7 +479,7 @@ template <
// //
// for both the left and right sprite coordinates to have diverged // for both the left and right sprite coordinates to have diverged
// enough for these wraparounds to stop. // enough for these wraparounds to stop.
sloppy_unput_32x32( grc_sloppy_unput(
debris_left(ray_id, (velocity_x * 2)), (target_y - DEBRIS_H) debris_left(ray_id, (velocity_x * 2)), (target_y - DEBRIS_H)
); );
@ -682,7 +677,7 @@ void pascal near birds_reset_fire_spawn_unput_update_render(
// ZUN bug: Shouldn't these be unblitted unconditionally? // ZUN bug: Shouldn't these be unblitted unconditionally?
// Because they aren't, each cel of the hatch animation is // Because they aren't, each cel of the hatch animation is
// blitted on top of the previous one... // blitted on top of the previous one...
sloppy_unput_32x32(birds.left[i], birds.top[i]); grc_sloppy_unput(birds.left[i], birds.top[i]);
} }
} }
for(i = 0; i < BIRD_COUNT; i++) { for(i = 0; i < BIRD_COUNT; i++) {
@ -694,7 +689,7 @@ void pascal near birds_reset_fire_spawn_unput_update_render(
if(!overlap_xy_lrtb_le_ge( if(!overlap_xy_lrtb_le_ge(
birds.left[i], birds.top[i], 0, 0, (RES_X - 1), (RES_Y - 1) birds.left[i], birds.top[i], 0, 0, (RES_X - 1), (RES_Y - 1)
)) { )) {
sloppy_unput_32x32(birds.left[i], birds.top[i]); grc_sloppy_unput(birds.left[i], birds.top[i]);
birds_alive[i] = false; birds_alive[i] = false;
continue; continue;
} }
@ -852,7 +847,7 @@ void near pattern_vortices(void)
static bool16 dir_second; // x_direction_t static bool16 dir_second; // x_direction_t
#define vortex_unput_and_put_8(i) { \ #define vortex_unput_and_put_8(i) { \
sloppy_unput_32x32(prev_left[i], prev_top[i]); \ grc_sloppy_unput(prev_left[i], prev_top[i]); \
vortex_or_debris_put_8( \ vortex_or_debris_put_8( \
cur_left[i], \ cur_left[i], \
cur_top[i], \ cur_top[i], \
@ -959,7 +954,7 @@ void near pattern_vortices(void)
} }
} else if(boss_phase_frame > 300) { } else if(boss_phase_frame > 300) {
for(int i = 0; i < VORTEX_COUNT; i++) { for(int i = 0; i < VORTEX_COUNT; i++) {
sloppy_unput_32x32(cur_left[i], cur_top[i]); grc_sloppy_unput(cur_left[i], cur_top[i]);
} }
wand_lower_both(); wand_lower_both();
boss_phase_frame = 0; boss_phase_frame = 0;
@ -1079,7 +1074,7 @@ void near pattern_birds_on_ellipse_arc(void)
} else { } else {
spawner_velocity_y.v -= to_sp(0.0625f); spawner_velocity_y.v -= to_sp(0.0625f);
} }
sloppy_unput_32x32(spawner_left.to_pixel(), spawner_top.to_pixel()); grc_sloppy_unput(spawner_left.to_pixel(), spawner_top.to_pixel());
for(int i = (eggs_alive - 1); i >= 0; i--) { for(int i = (eggs_alive - 1); i >= 0; i--) {
bird_put_8(egg_left[i], egg_top[i], C_EGG); bird_put_8(egg_left[i], egg_top[i], C_EGG);
} }
@ -1133,7 +1128,7 @@ void near pattern_birds_on_ellipse_arc(void)
to_sp(-SPAWNCROSS_W), to_sp(-SPAWNCROSS_H), to_sp(-SPAWNCROSS_W), to_sp(-SPAWNCROSS_H),
to_sp(RES_X), to_sp(RES_Y) to_sp(RES_X), to_sp(RES_Y)
)) { )) {
sloppy_unput_32x32(spawner_left.to_pixel(), spawner_top.to_pixel()); grc_sloppy_unput(spawner_left.to_pixel(), spawner_top.to_pixel());
spawner_left.v += spawner_velocity_x.v; spawner_left.v += spawner_velocity_x.v;
spawner_top.v += spawner_velocity_y.v; spawner_top.v += spawner_velocity_y.v;
@ -2467,7 +2462,7 @@ void pascal near pattern_swaying_leaves(int &frame, int spawn_interval_or_reset)
} }
} else if(flag[i] <= LF_SPLASH_DONE) { } else if(flag[i] <= LF_SPLASH_DONE) {
if(leaf_on_screen(i)) { if(leaf_on_screen(i)) {
sloppy_unput_32x32(left[i].to_pixel(), top[i].to_pixel()); grc_sloppy_unput(left[i].to_pixel(), top[i].to_pixel());
} }
if(flag[i] == LF_SPLASH_DONE) { if(flag[i] == LF_SPLASH_DONE) {
flag[i] = LF_LEAF; flag[i] = LF_LEAF;