stagex: post-rebase fixups

Author: Akaricchi

resources/00-taisei.pkgdir/shader/sprite_yumemi_overlay.frag.glsl

@@ -15,7 +15,7 @@ void spriteMain(out vec4 fragColor) {
 	vec2 codeUV = texCoordRaw + mask.rb * (1 - mask.g) * 0.1;
 
 	vec4 code_params = vec4(code_aspect * vec2(1.5, 1), num_segs, inv_num_segs);
-	vec4 code = sample_code(tex_aux[0], code_params, codeUV + vec2(0.03, -0.05) * time);
+	vec4 code = sample_code(tex_aux0, code_params, codeUV + vec2(0.03, -0.05) * time);
 
 	float m = 0.5 + 0.5 * sin(time * 3.21 + codeUV.y * 96.31);
 	float ca = (1 - smoothstep(0.01, 0.2, mix(mask.b, mask.r, m)));
@@ -28,7 +28,7 @@ void spriteMain(out vec4 fragColor) {
 
 	fragColor = vec4(code.rgb + mask.rgb * code.a * 2, 0);
 
-	code = sample_code(tex_aux[0], code_params, codeUV + vec2(-0.0359, -0.04837) * time);
+	code = sample_code(tex_aux0, code_params, codeUV + vec2(-0.0359, -0.04837) * time);
 	fragColor.rgb += vec3(mask.rgb * code.a * 2);
 
 	fragColor *= color * mask.a;

src/stages/stagex/spells/fork_bomb.c

@@ -12,13 +12,13 @@ static void draw_scuttle_proj(Projectile *p, int t, ProjDrawRuleArgs args) {
 	Animation *ani = res_anim("boss/scuttle");
 	AniSequence *seq = get_ani_sequence(ani, "main");
  	r_draw_sprite(&(SpriteParams){
-	 	.shader = "sprite_default",
-	 	.pos.as_cmplx = p->pos,
-	 	.scale.as_cmplx = p->scale,
-	 	.sprite_ptr = animation_get_frame(ani, seq, global.frames),
-	 	.color = &p->color,
-	 	.rotation.angle = p->angle+M_PI/2,
- 	});
+		.shader_ptr = res_shader("sprite_default"),
+		.pos.as_cmplx = p->pos,
+		.scale.as_cmplx = p->scale,
+		.sprite_ptr = animation_get_frame(ani, seq, global.frames),
+		.color = &p->color,
+		.rotation.angle = p->angle+M_PI/2,
+	});
 }
 
 attr_unused // TODO: remove me

src/stages/stagex/spells/trap_representation.c

@@ -27,12 +27,12 @@ static void draw_wriggle_proj(Projectile *p, int t, ProjDrawRuleArgs args) {
 	Animation *ani = res_anim("boss/wriggle");
 	AniSequence *seq = get_ani_sequence(ani, "fly");
  	r_draw_sprite(&(SpriteParams){
-	 	.shader = "sprite_default",
-	 	.pos.as_cmplx = p->pos,
-	 	.scale.as_cmplx = p->scale,
-	 	.sprite_ptr = animation_get_frame(ani, seq, global.frames),
-	 	.color = &p->color,
-	 	.rotation.angle = p->angle+M_PI/2,
+		.shader_ptr = res_shader("sprite_default"),
+		.pos.as_cmplx = p->pos,
+		.scale.as_cmplx = p->scale,
+		.sprite_ptr = animation_get_frame(ani, seq, global.frames),
+		.color = &p->color,
+		.rotation.angle = p->angle+M_PI/2,
  	});
 }
 

src/stages/stagex/yumemi.c

@@ -328,9 +328,7 @@ void stagex_yumemi_slave_laser_sweep(YumemiSlave *slave, real s, cmplx target) {
 void stagex_draw_yumemi_portrait_overlay(SpriteParams *sp) {
 	StageXDrawData *draw_data = stagex_get_draw_data();
 
-	sp->sprite = NULL;
 	sp->sprite_ptr = res_sprite("dialog/yumemi_misc_code_mask");
-	sp->shader = NULL;
 	sp->shader_ptr = res_shader("sprite_yumemi_overlay");
 	sp->aux_textures[0] = res_texture("stagex/code");
 	sp->shader_params = &(ShaderCustomParams) {