diff --git a/th01_reiiden.asm b/th01_reiiden.asm
index 1e3e3a8f..8029aea4 100644
--- a/th01_reiiden.asm
+++ b/th01_reiiden.asm
@@ -1081,7 +1081,7 @@ loc_BFF1:
 		or	dx, dx
 		jnz	loc_C113
 		mov	al, byte ptr [bp+arg_0]
-		mov	byte_387D9, al
+		mov	angle_387D9, al
 		mov	[bp+var_2], 0
 		jmp	loc_C10B
 ; ---------------------------------------------------------------------------
@@ -1110,9 +1110,9 @@ loc_C014:
 		shl	ax, 2
 		sub	dx, ax
 		movsx	eax, dx
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _CosTable8[bx]
@@ -1131,9 +1131,9 @@ loc_C014:
 		shl	ax, 2
 		sub	dx, ax
 		movsx	eax, dx
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -1169,9 +1169,9 @@ loc_C0D2:
 		call	sub_1754D
 		add	sp, 0Ah
 		inc	si
-		mov	al, byte_387D9
+		mov	al, angle_387D9
 		add	al, 1Ch
-		mov	byte_387D9, al
+		mov	angle_387D9, al
 
 loc_C0F3:
 		mov	ax, [bp+var_2]
@@ -1180,7 +1180,7 @@ loc_C0F3:
 		jg	loc_C014
 		mov	al, byte ptr [bp+arg_0]
 		neg	al
-		mov	byte_387D9, al
+		mov	angle_387D9, al
 		add	[bp+var_2], 9
 
 loc_C10B:
@@ -1333,7 +1333,7 @@ loc_C21C:
 
 loc_C235:
 		xor	si, si
-		mov	byte_387D9, 0
+		mov	angle_387D9, 0
 		jmp	loc_C38C
 ; ---------------------------------------------------------------------------
 
@@ -1342,9 +1342,9 @@ loc_C23F:				; ...
 		add	ax, 0FFCEh
 		imul	ax, 6
 		cwde
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _CosTable8[bx]
@@ -1356,9 +1356,9 @@ loc_C23F:				; ...
 		add	ax, 0FFCEh
 		imul	ax, 6
 		cwde
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -1375,9 +1375,9 @@ loc_C23F:				; ...
 		add	ax, 0FFCEh
 		imul	ax, 7
 		cwde
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _CosTable8[bx]
@@ -1389,9 +1389,9 @@ loc_C23F:				; ...
 		add	ax, 0FFCEh
 		imul	ax, 7
 		cwde
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -1408,9 +1408,9 @@ loc_C23F:				; ...
 		add	ax, 0FFCEh
 		shl	ax, 3
 		cwde
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _CosTable8[bx]
@@ -1422,9 +1422,9 @@ loc_C23F:				; ...
 		add	ax, 0FFCEh
 		shl	ax, 3
 		cwde
-		mov	dl, byte_387D9
+		mov	dl, angle_387D9
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -1438,9 +1438,9 @@ loc_C23F:				; ...
 		call	sub_1156E
 		add	sp, 8
 		inc	si
-		mov	al, byte_387D9
+		mov	al, angle_387D9
 		add	al, 10h
-		mov	byte_387D9, al
+		mov	angle_387D9, al
 
 loc_C38C:
 		cmp	si, 10h
@@ -5342,7 +5342,7 @@ main_15_TEXT	segment	byte public 'CODE' use16
 
 sub_1209D	proc far
 
-var_1		= byte ptr -1
+@@angle		= byte ptr -1
 arg_0		= dword	ptr  6
 arg_4		= word ptr  0Ah
 arg_6		= word ptr  0Ch
@@ -5383,17 +5383,17 @@ arg_12		= word ptr  18h
 		sub	ax, di
 		push	ax
 		call	iatan2
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _CosTable8[bx]
 		les	bx, [bp+arg_0]
 		mov	es:[bx+32h], eax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _SinTable8[bx]
@@ -10474,16 +10474,16 @@ arg_E		= word ptr  14h
 loc_16351:
 		movsx	eax, [bp+arg_C]
 		mov	bx, di
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
-		mov	ebx, 100h
+		mov	ebx, 256
 		cdq
 		idiv	ebx
 		add	ax, [bp+arg_4]
 		mov	[bp+var_2], ax
-		mov	ax, 100h
+		mov	ax, 256
 		cwd
 		idiv	[bp+arg_A]
 		add	di, ax
@@ -10535,16 +10535,16 @@ arg_E		= word ptr  14h
 loc_163B5:
 		movsx	eax, [bp+arg_C]
 		mov	bx, di
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
-		mov	ebx, 100h
+		mov	ebx, 256
 		cdq
 		idiv	ebx
 		add	ax, [bp+arg_4]
 		mov	[bp+var_2], ax
-		mov	ax, 100h
+		mov	ax, 256
 		cwd
 		idiv	[bp+arg_A]
 		add	di, ax
@@ -10604,31 +10604,31 @@ arg_16		= word ptr  1Ch
 loc_16423:
 		movsx	eax, [bp+arg_C]
 		mov	bx, [bp+var_2]
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
-		mov	ebx, 100h
+		mov	ebx, 256
 		cdq
 		idiv	ebx
 		add	ax, [bp+arg_4]
 		mov	di, ax
 		movsx	eax, [bp+arg_14]
 		mov	bx, [bp+var_6]
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
-		mov	ebx, 100h
+		mov	ebx, 256
 		cdq
 		idiv	ebx
 		add	ax, [bp+arg_10]
 		mov	[bp+var_4], ax
-		mov	ax, 100h
+		mov	ax, 256
 		cwd
 		idiv	[bp+arg_A]
 		add	[bp+var_2], ax
-		mov	ax, 100h
+		mov	ax, 256
 		cwd
 		idiv	[bp+arg_12]
 		add	[bp+var_6], ax
@@ -12624,7 +12624,7 @@ arg_E		= byte ptr  14h
 loc_17897:
 		movsx	eax, [bp+arg_4]
 		mov	bx, si
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -12633,7 +12633,7 @@ loc_17897:
 		mov	[bp+var_6], ax
 		movsx	eax, [bp+arg_6]
 		mov	bx, si
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -12733,7 +12733,7 @@ arg_C		= byte ptr  12h
 loc_1796F:
 		movsx	eax, [bp+arg_4]
 		mov	bx, si
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -12742,7 +12742,7 @@ loc_1796F:
 		mov	di, ax
 		movsx	eax, [bp+arg_6]
 		mov	bx, si
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -19434,7 +19434,7 @@ loc_1B956:
 		mov	bx, si
 		imul	bx, 33h
 		add	bx, di
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -19447,7 +19447,7 @@ loc_1B956:
 		mov	bx, si
 		imul	bx, 33h
 		add	bx, di
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -22329,7 +22329,7 @@ loc_1D7B1:
 		movsx	eax, word_39DFA
 		mov	bx, si
 		imul	bx, 33h
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -22341,7 +22341,7 @@ loc_1D7B1:
 		movsx	eax, word_39DFA
 		mov	bx, si
 		imul	bx, 33h
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -24144,7 +24144,7 @@ sub_1E841	endp
 sub_1E886	proc near
 
 arg_0		= word ptr  4
