Merge branch 'debloated' into anniversary

Author: nmlgc

th01/main/bonus.cpp

@@ -461,7 +461,7 @@ void totle_animate(int stage_num)
 	int bonus_div_10000;
 
 	Shots.unput_and_reset();
-	Pellets.unput_and_reset();
+	Pellets.unput_and_reset_nonclouds();
 	frame_delay(50);
 
 	long val = 0;

th01/main/boss/b05.cpp

@@ -782,7 +782,7 @@ void singyoku_main(void)
 		ent_sphere.put_8();
 
 		mdrv2_bgm_fade_out_nonblock();
-		Pellets.unput_and_reset();
+		Pellets.unput_and_reset_nonclouds();
 		singyoku_defeat_animate_and_select_route();
 	}
 }

th01/main/boss/b10j.cpp

@@ -1339,7 +1339,7 @@ void mima_main(void)
 			graph_accesspage_func(0);
 
 			mdrv2_bgm_fade_out_nonblock();
-			Pellets.unput_and_reset();
+			Pellets.unput_and_reset_nonclouds();
 			Missiles.reset();
 			shootout_lasers_reset();
 			boss_defeat_animate();

th01/main/boss/b10m.cpp

@@ -1204,7 +1204,7 @@ inline void conditionally_reset_missiles(bool cond) {
 #define yuugenmagan_defeat_if(cond, reset_missiles, tmp_i) { \
 	if(cond) { \
 		mdrv2_bgm_fade_out_nonblock(); \
-		Pellets.unput_and_reset(); \
+		Pellets.unput_and_reset_nonclouds(); \
 		conditionally_reset_missiles(reset_missiles); \
 		boss_defeat_animate(); \
 	} \

th01/main/boss/b15j.cpp

@@ -1137,7 +1137,7 @@ void kikuri_main(void)
 		hit.update_and_render(flash_colors);
 		if(boss_hp <= 0) {
 			mdrv2_bgm_fade_out_nonblock();
-			Pellets.unput_and_reset();
+			Pellets.unput_and_reset_nonclouds();
 			shootout_lasers_reset();
 			boss_defeat_animate();
 		}

th01/main/boss/b15m.cpp

@@ -2108,7 +2108,7 @@ void elis_main(void)
 			int i;
 
 			mdrv2_bgm_fade_out_nonblock();
-			Pellets.unput_and_reset();
+			Pellets.unput_and_reset_nonclouds();
 			girl_bg_put(1);
 			Missiles.reset();
 			shootout_lasers_reset();

th01/main/boss/b20m.cpp

@@ -2706,7 +2706,7 @@ void sariel_main(void)
 		invincibility_frame = 399;
 
 		Shots.unput_and_reset();
-		Pellets.unput_and_reset();
+		Pellets.unput_and_reset_nonclouds();
 		shootout_lasers_reset();
 
 		// MODDERS: Move this to a common player reset function.

th01/main/bullet/pellet.cpp

@@ -215,8 +215,7 @@ void CPellets::add_group(
 	Subpixel vel_x;
 	Subpixel vel_y;
 
-	// Should be >=, but yeah, it's just an inconsequential oversight.
-	if(alive_count > PELLET_COUNT) {
+	if(alive_count >= PELLET_COUNT) {
 		return;
 	}
 	if(
@@ -263,8 +262,7 @@ void CPellets::add_single(
 	Subpixel vel_x;
 	Subpixel vel_y;
 
-	// Should be >=, but yeah, it's just an inconsequential oversight.
-	if(alive_count > PELLET_COUNT) {
+	if(alive_count >= PELLET_COUNT) {
 		return;
 	}
 	speed_set(speed_base);
@@ -591,19 +589,31 @@ void CPellets::unput_update_render(void)
 	}
 }
 
-void CPellets::unput_and_reset(void)
+void CPellets::unput_and_reset_nonclouds(void)
 {
 	p = iteration_start();
 	for(int i = 0; i < PELLET_COUNT; i++, p++) {
+		// ZUN quirk: This condition skips the reset for active delay clouds,
+		// i.e., pellets where (([moving] == false) && ([cloud_frame] > 0)).
+		// These continue their delay animation after this function and
+		// eventually turn into regular pellets. In most cases, that doesn't
+		// matter because this is the final pellet-related method to be called
+		// before the process restarts, but it does make a difference in
+		// exactly two places:
+		//
+		// • The "TAMA DEL" command on the debug screen
+		// • Sariel's second form, where this is the exact reason why some
+		//   pellets are carried over from the first to the second form
 		if(!p->moving) {
 			continue;
 		}
+
 		p_sloppy_wide_unput_at_cur_pos();
 		p->decay_frame = 0;
 		p->moving = false;
 		p->cloud_frame = 0;
+		alive_count--;
 	}
-	alive_count = 0;
 }
 
 void CPellets::decay(void)
@@ -620,18 +630,20 @@ void CPellets::decay(void)
 	}
 }
 
-void CPellets::reset(void)
+void CPellets::reset_nonclouds(void)
 {
 	p = iteration_start();
 	for(int i = 0; i < PELLET_COUNT; i++, p++) {
+		// ZUN quirk: Same as in unput_and_reset_nonclouds().
 		if(!p->moving) {
 			continue;
 		}
+
 		p->moving = false;
 		p->decay_frame = 0;
 		p->cloud_frame = 0;
+		alive_count--;
 	}
-	alive_count = 0;
 }
 
 bool CPellets::hittest_player_for_cur(void)

th01/main/bullet/pellet.hpp

@@ -143,7 +143,9 @@ struct Pellet {
 
 class CPellets {
 	Pellet near pellets[PELLET_COUNT];
-	int alive_count; // only used for one single optimization
+
+	// Actually a reliable counter on this branch, unlike on `master`.
+	int alive_count;
 
 public:
 	// Rendering pellets at odd or even indices this frame?
@@ -215,8 +217,8 @@ class CPellets {
 	// Also calls Shots.unput_update_render()!
 	void unput_update_render(void);
 
-	void unput_and_reset(void);
-	void reset(void);
+	void unput_and_reset_nonclouds(void);
+	void reset_nonclouds(void);
 };
 
 /// Globals

th01/main/debug.cpp

@@ -100,7 +100,7 @@ void debug_mem(void)
 			}
 			recurse();
 		} else if(input_up) {
-			Pellets.unput_and_reset();
+			Pellets.unput_and_reset_nonclouds();
 			recurse();
 		} else if(input_down) {
 			recurse();