diff --git a/th01/main/bullet/pellet.cpp b/th01/main/bullet/pellet.cpp
index 7f7f1a32..c279b610 100644
--- a/th01/main/bullet/pellet.cpp
+++ b/th01/main/bullet/pellet.cpp
@@ -366,7 +366,7 @@ void CPellets::motion_type_apply_for_cur(void)
 		if(p->cur_top.to_pixel() <= PELLET_BOUNCE_TOP_MIN) {
 			p->velocity.x.set(0.0f);
 			p->velocity.y.v = p->speed.v;
-			p->motion_type = PM_NORMAL;
+			p->motion_type = PM_REGULAR;
 			if(p->cur_top.to_pixel() <= PLAYFIELD_TOP) {
 				p->cur_top.set(PLAYFIELD_TOP + 1.0f);
 			}
@@ -541,7 +541,7 @@ bool16 CPellets::visible_after_hittests_for_cur(
 		}
 		vector2(p->velocity.x.v, p->velocity.y.v, to_sp(8.0f), deflect_angle);
 		if(!p->from_group) {
-			p->motion_type = PM_NORMAL;
+			p->motion_type = PM_REGULAR;
 		}
 		// Yes, deflected pellets aren't rendered on the frames they're
 		// deflected on!
diff --git a/th01/main/bullet/pellet.hpp b/th01/main/bullet/pellet.hpp
index 7bab4c50..e696d9d5 100644
--- a/th01/main/bullet/pellet.hpp
+++ b/th01/main/bullet/pellet.hpp
@@ -10,7 +10,7 @@ static const unsigned char PELLET_SPIN_DELTA_ANGLE = +0x04;
 
 enum pellet_motion_t {
 	// No velocity change during regular pellet updates.
-	PM_NORMAL = 0,
+	PM_REGULAR = 0,
 
 	// Accelerates the Y velocity of the pellet by its [speed] every frame.
 	PM_GRAVITY = 1,
@@ -32,7 +32,7 @@ enum pellet_motion_t {
 
 	// Lets the pellet bounce off the top of the playfield once, zeroing its
 	// X velocity, and setting its Y velocity to [speed]. The pellet then
-	// switches to PM_NORMAL.
+	// switches to PM_REGULAR.
 	PM_FALL_STRAIGHT_FROM_TOP_THEN_NORMAL = 4,
 
 	// Spins the pellet on a circle around a [spin_center] point, which moves
@@ -203,7 +203,7 @@ public:
 	// Spawns a number of bullets according to the given [group], with their
 	// corresponding velocities, at (left, top). [speed_base] is tuned
 	// according to the currently played difficulty and the resident
-	// [pellet_speed]. The [motion_type] for the new pellets is PM_NORMAL.
+	// [pellet_speed]. The [motion_type] for the new pellets is PM_REGULAR.
 	void add_group(
 		screen_x_t left,
 		screen_y_t top,
@@ -222,7 +222,7 @@ public:
 		screen_y_t top,
 		unsigned char angle,
 		subpixel_t speed_base,
-		pellet_motion_t motion_type = PM_NORMAL,
+		pellet_motion_t motion_type = PM_REGULAR,
 		subpixel_t speed_for_motion_fixed = to_sp(0.0f),
 		screen_x_t spin_center_x = 0,
 		screen_y_t spin_center_y = 0
diff --git a/th01/main/bullet/pellets[bss].asm b/th01/main/bullet/pellets[bss].asm
index 7d719dc5..8aa247c4 100644
--- a/th01/main/bullet/pellets[bss].asm
+++ b/th01/main/bullet/pellets[bss].asm
@@ -1,6 +1,6 @@
 PELLET_COUNT = 100
 
-PM_NORMAL = 0
+PM_REGULAR = 0
 PM_GRAVITY = 1
 PM_SLING_AIMED = 2
 PM_BOUNCE_FROM_TOP_THEN_GRAVITY = 3
diff --git a/th01_reiiden.asm b/th01_reiiden.asm
index 9a646b86..5f292ae6 100644
--- a/th01_reiiden.asm
+++ b/th01_reiiden.asm
@@ -6866,7 +6866,7 @@ loc_1C55B:
 		or	dx, dx
 		jnz	short loc_1C5BA
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(4 shl 4)
 		mov	al, 80h
 		sub	al, angle_39E16
@@ -6881,7 +6881,7 @@ loc_1C55B:
 		push	offset _Pellets
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(4 shl 4)
 		push	word ptr angle_39E16
 		mov	ax, eye_east.BE_cur_top
@@ -8870,7 +8870,7 @@ loc_1DB5B:
 		call	iatan2
 		mov	angle_39E16, al
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(3 shl 4)
 		push	word ptr angle_39E16
 		mov	bx, si
@@ -9724,7 +9724,7 @@ loc_1E9C6:
 		call	iatan2
 		mov	[bp+@@angle], al
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	speed_39E18
 		push	word ptr [bp+@@angle]
 		mov	bx, si
@@ -9775,7 +9775,7 @@ loc_1EA31:
 		call	iatan2
 		mov	[bp+@@angle], al
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, speed_39E18
 		cwd
 		sub	ax, dx
@@ -10192,7 +10192,7 @@ loc_1EDD9:
 		call	iatan2
 		mov	[bp+@@angle], al
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	speed_39E18
 		push	word ptr [bp+@@angle]
 		mov	bx, si
@@ -10225,7 +10225,7 @@ loc_1EDD9:
 		call	iatan2
 		mov	[bp+@@angle], al
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	speed_39E18
 		push	word ptr [bp+@@angle]
 		mov	bx, si
@@ -11281,7 +11281,7 @@ loc_1F83D:
 
 loc_1F844:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	speed_39E18
 		push	word ptr angle_39E5E
 		mov	bx, si
@@ -13783,7 +13783,7 @@ loc_22A37:
 		or	dx, dx
 		jnz	short loc_22AA5
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(3 shl 4) + 2
 		push	word ptr angle_3A387
 		mov	ax, singyoku_sphere.BE_cur_top
@@ -14124,7 +14124,7 @@ sub_22D63	proc far
 		push	ax	; ret (offset)
 		call	@singyoku_select_for_rank$qmiiiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	[bp+@@speed]
 		push	30h
 		mov	ax, singyoku_sphere.BE_cur_top
@@ -14138,7 +14138,7 @@ sub_22D63	proc far
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		add	sp, 20h
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	[bp+@@speed]
 		push	50h
 		mov	ax, singyoku_sphere.BE_cur_top
@@ -14242,7 +14242,7 @@ loc_22E62:
 		and	al, 7Fh
 		mov	[bp+@@angle], al
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	speed_3A385
 		push	word ptr [bp+@@angle]
 		mov	ax, singyoku_sphere.BE_cur_top
@@ -15776,7 +15776,7 @@ loc_23D63:
 		add	ax, 180
 		mov	di, ax
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(3 shl 4) + 2
 		mov	al, angle_3A6B9
 		add	al, angle_3A6BA
@@ -15811,7 +15811,7 @@ loc_23D63:
 		add	ax, 180
 		mov	di, ax
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(3 shl 4) + 2
 		mov	al, angle_3A6B9
 		add	al, angle_3A6BA
@@ -16252,9 +16252,9 @@ loc_2422C:
 		sar	eax, 8
 		add	ax, 180
 		mov	[bp+@@top], ax
-		call	@CPellets@add_single$qiiuci15pellet_motion_tiii stdcall, offset _Pellets, ds, di, ax, word ptr angle_3A6BD, (2 shl 4) + 4, large PM_NORMAL or (0 shl 16), large 0 or (0 shl 16)
+		call	@CPellets@add_single$qiiuci15pellet_motion_tiii stdcall, offset _Pellets, ds, di, ax, word ptr angle_3A6BD, (2 shl 4) + 4, large PM_REGULAR or (0 shl 16), large 0 or (0 shl 16)
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(2 shl 4) + 4
 		mov	al, angle_3A6BD
 		add	al, 40h
@@ -16266,7 +16266,7 @@ loc_2422C:
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		add	sp, 28h
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(2 shl 4) + 4
 		mov	al, angle_3A6BD
 		add	al, 80h
@@ -16277,7 +16277,7 @@ loc_2422C:
 		push	offset _Pellets
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(2 shl 4) + 4
 		mov	al, angle_3A6BD
 		add	al, -40h
@@ -18720,7 +18720,7 @@ loc_26194:
 
 loc_261B6:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(3 shl 4)
 		mov	ax, 256
 		cwd
@@ -18754,7 +18754,7 @@ loc_261ED:
 
 loc_261F8:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(3 shl 4) + 6
 		mov	ax, 256
 		cwd
@@ -18789,7 +18789,7 @@ loc_26231:
 
 loc_2623C:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(4 shl 4)
 		mov	ax, 256
 		cwd
@@ -18824,7 +18824,7 @@ loc_26275:
 
 loc_26280:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(4 shl 4) + 8
 		mov	ax, 256
 		cwd
@@ -18859,7 +18859,7 @@ loc_262B8:
 
 loc_262C3:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(5 shl 4)
 		mov	ax, 256
 		cwd
@@ -19133,7 +19133,7 @@ loc_26568:
 		and	ax, 3Fh
 		mov	[bp+@@speed], ax
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	ax
 		push	word ptr [bp+@@angle]
 		mov	ax, _boss_phase_frame
@@ -19335,7 +19335,7 @@ loc_26774:
 
 loc_26791:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		push	(6 shl 4)
 		push	word ptr [bp+@@angle]
 		mov	bx, si
@@ -20285,7 +20285,7 @@ loc_27008:
 
 loc_2702A:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, si
 		add	ax, word_3A6CC
 		shl	ax, 4
@@ -20301,7 +20301,7 @@ loc_2702A:
 		push	offset _Pellets
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, si
 		add	ax, word_3A6CC
 		shl	ax, 4
@@ -20334,7 +20334,7 @@ loc_27088:
 
 loc_27093:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, si
 		add	ax, word_3A6CC
 		shl	ax, 4
@@ -20350,7 +20350,7 @@ loc_27093:
 		push	offset _Pellets
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, si
 		add	ax, word_3A6CC
 		shl	ax, 4
@@ -20383,7 +20383,7 @@ loc_270F1:
 
 loc_270FC:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, si
 		add	ax, word_3A6CC
 		shl	ax, 4
@@ -20399,7 +20399,7 @@ loc_270FC:
 		push	offset _Pellets
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, si
 		add	ax, word_3A6CC
 		shl	ax, 4
@@ -20433,7 +20433,7 @@ loc_27159:
 
 loc_27168:
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, word_3A6CC
 		add	ax, 2
 		shl	ax, 4
@@ -20451,7 +20451,7 @@ loc_27168:
 		push	offset _Pellets
 		call	@CPellets@add_single$qiiuci15pellet_motion_tiii
 		pushd	0 or (0 shl 16)
-		pushd	PM_NORMAL or (0 shl 16)
+		pushd	PM_REGULAR or (0 shl 16)
 		mov	ax, word_3A6CC
 		add	ax, 2
 		shl	ax, 4