-arg_2		= byte ptr  6
+@@angle		= byte ptr  6
 arg_4		= word ptr  8
 arg_6		= word ptr  0Ah
 arg_8		= word ptr  0Ch
@@ -24163,9 +24163,9 @@ arg_E		= dword	ptr  12h
 
 loc_1E895:
 		movsx	eax, si
-		mov	dl, [bp+arg_2]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _CosTable8[bx]
@@ -24178,9 +24178,9 @@ loc_1E895:
 		add	bx, dx
 		mov	es:[bx], ax
 		movsx	eax, si
-		mov	dl, [bp+arg_2]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -24192,11 +24192,11 @@ loc_1E895:
 		les	bx, [bp+arg_A]
 		add	bx, dx
 		mov	es:[bx], ax
-		mov	ax, 100h
+		mov	ax, 256
 		cwd
 		idiv	di
-		add	al, [bp+arg_2]
-		mov	[bp+arg_2], al
+		add	al, [bp+@@angle]
+		mov	[bp+@@angle], al
 		inc	cx
 
 loc_1E8FE:
@@ -34621,14 +34621,14 @@ loc_24064:
 
 loc_24092:
 		mov	bx, word_3A6CA
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _CosTable8[bx]
 		imul	eax, 6
 		sar	eax, 8
 		mov	si, ax
 		mov	bx, word_3A6CA
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _CosTable8[bx]
 		shl	eax, 1
@@ -35465,7 +35465,7 @@ loc_248BE:
 		imul	edx, eax
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _CosTable8[bx]
 		imul	edx, eax
@@ -35483,7 +35483,7 @@ loc_248BE:
 		imul	edx, eax
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _SinTable8[bx]
 		imul	edx, eax
@@ -35527,7 +35527,7 @@ loc_2495E:
 		imul	edx, eax
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _CosTable8[bx]
 		imul	edx, eax
@@ -35545,7 +35545,7 @@ loc_2495E:
 		imul	edx, eax
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _SinTable8[bx]
 		imul	edx, eax
@@ -35579,7 +35579,7 @@ loc_249EA:
 		imul	edx, eax
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _CosTable8[bx]
 		imul	edx, eax
@@ -35597,7 +35597,7 @@ loc_249EA:
 		imul	edx, eax
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _SinTable8[bx]
 		imul	edx, eax
@@ -37518,7 +37518,7 @@ arg_4		= byte ptr  8
 		enter	8, 0
 		mov	al, [bp+arg_4]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _CosTable8[bx]
@@ -37529,7 +37529,7 @@ arg_4		= byte ptr  8
 		mov	[bp+var_2], ax
 		mov	al, [bp+arg_4]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _SinTable8[bx]
@@ -37540,7 +37540,7 @@ arg_4		= byte ptr  8
 		mov	[bp+var_4], ax
 		mov	al, [bp+arg_2]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _CosTable8[bx]
@@ -37551,7 +37551,7 @@ arg_4		= byte ptr  8
 		mov	[bp+var_6], ax
 		mov	al, [bp+arg_2]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _SinTable8[bx]
@@ -37588,7 +37588,7 @@ arg_2		= byte ptr  6
 		enter	8, 0
 		mov	al, [bp+arg_2]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _CosTable8[bx]
@@ -37599,7 +37599,7 @@ arg_2		= byte ptr  6
 		mov	[bp+@@left], ax
 		mov	al, [bp+arg_2]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _SinTable8[bx]
@@ -37610,7 +37610,7 @@ arg_2		= byte ptr  6
 		mov	[bp+@@top], ax
 		mov	al, [bp+arg_0]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _CosTable8[bx]
@@ -37621,7 +37621,7 @@ arg_2		= byte ptr  6
 		mov	[bp+@@right], ax
 		mov	al, [bp+arg_0]
 		mov	ah, 0
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _SinTable8[bx]
@@ -41016,7 +41016,7 @@ loc_27C7B:
 		mov	dx, si
 		shl	dx, 7
 		add	ax, dx
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _CosTable8[bx]
@@ -41029,7 +41029,7 @@ loc_27C7B:
 		mov	dx, si
 		shl	dx, 7
 		add	ax, dx
-		and	ax, 0FFh
+		and	ax, 255
 		add	ax, ax
 		mov	bx, ax
 		movsx	eax, _SinTable8[bx]
@@ -45335,7 +45335,7 @@ loc_2A4D9:
 		mov	bx, si
 		add	bx, bx
 		mov	bx, [bx+665Bh]
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _SinTable8[bx]
 		shl	eax, 4
@@ -45410,7 +45410,7 @@ loc_2A59F:
 		mov	bx, si
 		add	bx, bx
 		mov	bx, [bx+665Bh]
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	eax, _SinTable8[bx]
 		shl	eax, 4
@@ -48157,7 +48157,7 @@ loc_2C16E:
 		imul	eax, edx
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -48171,7 +48171,7 @@ loc_2C16E:
 		imul	eax, edx
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -48210,7 +48210,7 @@ loc_2C202:
 		imul	eax, edx
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -48224,7 +48224,7 @@ loc_2C202:
 		imul	eax, edx
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -48253,7 +48253,7 @@ loc_2C282:
 		imul	eax, edx
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _CosTable8[bx]
 		imul	eax, edx
@@ -48267,7 +48267,7 @@ loc_2C282:
 		imul	eax, edx
 		mov	bx, si
 		shl	bx, 3
-		and	bx, 0FFh
+		and	bx, 255
 		add	bx, bx
 		movsx	edx, _SinTable8[bx]
 		imul	eax, edx
@@ -55059,7 +55059,7 @@ word_3876D	dw ?
 		db 52 dup(?)
 word_387A3	dw ?
 		db 52 dup(?)
-byte_387D9	db ?
+angle_387D9	db ?
 word_387DA	dw ?
 		db 46 dup(?)
 dword_3880A	dd ?
diff --git a/th02_main.asm b/th02_main.asm
index fea4e29e..e1db7835 100644
--- a/th02_main.asm
+++ b/th02_main.asm
@@ -4080,13 +4080,13 @@ sub_CA1C	endp
 
 sub_CA62	proc near
 
-arg_0		= byte ptr  4
+@@angle		= byte ptr  4
 arg_2		= word ptr  6
 
 		push	bp
 		mov	bp, sp
 		push	si
-		mov	dl, [bp+arg_0]
+		mov	dl, [bp+@@angle]
 		mov	ax, word_205E2
 		shl	ax, 4
 		add	ax, 2908h
@@ -7296,7 +7296,7 @@ sub_E280	endp
 
 sub_E2D9	proc near
 
-var_5		= byte ptr -5
+@@angle		= byte ptr -5
 var_4		= word ptr -4
 var_2		= word ptr -2
 
@@ -7322,7 +7322,7 @@ var_2		= word ptr -2
 
 loc_E30C:
 		movsx	eax, [bp+var_2]
-		mov	dl, [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -7332,7 +7332,7 @@ loc_E30C:
 		add	ax, word_218C4
 		mov	[bp+var_4], ax
 		movsx	eax, [bp+var_2]
-		mov	dl, [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -7352,11 +7352,11 @@ loc_E30C:
 
 loc_E36B:
 		inc	di
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 4
 
 loc_E371:
-		mov	[bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	di, 40h
 		jl	short loc_E30C
 		cmp	word_218B6, 20h	; ' '
@@ -7418,7 +7418,7 @@ sub_E2D9	endp
 
 sub_E3EE	proc near
 
-var_5		= byte ptr -5
+@@angle		= byte ptr -5
 var_4		= word ptr -4
 var_2		= word ptr -2
 
@@ -7447,7 +7447,7 @@ var_2		= word ptr -2
 
 loc_E42A:
 		movsx	eax, di
-		mov	dl, [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -7457,7 +7457,7 @@ loc_E42A:
 		add	ax, word_218C4
 		mov	[bp+var_2], ax
 		movsx	eax, di
-		mov	dl, [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -7470,11 +7470,11 @@ loc_E42A:
 		push	ax
 		call	sub_ED11
 		inc	si
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 4
 
 loc_E47B:
-		mov	[bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	si, 40h
 		jl	short loc_E42A
 		call	grcg_off
@@ -7491,7 +7491,7 @@ sub_E3EE	endp
 
 sub_E48C	proc near
 
-var_5		= byte ptr -5
+@@angle		= byte ptr -5
 var_4		= word ptr -4
 var_2		= word ptr -2
 arg_0		= word ptr  4
@@ -7512,7 +7512,7 @@ arg_0		= word ptr  4
 
 loc_E4AE:
 		movsx	eax, di
-		mov	dl, [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -7522,7 +7522,7 @@ loc_E4AE:
 		add	ax, word_218C4
 		mov	[bp+var_2], ax
 		movsx	eax, di
-		mov	dl, [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -7535,11 +7535,11 @@ loc_E4AE:
 		push	ax
 		call	sub_ED11
 		inc	si
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 4
 
 loc_E4FF:
-		mov	[bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	si, 40h
 		jl	short loc_E4AE
 		call	grcg_off
@@ -9804,7 +9804,7 @@ sub_FF91	endp
 sub_FFF8	proc near
 
 var_A		= byte ptr -0Ah
-var_9		= byte ptr -9
+@@angle		= byte ptr -9
 var_8		= word ptr -8
 @@y		= word ptr -6
 @@patnum		= word ptr -4
@@ -9899,9 +9899,9 @@ loc_100BA:
 loc_100DB:
 		mov	al, byte ptr [bp+var_8]
 		add	al, byte ptr [bp+arg_0]
-		mov	[bp+var_9], al
+		mov	[bp+@@angle], al
 		movsx	eax, si
-		mov	dl, [bp+var_9]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -9911,12 +9911,12 @@ loc_100DB:
 		add	ax, [bp+arg_4]
 		mov	di, ax
 		movsx	eax, si
-		mov	dl, [bp+var_9]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
-		mov	bl, byte_1E510
+		mov	bl, angle_1E510
 		mov	bh, 0
 		add	dx, bx
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -9967,9 +9967,9 @@ loc_10171:
 loc_1019D:
 		mov	al, byte ptr [bp+var_8]
 		add	al, byte ptr [bp+arg_0]
-		mov	[bp+var_9], al
+		mov	[bp+@@angle], al
 		movsx	eax, si
-		mov	dl, [bp+var_9]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -9979,12 +9979,12 @@ loc_1019D:
 		add	ax, [bp+arg_4]
 		mov	di, ax
 		movsx	eax, si
-		mov	dl, [bp+var_9]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
-		mov	bl, byte_1E510
+		mov	bl, angle_1E510
 		mov	bh, 0
 		add	dx, bx
-		and	dx, 0FFh
+		and	dx, 255
 		add	dx, dx
 		mov	bx, dx
 		movsx	edx, _SinTable8[bx]
@@ -11661,7 +11661,7 @@ sub_10E4F	endp
 
 sub_10E95	proc far
 
-var_3		= byte ptr -3
+@@angle		= byte ptr -3
 var_2		= word ptr -2
 
 		push	bp
@@ -11802,7 +11802,7 @@ loc_10FF6:
 
 loc_11013:
 		movsx	eax, word_22D9E
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -11812,7 +11812,7 @@ loc_11013:
 		add	ax, word_22DA0
 		mov	[bp+var_2], ax
 		movsx	eax, word_22D9E
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -11848,11 +11848,11 @@ loc_11095:
 		push	si
 		call	grcg_pset
 		inc	di
-		mov	al, [bp+var_3]
+		mov	al, [bp+@@angle]
 		add	al, 4
 
 loc_110A4:
-		mov	[bp+var_3], al
+		mov	[bp+@@angle], al
 		cmp	di, 40h
 		jl	loc_11013
 		call	grcg_off
@@ -12730,7 +12730,7 @@ loc_117F3:
 loc_11810:
 		cmp	word_1EB26, 38h	; '8'
 		jnz	short loc_1181C
-		mov	byte_1E510, 0E0h
+		mov	angle_1E510, -20h
 
 loc_1181C:
 		mov	ax, word_1EB26
@@ -14728,7 +14728,7 @@ loc_127A5:
 		mov	dword_22D58, 0
 		mov	byte_22D56, 0
 		mov	byte_22D57, 0
-		mov	byte_1E510, 20h	; ' '
+		mov	angle_1E510, 20h
 		mov	word_22D9C, 60h
 		mov	ax, _scroll_line
 		add	word_22D9C, ax
@@ -17169,7 +17169,7 @@ rika_init	proc far
 		push	0
 		call	sub_1310B
 		call	sub_12E95
-		mov	byte_1E510, 20h	; ' '
+		mov	angle_1E510, 20h
 		mov	word_20652, 0C0h
 		mov	word_20654, 0C0h
 		mov	word_2065A, 0
@@ -19887,7 +19887,7 @@ loc_15296:
 		mov	word_2065A, 0
 		mov	byte_2066A, 0
 		mov	word_21748, 2
-		mov	byte_1E510, 0
+		mov	angle_1E510, 0
 		mov	byte_252F6, 0
 		mov	byte_252F7, 0
 		mov	word_250FE, 0
@@ -21379,7 +21379,7 @@ sub_15F6F	endp
 
 sub_15F95	proc near
 
-var_1		= byte ptr -1
+@@angle		= byte ptr -1
 
 		push	bp
 		mov	bp, sp
@@ -21414,7 +21414,7 @@ loc_15FCF:
 		mov	word_2559C, ax
 		mov	byte_2558C, 3
 		mov	byte_2558D, 0FCh
-		mov	byte_2559E, 0
+		mov	angle_2559E, 0
 		mov	patnum_2064E, 128
 
 loc_15FFD:
@@ -21466,7 +21466,7 @@ loc_1607A:
 		idiv	bx
 		or	dx, dx
 		jnz	loc_16122
-		mov	al, byte_2559E
+		mov	al, angle_2559E
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -21475,7 +21475,7 @@ loc_1607A:
 		sar	eax, 8
 		add	ax, word_2559A
 		mov	si, ax
-		mov	al, byte_2559E
+		mov	al, angle_2559E
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -21488,9 +21488,9 @@ loc_1607A:
 		push	ax
 		push	18h
 		call	sub_155C5
-		mov	al, byte_2559E
+		mov	al, angle_2559E
 		add	al, 80h
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -21499,7 +21499,7 @@ loc_1607A:
 		sar	eax, 8
 		add	ax, word_2559A
 		mov	si, ax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -21512,9 +21512,9 @@ loc_1607A:
 		push	ax
 		push	18h
 		call	sub_155C5
-		mov	al, byte_2559E
-		add	al, 0F0h
-		mov	byte_2559E, al
+		mov	al, angle_2559E
+		add	al, -10h
+		mov	angle_2559E, al
 
 loc_16122:
 		cmp	word_20650, 0C8h
@@ -23042,7 +23042,7 @@ var_7		= byte ptr -7
 var_6		= byte ptr -6
 var_5		= byte ptr -5
 var_4		= byte ptr -4
-var_3		= byte ptr -3
+@@angle		= byte ptr -3
 var_2		= word ptr -2
 
 		push	bp
@@ -23142,7 +23142,7 @@ loc_16F0F:
 
 loc_16F19:
 		call	randring2_next8
-		mov	[bp+var_3], al
+		mov	[bp+@@angle], al
 		mov	al, [bp+var_7]
 		mov	ah, 0
 		add	ax, word_26C44
@@ -23150,7 +23150,7 @@ loc_16F19:
 		mov	al, [bx+1]
 		mov	[bp+var_5], al
 		mov	ah, 0
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -23160,7 +23160,7 @@ loc_16F19:
 		mov	[bx], al
 		mov	al, [bp+var_5]
 		mov	ah, 0
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -24447,7 +24447,7 @@ sub_17A55	endp
 sub_17A7F	proc near
 
 var_4		= byte ptr -4
-var_3		= byte ptr -3
+@@angle		= byte ptr -3
 var_2		= word ptr -2
 arg_0		= word ptr  4
 arg_2		= byte ptr  6
@@ -24474,9 +24474,9 @@ arg_8		= word ptr  0Ch
 
 loc_17AA9:
 		mov	al, byte ptr [bp+var_2]
-		mov	[bp+var_3], al
+		mov	[bp+@@angle], al
 		movzx	eax, byte_26CC1
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -24486,9 +24486,9 @@ loc_17AA9:
 		add	ax, 0E0h
 		mov	word_20164, ax
 		mov	al, [bp+arg_6]
-		add	[bp+var_3], al
+		add	[bp+@@angle], al
 		movzx	eax, byte_26CC1
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25259,7 +25259,7 @@ sub_181B3	proc near
 
 var_4		= word ptr -4
 var_2		= byte ptr -2
-var_1		= byte ptr -1
+@@angle		= byte ptr -1
 
 		push	bp
 		mov	bp, sp
@@ -25310,12 +25310,12 @@ loc_1821A:
 		shr	[bp+var_2], 2
 		xor	si, si
 		mov	al, byte_26CC8
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		jmp	short loc_1829D
 ; ---------------------------------------------------------------------------
 
 loc_18246:
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -25324,7 +25324,7 @@ loc_18246:
 		sar	eax, 8
 		add	ax, word_26C58
 		mov	di, ax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -25335,7 +25335,7 @@ loc_18246:
 		mov	[bp+var_4], ax
 		call	grcg_line pascal, word_26C58, word_26C60, di, ax
 		mov	al, [bp+var_2]
-		add	[bp+var_1], al
+		add	[bp+@@angle], al
 		inc	si
 
 loc_1829D:
@@ -25373,7 +25373,7 @@ loc_182DD:
 		mov	[bx], dx
 		call	grcg_setcolor pascal, (GC_RMW shl 16) + 13
 		call	randring2_next8_and pascal, 7Fh
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		mov	bx, word_2065C
 		add	ax, [bx]
@@ -25431,18 +25431,18 @@ loc_1838D:
 		jnz	short loc_183CC
 		cmp	byte_26CC0, 0
 		jnz	short loc_183AE
-		mov	[bp+var_1], 25h	; '%'
+		mov	[bp+@@angle], 25h
 		jmp	short loc_183B2
 ; ---------------------------------------------------------------------------
 
 loc_183AE:
-		mov	[bp+var_1], 27h	; '''
+		mov	[bp+@@angle], 27h
 
 loc_183B2:
 		push	word_26C56
 		push	word_26C5E
 		push	0
-		push	word ptr [bp+var_1]
+		push	word ptr [bp+@@angle]
 		push	3Ch ; '<'
 		call	sub_1078E
 		jmp	short loc_183CC
@@ -25465,7 +25465,8 @@ sub_181B3	endp
 
 sub_183D0	proc near
 
-var_5		= word ptr -5
+@@angle		= byte ptr -5
+var_4		= word ptr -4
 var_2		= word ptr -2
 arg_0		= dword	ptr  4
 arg_4		= dword	ptr  8
@@ -25509,7 +25510,7 @@ loc_18424:
 
 loc_18451:
 		movsx	eax, word_26CD0
-		mov	dl, byte ptr [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25526,7 +25527,7 @@ loc_18451:
 		add	bx, bx
 		mov	[bx-6E04h], ax
 		movsx	eax, word_26CD0
-		mov	dl, byte ptr [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25546,11 +25547,11 @@ loc_18451:
 		add	bx, bx
 		mov	word ptr [bx-6DC4h], 1
 		inc	[bp+var_2]
-		mov	al, byte ptr [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 40h
 
 loc_184D4:
-		mov	byte ptr [bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	[bp+var_2], 4
 		jl	loc_18451
 		jmp	loc_1889C
@@ -25567,7 +25568,7 @@ loc_184E2:
 
 loc_184FB:
 		movsx	eax, word_26CD0
-		mov	dl, byte ptr [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25586,7 +25587,7 @@ loc_184FB:
 		mov	bx, dx
 		mov	[bx-6E04h], ax
 		movsx	eax, word_26CD0
-		mov	dl, byte ptr [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25605,11 +25606,11 @@ loc_184FB:
 		mov	bx, dx
 		mov	[bx-6DE4h], ax
 		inc	[bp+var_2]
-		mov	al, byte ptr [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 40h
 
 loc_1857B:
-		mov	byte ptr [bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	[bp+var_2], 4
 		jl	loc_184FB
 		jmp	loc_1889C
@@ -25665,7 +25666,7 @@ loc_185EA:
 		mov	ax, [bx-6DE4h]
 		add	ax, 0Ch
 		mov	di, ax
-		mov	[bp+var_5+1], 0
+		mov	[bp+var_4], 0
 		mov	al, byte ptr [bp+var_2]
 		shl	al, 6
 		add	al, byte_26CD2
@@ -25676,19 +25677,19 @@ loc_185EA:
 loc_18631:
 		push	si
 		push	di
-		push	[bp+var_5]
+		push	word ptr [bp+@@angle]
 		push	20h ; ' '
 		push	23h ; '#'
 		call	sub_1078E
-		inc	[bp+var_5+1]
-		mov	al, byte ptr [bp+var_5]
+		inc	[bp+var_4]
+		mov	al, [bp+@@angle]
 		add	al, 8
 
 loc_18645:
-		mov	byte ptr [bp+var_5], al
-		cmp	[bp+var_5+1], 10h
+		mov	[bp+@@angle], al
+		cmp	[bp+var_4], 10h
 		jl	short loc_18631
-		mov	[bp+var_5+1], 0
+		mov	[bp+var_4], 0
 		mov	al, byte ptr [bp+var_2]
 		shl	al, 6
 		add	al, byte_26CD2
@@ -25699,19 +25700,19 @@ loc_18645:
 loc_18661:
 		push	si
 		push	di
-		push	[bp+var_5]
+		push	word ptr [bp+@@angle]
 		push	20h ; ' '
 		mov	ax, 23h	; '#'
-		sub	ax, [bp+var_5+1]
+		sub	ax, [bp+var_4]
 		push	ax
 		call	sub_1078E
-		inc	[bp+var_5+1]
-		mov	al, byte ptr [bp+var_5]
+		inc	[bp+var_4]
+		mov	al, [bp+@@angle]
 		add	al, 8
 
 loc_1867A:
-		mov	byte ptr [bp+var_5], al
-		cmp	[bp+var_5+1], 10h
+		mov	[bp+@@angle], al
+		cmp	[bp+var_4], 10h
 		jl	short loc_18661
 		mov	bx, [bp+var_2]
 		add	bx, bx
@@ -25758,7 +25759,7 @@ loc_186CA:
 		call	_snd_se_play c, 3
 		mov	al, byte_26CD2
 		add	al, 8
-		mov	byte ptr [bp+var_5], al
+		mov	[bp+@@angle], al
 		mov	[bp+var_2], 0
 		jmp	short loc_18770
 ; ---------------------------------------------------------------------------
@@ -25784,30 +25785,30 @@ loc_1870B:
 		mov	ax, [bx-6DE4h]
 		add	ax, 0Ch
 		mov	di, ax
-		mov	[bp+var_5+1], 0
+		mov	[bp+var_4], 0
 		jmp	short loc_1875F
 ; ---------------------------------------------------------------------------
 
 loc_18746:
 		push	si
 		push	di
-		mov	al, byte ptr [bp+var_5]
-		add	al, byte ptr [bp+var_5+1]
+		mov	al, [bp+@@angle]
+		add	al, byte ptr [bp+var_4]
 		push	ax
 		push	20h ; ' '
-		mov	ax, [bp+var_5+1]
+		mov	ax, [bp+var_4]
 		add	ax, 23h	; '#'
 		push	ax
 		call	sub_1078E
-		add	[bp+var_5+1], 0Ch
+		add	[bp+var_4], 0Ch
 
 loc_1875F:
-		cmp	[bp+var_5+1], 30h ; '0'
+		cmp	[bp+var_4], 30h ; '0'
 		jl	short loc_18746
 		inc	[bp+var_2]
-		mov	al, byte ptr [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 40h
-		mov	byte ptr [bp+var_5], al
+		mov	[bp+@@angle], al
 
 loc_18770:
 		cmp	[bp+var_2], 4
@@ -25879,7 +25880,7 @@ loc_18806:
 
 loc_18811:
 		movsx	eax, word_26CD0
-		mov	dl, byte ptr [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25898,7 +25899,7 @@ loc_18811:
 		mov	bx, dx
 		mov	[bx-6E04h], ax
 		movsx	eax, word_26CD0
-		mov	dl, byte ptr [bp+var_5]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -25917,11 +25918,11 @@ loc_18811:
 		mov	bx, dx
 		mov	[bx-6DE4h], ax
 		inc	[bp+var_2]
-		mov	al, byte ptr [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 40h
 
 loc_18891:
-		mov	byte ptr [bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	[bp+var_2], 4
 		jl	loc_18811
 
@@ -26604,7 +26605,7 @@ sub_18DE0	endp
 
 sub_18EB8	proc near
 
-var_4		= byte ptr -4
+@@angle		= byte ptr -4
 var_3		= word ptr -3
 
 		push	bp
@@ -26644,7 +26645,7 @@ loc_18F05:
 
 loc_18F32:
 		movsx	eax, word_26CEA
-		mov	dl, [bp+var_4]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -26661,7 +26662,7 @@ loc_18F32:
 		add	bx, bx
 		mov	[bx-6E04h], ax
 		movsx	eax, word_26CEA
-		mov	dl, [bp+var_4]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -26681,11 +26682,11 @@ loc_18F32:
 		add	bx, bx
 		mov	word ptr [bx-6DC4h], 1
 		inc	[bp+var_3+1]
-		mov	al, [bp+var_4]
+		mov	al, [bp+@@angle]
 		add	al, 40h
 
 loc_18FB5:
-		mov	[bp+var_4], al
+		mov	[bp+@@angle], al
 		cmp	[bp+var_3+1], 4
 		jl	loc_18F32
 		jmp	loc_19169
@@ -26700,7 +26701,7 @@ loc_18FC3:
 
 loc_18FD3:
 		movsx	eax, word_26CEA
-		mov	dl, [bp+var_4]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -26717,7 +26718,7 @@ loc_18FD3:
 		mov	bx, dx
 		mov	[bx-6E04h], ax
 		movsx	eax, word_26CEA
-		mov	dl, [bp+var_4]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -26819,11 +26820,11 @@ loc_190EF:
 
 loc_19127:
 		inc	[bp+var_3+1]
-		mov	al, [bp+var_4]
+		mov	al, [bp+@@angle]
 		add	al, 40h
 
 loc_1912F:
-		mov	[bp+var_4], al
+		mov	[bp+@@angle], al
 		cmp	[bp+var_3+1], 4
 		jl	loc_18FD3
 		cmp	word_26CEA, 1CCh
@@ -29324,7 +29325,7 @@ loc_1AA1A:
 		mov	byte_26D4D, 0
 		mov	byte_26D4E, 0
 		mov	byte_26D4F, 0
-		mov	byte_1E510, 0E0h
+		mov	angle_1E510, -20h
 		call	sub_1B214
 		pop	si
 		pop	bp
@@ -29572,7 +29573,7 @@ sub_1AC7B	proc near
 		jl	short loc_1AD16
 		cmp	word_1EE9A, 38h	; '8'
 		jnz	short loc_1ACAA
-		mov	byte_1E510, 20h	; ' '
+		mov	angle_1E510, 20h
 
 loc_1ACAA:
 		mov	ax, point_26D76.x
@@ -29589,7 +29590,7 @@ loc_1ACAA:
 		jl	short loc_1AD16
 		cmp	word_1EE9A, 50h	; 'P'
 		jnz	short loc_1ACD5
-		mov	byte_1E510, 0
+		mov	angle_1E510, 0
 
 loc_1ACD5:
 		mov	ax, point_26D76.x
@@ -30595,12 +30596,12 @@ loc_1B57B:
 		mov	ax, point_26D76.y
 		add	ax, 112
 		mov	word_26D84, ax
-		mov	byte_26D86, 0C0h
+		mov	angle_26D86, -40h
 
 loc_1B592:
 		mov	al, byte_26D81
-		add	byte_26D86, al
-		mov	al, byte_26D86
+		add	angle_26D86, al
+		mov	al, angle_26D86
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -30610,7 +30611,7 @@ loc_1B592:
 		add	ax, word_26D82
 		mov	bx, word_2065C
 		mov	[bx], ax
-		mov	al, byte_26D86
+		mov	al, angle_26D86
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -32114,7 +32115,7 @@ main_04_TEXT	segment	byte public 'CODE' use16
 sub_1C287	proc far
 
 var_4		= byte ptr -4
-var_3		= byte ptr -3
+@@angle		= byte ptr -3
 var_2		= word ptr -2
 arg_0		= word ptr  6
 arg_2		= word ptr  8
@@ -32138,9 +32139,9 @@ arg_6		= word ptr  0Ch
 
 loc_1C2A7:
 		mov	al, byte ptr [bp+var_2]
-		mov	[bp+var_3], al
+		mov	[bp+@@angle], al
 		movsx	eax, si
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -32150,7 +32151,7 @@ loc_1C2A7:
 		add	ax, di
 		mov	word_20164, ax
 		movsx	eax, si
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -32200,7 +32201,7 @@ sub_1C287	endp
 sub_1C341	proc far
 
 var_4		= byte ptr -4
-var_3		= byte ptr -3
+@@angle		= byte ptr -3
 var_2		= word ptr -2
 arg_0		= word ptr  6
 arg_2		= word ptr  8
@@ -32222,9 +32223,9 @@ arg_6		= word ptr  0Ch
 
 loc_1C35B:
 		mov	al, byte ptr [bp+var_2]
-		mov	[bp+var_3], al
+		mov	[bp+@@angle], al
 		movsx	eax, [bp+arg_2]
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -32234,7 +32235,7 @@ loc_1C35B:
 		add	ax, [bp+arg_6]
 		mov	si, ax
 		movsx	eax, [bp+arg_2]
-		mov	dl, [bp+var_3]
+		mov	dl, [bp+@@angle]
 		mov	dh, 0
 		add	dx, dx
 		mov	bx, dx
@@ -33750,7 +33751,7 @@ byte_1E503	db 0
 		db    0
 		db  2Fh	; /
 		db    0
-byte_1E510	db 20h
+angle_1E510	db 20h
 		db 0
 word_1E512	dw 0
 		db    0
@@ -34996,7 +34997,7 @@ byte_25598	db ?
 		db ?
 word_2559A	dw ?
 word_2559C	dw ?
-byte_2559E	db ?
+angle_2559E	db ?
 		db ?
 word_255A0	dw ?
 byte_255A2	db ?
@@ -35111,7 +35112,7 @@ word_26D7F	dw ?
 byte_26D81	db ?
 word_26D82	dw ?
 word_26D84	dw ?
-byte_26D86	db ?
+angle_26D86	db ?
 word_26D87	dw ?
 byte_26D89	db ?
 byte_26D8A	db ?
diff --git a/th03_main.asm b/th03_main.asm
index b33bde5e..a3d844ed 100644
--- a/th03_main.asm
+++ b/th03_main.asm
@@ -5807,7 +5807,7 @@ sub_CEB2	endp
 
 sub_CEE0	proc far
 
-var_13		= byte ptr -13h
+@@angle		= byte ptr -13h
 var_12		= word ptr -12h
 var_10		= word ptr -10h
 var_E		= word ptr -0Eh
@@ -5880,7 +5880,7 @@ loc_CF55:
 ; ---------------------------------------------------------------------------
 
 loc_CF62:
-		mov	al, [bp+var_13]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -5896,7 +5896,7 @@ loc_CF62:
 		lea	dx, [bp+var_A]
 		add	bx, dx
 		mov	ss:[bx], ax
-		mov	al, [bp+var_13]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -5916,11 +5916,11 @@ loc_CF62:
 		add	bx, dx
 		mov	ss:[bx], ax
 		inc	di
-		mov	al, [bp+var_13]
+		mov	al, [bp+@@angle]
 		add	al, 40h
 
 loc_CFC1:
-		mov	[bp+var_13], al
+		mov	[bp+@@angle], al
 		cmp	di, 4
 		jl	short loc_CF62
 		call	grcg_line pascal, [bp+var_A], [bp+var_12], [bp+var_8], [bp+var_10]
@@ -9298,7 +9298,7 @@ main_03_TEXT	segment	byte public 'CODE' use16
 
 sub_F1FA	proc near
 
-var_5		= byte ptr -5
+@@angle		= byte ptr -5
 @@top		= word ptr -4
 @@left		= word ptr -2
 @@length		= word ptr  4
@@ -9330,7 +9330,7 @@ loc_F210:
 		imul	[bp+@@length]
 		mov	[bp+@@length], ax
 		mov	al, byte ptr [bp+@@length]
-		mov	[bp+var_5], al
+		mov	[bp+@@angle], al
 		cmp	_pid_current, 1
 		jnz	short loc_F253
 		mov	_sprite16_clip_left, PLAYFIELD1_CLIP_LEFT
@@ -9350,14 +9350,14 @@ loc_F25F:
 ; ---------------------------------------------------------------------------
 
 loc_F26E:
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, di, [bp+@@length], _CosTable8[bx]
 		add	ax, -24
 		mov	[bp+@@left], ax
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -9366,22 +9366,22 @@ loc_F26E:
 		mov	[bp+@@top], ax
 		call	sprite16_put pascal, [bp+@@left], ax, 1930h
 		inc	si
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		add	al, 10h
-		mov	[bp+var_5], al
+		mov	[bp+@@angle], al
 
 loc_F2C3:
 		cmp	si, 10h
 		jl	short loc_F26E
 		mov	al, 0
 		sub	al, byte ptr [bp+@@length]
-		mov	[bp+var_5], al
+		mov	[bp+@@angle], al
 		xor	si, si
 		jmp	short loc_F32F
 ; ---------------------------------------------------------------------------
 
 loc_F2D4:
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -9394,7 +9394,7 @@ loc_F2D4:
 		add	sp, 6
 		add	ax, -24
 		mov	[bp+@@left], ax
-		mov	al, [bp+var_5]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -9409,9 +9409,9 @@ loc_F2D4:
 		mov	[bp+@@top], ax
 		call	sprite16_put pascal, [bp+@@left], ax, 1930h
 		inc	si
-		mov	al, [bp+var_5]
-		add	al, 20h	; ' '
-		mov	[bp+var_5], al
+		mov	al, [bp+@@angle]
+		add	al, 20h
+		mov	[bp+@@angle], al
 
 loc_F32F:
 		cmp	si, 8
@@ -9449,8 +9449,8 @@ sub_F356	proc near
 		add	word_1F33E, ax
 		mov	ax, word_1F348
 		add	word_1F340, ax
-		inc	byte_1F350
-		mov	al, byte_1F350
+		inc	angle_1F350
+		mov	al, angle_1F350
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -10705,24 +10705,24 @@ loc_FE47:
 loc_FE49:
 		mov	byte_20E2A, al
 		call	randring_far_next16
-		mov	byte_20E2B, al
+		mov	angle_20E2B, al
 
 loc_FE54:
 		test	byte ptr word_1F3B0, 1
 		jnz	short loc_FEC4
-		mov	al, byte_20E2B
+		mov	al, angle_20E2B
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, word_1F33E, (48 shl 4), _CosTable8[bx]
 		mov	word_23E3E, ax
-		mov	al, byte_20E2B
+		mov	al, angle_20E2B
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, word_1F340, (48 shl 4), _SinTable8[bx]
 		mov	word_23E40, ax
-		mov	al, byte_20E2B
+		mov	al, angle_20E2B
 		add	al, 40h
 		mov	angle_23E43, al
 		mov	byte_23E4E, 4
@@ -10732,7 +10732,7 @@ loc_FE54:
 		call	sub_17730
 		call	snd_se_play pascal, 10
 		mov	al, byte_20E2A
-		add	byte_20E2B, al
+		add	angle_20E2B, al
 
 loc_FEC4:
 		cmp	word_1F3B0, 48h	; 'H'
@@ -11050,7 +11050,7 @@ sub_10184	proc near
 @@top		= word ptr -6
 var_4		= word ptr -4
 var_2		= word ptr -2
-arg_0		= byte ptr  4
+@@angle		= byte ptr  4
 arg_2		= word ptr  6
 
 		enter	8, 0
@@ -11075,13 +11075,13 @@ arg_2		= word ptr  6
 		mov	ah, SPRITE16_SET_MASK
 		mov	dx, 0AAAAh
 		int	SPRITE16
-		mov	al, [bp+arg_0]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, [bp+var_2], si, _CosTable8[bx]
 		mov	di, ax
-		mov	al, [bp+arg_0]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -11091,15 +11091,15 @@ arg_2		= word ptr  6
 		mov	ah, SPRITE16_SET_MASK
 		mov	dx, 5555h
 		int	SPRITE16
-		mov	al, [bp+arg_0]
+		mov	al, [bp+@@angle]
 		add	al, 80h
-		mov	[bp+arg_0], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, [bp+var_2], si, _CosTable8[bx]
 		mov	di, ax
-		mov	al, [bp+arg_0]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12221,7 +12221,7 @@ reimu_10BFE	endp
 
 sub_10C4D	proc near
 
-var_1		= byte ptr -1
+@@angle		= byte ptr -1
 
 		enter	2, 0
 		cmp	word_1F3B0, 0
@@ -12239,12 +12239,12 @@ var_1		= byte ptr -1
 loc_10C76:
 		mov	al, byte ptr word_1F3B0
 		add	al, al
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		cmp	byte_23DC6, 0
 		jz	short loc_10C8D
 		mov	al, 0
-		sub	al, [bp+var_1]
-		mov	[bp+var_1], al
+		sub	al, [bp+@@angle]
+		mov	[bp+@@angle], al
 
 loc_10C8D:
 		mov	al, byte_1F39F
@@ -12261,37 +12261,37 @@ loc_10C8D:
 		mov	al, 1
 		sub	al, _pid_current
 		mov	_pid_other, al
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		add	al, al
 		mov	angle_23E43, al
 		mov	al, byte_23DC7
 		mov	byte_23E42, al
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, word_1F33E, (32 shl 4), _CosTable8[bx]
 		mov	word_23E3E, ax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, word_1F340, (32 shl 4), _SinTable8[bx]
 		mov	word_23E40, ax
 		call	sub_17730
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		add	al, al
 		add	al, 80h
 		mov	angle_23E43, al
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		add	al, 80h
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, word_1F33E, (32 shl 4), _CosTable8[bx]
 		mov	word_23E3E, ax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12307,9 +12307,9 @@ loc_10D57:
 loc_10D62:
 		mov	al, byte ptr word_1F3B0
 		add	al, al
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		add	al, -40h
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12385,7 +12385,7 @@ sub_10DA0	endp
 
 sub_10E16	proc near
 
-var_1		= byte ptr -1
+@@angle		= byte ptr -1
 
 		enter	2, 0
 		push	si
@@ -12413,7 +12413,7 @@ loc_10E3F:
 		pop	bx
 		idiv	bx
 		add	al, byte_23DC8
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12428,7 +12428,7 @@ loc_10E3F:
 		mov	bx, si
 		add	bx, bx
 		mov	[bx+686Ah], ax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12473,7 +12473,7 @@ loc_10EC9:
 		pop	bx
 		idiv	bx
 		add	al, byte_23DC8
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12481,7 +12481,7 @@ loc_10EC9:
 		mov	bx, si
 		add	bx, bx
 		mov	[bx+686Ah], ax
-		mov	al, [bp+var_1]
+		mov	al, [bp+@@angle]
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -12537,14 +12537,14 @@ loc_10F85:
 		pop	bx
 		idiv	bx
 		add	al, byte_23DC8
-		mov	[bp+var_1], al
+		mov	[bp+@@angle], al
 		mov	bx, si
 		add	bx, bx
 		push	word ptr [bx+686Ah]
 		mov	bx, si
 		add	bx, bx
 		push	word ptr [bx+6876h]
-		push	word ptr [bp+var_1]
+		push	word ptr [bp+@@angle]
 		call	sub_1A2CE
 		inc	si
 
@@ -27055,7 +27055,7 @@ var_1		= byte ptr -1
 		call	sub_CE0C
 
 loc_18A08:
-		mov	byte_1FBD4, 0
+		mov	angle_1FBD4, 0
 		jmp	loc_18BB4
 ; ---------------------------------------------------------------------------
 
@@ -27098,13 +27098,13 @@ loc_18A68:
 		idiv	bx
 		or	dx, dx
 		jnz	loc_18B2F
-		mov	al, byte_1FBD4
+		mov	al, angle_1FBD4
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, large (144 shl 16) or 144, _CosTable8[bx]
 		mov	si, ax
-		mov	al, byte_1FBD4
+		mov	al, angle_1FBD4
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -27121,14 +27121,14 @@ loc_18A68:
 		push	ax
 		call	sub_CDBD
 		mov	al, 80h
-		sub	al, byte_1FBD4
-		mov	byte_1FBD4, al
+		sub	al, angle_1FBD4
+		mov	angle_1FBD4, al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
 		call	_vector1_at c, large (144 shl 16) or 144, _CosTable8[bx]
 		mov	si, ax
-		mov	al, byte_1FBD4
+		mov	al, angle_1FBD4
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -27145,10 +27145,10 @@ loc_18A68:
 		push	ax
 		call	sub_CDBD
 		mov	al, 80h
-		sub	al, byte_1FBD4
-		mov	byte_1FBD4, al
+		sub	al, angle_1FBD4
+		mov	angle_1FBD4, al
 		add	al, 10h
-		mov	byte_1FBD4, al
+		mov	angle_1FBD4, al
 
 loc_18B2F:
 		mov	si, 10h
@@ -36434,7 +36434,7 @@ word_1F34A	dw ?
 sprite_1F34C	dw ?
 byte_1F34E	db ?
 byte_1F34F	db ?
-byte_1F350	db ?
+angle_1F350	db ?
 byte_1F351	db ?
 byte_1F352	db ?
 byte_1F353	db ?
@@ -36487,7 +36487,7 @@ word_1FBCC	dw ?
 word_1FBCE	dw ?
 word_1FBD0	dw ?
 word_1FBD2	dw ?
-byte_1FBD4	db ?
+angle_1FBD4	db ?
 		db 439 dup(?)
 word_1FD8C	dw ?
 byte_1FD8E	db ?
@@ -36560,7 +36560,7 @@ word_20E22	dw ?
 byte_20E28	db ?
 byte_20E29	db ?
 byte_20E2A	db ?
-byte_20E2B	db ?
+angle_20E2B	db ?
 byte_20E2C	db ?
 		db ?
 word_20E2E	dw ?
diff --git a/th03_op.asm b/th03_op.asm
index 29d61b71..d7dc3847 100644
--- a/th03_op.asm
+++ b/th03_op.asm
@@ -2745,7 +2745,7 @@ sub_B670	endp
 
 sub_B6C0	proc near
 
-var_7		= byte ptr -7
+@@angle		= byte ptr -7
 var_6		= word ptr -6
 var_4		= word ptr -4
 var_2		= word ptr -2
@@ -2765,13 +2765,13 @@ arg_8		= byte ptr  0Ch
 loc_B6CF:
 		mov	al, byte ptr [bp+var_6]
 		add	al, [bp+arg_8]
-		mov	[bp+var_7], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		imul	[bp+arg_2]
-		mov	bx, 100h
+		mov	bx, 256
 		cwd
 		idiv	bx
-		mov	[bp+var_7], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -2779,13 +2779,13 @@ loc_B6CF:
 		mov	[bp+var_2], ax
 		mov	al, byte ptr [bp+var_6]
 		add	al, [bp+arg_6]
-		mov	[bp+var_7], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		imul	[bp+arg_0]
-		mov	bx, 100h
+		mov	bx, 256
 		cwd
 		idiv	bx
-		mov	[bp+var_7], al
+		mov	[bp+@@angle], al
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
diff --git a/th04_maine.asm b/th04_maine.asm
index b88f0148..ff1dd052 100644
--- a/th04_maine.asm
+++ b/th04_maine.asm
@@ -1774,7 +1774,7 @@ loc_AEF1:
 		mov	si, ax
 		push	[bp+arg_4]
 		push	ax
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -1783,7 +1783,7 @@ loc_AEF1:
 		mov	di, ax
 		push	[bp+arg_2]
 		push	si
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -1798,9 +1798,9 @@ loc_AEF1:
 		push	ax
 		push	0
 		call	cdg_put_plane
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		add	al, 40h
-		mov	byte_124C7, al
+		mov	angle_124C7, al
 		push	[bp+arg_4]
 		push	si
 		mov	ah, 0
@@ -1811,7 +1811,7 @@ loc_AEF1:
 		mov	di, ax
 		push	[bp+arg_2]
 		push	si
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -1826,9 +1826,9 @@ loc_AEF1:
 		push	ax
 		push	1
 		call	cdg_put_plane
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		add	al, 40h
-		mov	byte_124C7, al
+		mov	angle_124C7, al
 		push	[bp+arg_4]
 		push	si
 		mov	ah, 0
@@ -1839,7 +1839,7 @@ loc_AEF1:
 		mov	di, ax
 		push	[bp+arg_2]
 		push	si
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -1854,9 +1854,9 @@ loc_AEF1:
 		push	ax
 		push	2
 		call	cdg_put_plane
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		add	al, 40h
-		mov	byte_124C7, al
+		mov	angle_124C7, al
 		push	[bp+arg_4]
 		push	si
 		mov	ah, 0
@@ -1867,7 +1867,7 @@ loc_AEF1:
 		mov	di, ax
 		push	[bp+arg_2]
 		push	si
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		mov	ah, 0
 		add	ax, ax
 		mov	bx, ax
@@ -1882,9 +1882,9 @@ loc_AEF1:
 		push	ax
 		push	3
 		call	cdg_put_plane
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		add	al, 40h
-		mov	byte_124C7, al
+		mov	angle_124C7, al
 		GRCG_OFF_CLOBBERING dx
 
 loc_B027:
@@ -2212,9 +2212,9 @@ loc_B2AF:
 		push	ax
 		call	sub_B25B
 		dec	si
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		add	al, 8
-		mov	byte_124C7, al
+		mov	angle_124C7, al
 		push	di
 		push	[bp+arg_0]
 		push	si
@@ -2280,9 +2280,9 @@ loc_B339:
 		push	si
 		call	sub_B25B
 		inc	si
-		mov	al, byte_124C7
+		mov	al, angle_124C7
 		add	al, 8
-		mov	byte_124C7, al
+		mov	angle_124C7, al
 		cmp	si, 40h
 		jge	short loc_B39A
 		push	di
@@ -2351,9 +2351,9 @@ loc_B3C7:
 		push	si
 		call	sub_B25B
 		inc	si
-		mov	al, byte_124C7
-		add	al, 0F8h
-		mov	byte_124C7, al
+		mov	al, angle_124C7
+		add	al, -8
+		mov	angle_124C7, al
 		cmp	si, 40h
 		jge	short loc_B43B
 		mov	byte_124C6, 2
@@ -4918,7 +4918,7 @@ col_124C2	db ?
 		db    ?	;
 word_124C4	dw ?
 byte_124C6	db ?
-byte_124C7	db ?
+angle_124C7	db ?
 fp_124C8	dw ?
 		db 2 dup(?)
 byte_124CC	db ?