diff --git a/include/QF/progs.h b/include/QF/progs.h
index 1de24d7cc..6802f8f66 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1289,6 +1289,7 @@ pr_uint_t PR_Get_Lineno_Line (progs_t *pr, pr_lineno_t *lineno);
 pr_lineno_t *PR_Find_Lineno (progs_t *pr, pr_uint_t addr);
 const char *PR_Get_Source_File (progs_t *pr, pr_lineno_t *lineno);
 const char *PR_Get_Source_Line (progs_t *pr, pr_uint_t addr);
+ddef_t *PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm);
 ddef_t *PR_Get_Local_Def (progs_t *pr, pr_int_t offs);
 void PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents);
 void PR_DumpState (progs_t *pr);
diff --git a/libs/gamecode/engine/pr_debug.c b/libs/gamecode/engine/pr_debug.c
index 3dac2032f..c8ec21348 100644
--- a/libs/gamecode/engine/pr_debug.c
+++ b/libs/gamecode/engine/pr_debug.c
@@ -377,6 +377,35 @@ PR_Get_Source_Line (progs_t *pr, pr_uint_t addr)
 			   file->lines[line - 1].text);
 }
 
+ddef_t *
+PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm)
+{
+	pr_uint_t    i;
+	pr_auxfunction_t *aux_func;
+	ddef_t      *ddef = 0;
+Sys_Printf ("%p\n", func);
+	if (!func)
+		return 0;
+Sys_Printf ("numparms %d %d\n", func->numparms, parm);
+	if (func->numparms >= 0 && parm >= (unsigned) func->numparms)
+		return 0;
+	if (func->numparms < 0 && parm >= (unsigned) -func->numparms)
+		return 0;
+	aux_func = pr->auxfunction_map[func - pr->pr_functions];
+Sys_Printf ("aux_fux %p\n", aux_func);
+	if (!aux_func)
+		return 0;
+	for (i = 0; i < aux_func->num_locals; i++) {
+		ddef = &pr->local_defs[aux_func->local_defs + i];
+		Sys_Printf ("%s\n", PR_GetString (pr, ddef->s_name));
+		if (!parm--)
+			break;
+		if (ddef->type == ev_vector)
+			i += 3;						// skip over component defs
+	}
+	return ddef;
+}
+
 ddef_t *
 PR_Get_Local_Def (progs_t *pr, pr_int_t offs)
 {
@@ -418,9 +447,9 @@ PR_DumpState (progs_t *pr)
 				addr = max (descriptor->first_statement, addr - 5);
 
 			while (addr != pr->pr_xstatement)
-				PR_PrintStatement (pr, pr->pr_statements + addr++, 1);
+				PR_PrintStatement (pr, pr->pr_statements + addr++, 3);
 		}
-		PR_PrintStatement (pr, pr->pr_statements + pr->pr_xstatement, 1);
+		PR_PrintStatement (pr, pr->pr_statements + pr->pr_xstatement, 3);
 	}
 	PR_StackTrace (pr);
 }
@@ -600,20 +629,31 @@ VISIBLE void
 PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 {
 	int         addr = s - pr->pr_statements;
+	int         dump_code = contents & 2;
 	const char *fmt;
 	opcode_t   *op;
 	static dstring_t *line;
+	dfunction_t *call_func = 0;
+	ddef_t     *parm_def = 0;
 
 	if (!line)
 		line = dstring_new ();
 
 	dstring_clearstr (line);
 
+	if (pr_debug->int_val > 1)
+		dump_code = 1;
+
 	if (pr_debug->int_val && pr->debug) {
 		const char *source_line = PR_Get_Source_Line (pr, addr);
 
-		if (source_line)
-			dasprintf (line, "%s\n", source_line);
+		if (source_line) {
+			dasprintf (line, "%s%s", source_line, dump_code ? "\n" : "");
+			if (!dump_code)
+				goto do_print;
+		}
+		if (!dump_code)
+			return;
 	}
 
 	op = PR_Opcode (s->op);
@@ -626,7 +666,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 		fmt = "%Ga, %Gb, %gc";
 
 	dasprintf (line, "%04x ", addr);
-	if (pr_debug->int_val > 1)
+	if (pr_debug->int_val > 2)
 		dasprintf (line, "%02x %04x(%8s) %04x(%8s) %04x(%8s)\t",
 					s->op,
 					s->a, pr_type_name[op->type_a],
@@ -643,9 +683,18 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 			} else {
 				const char *str;
 				char        mode = fmt[1], opchar = fmt[2];
+				unsigned    parm_ind = 0;
 				pr_int_t    opval;
 				etype_t     optype;
 
+				if (mode == 'P') {
+					opchar = fmt[3];
+					parm_ind = fmt[2] - '0';
+					fmt++;				// P has one extra item
+					if (parm_ind >= MAX_PARMS)
+						goto err;
+				}
+
 				switch (opchar) {
 					case 'a':
 						opval = s->a;
@@ -659,15 +708,32 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 						opval = s->c;
 						optype = op->type_c;
 						break;
+					case 'x':
+						if (mode == 'P') {
+							opval = pr->pr_real_params[parm_ind]
+									- pr->pr_globals;
+							break;
+						}
 					default:
 						goto err;
 				}
 				switch (mode) {
+					case 'F':
+						str = global_string (pr, opval, optype, contents & 1);
+						call_func = pr->pr_functions + G_FUNCTION (pr, opval);
+						break;
+					case 'P':
+						parm_def = PR_Get_Param_Def (pr, call_func, parm_ind);
+						optype = ev_void;
+						if (parm_def)
+							optype = parm_def->type;
+						str = global_string (pr, opval, optype, contents & 1);
+						break;
 					case 'V':
-						str = global_string (pr, opval, ev_void, contents);
+						str = global_string (pr, opval, ev_void, contents & 1);
 						break;
 					case 'G':
-						str = global_string (pr, opval, optype, contents);
+						str = global_string (pr, opval, optype, contents & 1);
 						break;
 					case 'g':
 						str = global_string (pr, opval, optype, 0);
@@ -692,6 +758,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 			dstring_appendsubstr (line, fmt++, 1);
 		}
 	}
+do_print:
 	Sys_Printf ("%s\n", line->str);
 }
 
diff --git a/libs/gamecode/engine/pr_opcode.c b/libs/gamecode/engine/pr_opcode.c
index d2d66f8b9..549c3194e 100644
--- a/libs/gamecode/engine/pr_opcode.c
+++ b/libs/gamecode/engine/pr_opcode.c
@@ -94,10 +94,14 @@ VISIBLE const char *pr_type_name[ev_type_count] = {
 // g  global_string, no contents
 // s  as short
 // O  address + short
+// P  function parameter
+// F  function (must come before any P)
 //
 // a  operand a
 // b  operand b
 // c  operand c
+// x  place holder for P (padding)
+// 0-7 parameter index (for P)
 VISIBLE opcode_t pr_opcodes[] = {
 	{"<DONE>", "done", OP_DONE, false,
 	 ev_entity, ev_field, ev_void,
@@ -780,87 +784,87 @@ VISIBLE opcode_t pr_opcodes[] = {
 	{"<CALL0>", "call0", OP_CALL0, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa ()",
 	},
 	{"<CALL1>", "call1", OP_CALL1, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x)",
 	},
 	{"<CALL2>", "call2", OP_CALL2, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x)",
 	},
 	{"<CALL3>", "call3", OP_CALL3, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x, %P2x)",
 	},
 	{"<CALL4>", "call4", OP_CALL4, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x, %P2x, %P3x)",
 	},
 	{"<CALL5>", "call5", OP_CALL5, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x, %P2x, %P3x, %P4x)",
 	},
 	{"<CALL6>", "call6", OP_CALL6, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x, %P2x, %P3x, %P4x, %P5x)",
 	},
 	{"<CALL7>", "call7", OP_CALL7, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x, %P2x, %P3x, %P4x, %P5x, %P6x)",
 	},
 	{"<CALL8>", "call8", OP_CALL8, false,
 	 ev_func, ev_void, ev_void,
 	 PROG_ID_VERSION,
-	 "%Ga",
+	 "%Fa (%P0x, %P1x, %P2x, %P3x, %P4x, %P5x, %P6x, %P7x)",
 	},
 	{"<RCALL1>", "rcall1", OP_RCALL1, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb",
+	 PROG_VERSION,
+	 "%Fa (%P0b)",
 	},
 	{"<RCALL2>", "rcall2", OP_RCALL2, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c)",
 	},
 	{"<RCALL3>", "rcall3", OP_RCALL3, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c, %P2x)",
 	},
 	{"<RCALL4>", "rcall4", OP_RCALL4, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c, %P2x, %P3x)",
 	},
 	{"<RCALL5>", "rcall5", OP_RCALL5, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c, %P2x, %P3x, %P4x)",
 	},
 	{"<RCALL6>", "rcall6", OP_RCALL6, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c, %P2x, %P3x, %P4x, %P5x)",
 	},
 	{"<RCALL7>", "rcall7", OP_RCALL7, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c, %P2x, %P3x, %P4x, %P5x, %P6x)",
 	},
 	{"<RCALL8>", "rcall8", OP_RCALL8, false,
 	 ev_func, ev_void, ev_void,
-	 PROG_ID_VERSION,
-	 "%Ga, %Vb, %Vc",
+	 PROG_VERSION,
+	 "%Fa (%P0b, %P1c, %P2x, %P3x, %P4x, %P5x, %P6x, %P7x)",
 	},
 
 	{"<STATE>", "state", OP_STATE, false,
diff --git a/libs/gamecode/engine/pr_resolve.c b/libs/gamecode/engine/pr_resolve.c
index 57a8f1b44..18e00d99b 100644
--- a/libs/gamecode/engine/pr_resolve.c
+++ b/libs/gamecode/engine/pr_resolve.c
@@ -1,7 +1,7 @@
 /*
-	pr_edict.c
+	pr_resolve.c
 
-	entity dictionary
+	symbol resolution
 
 	Copyright (C) 1996-1997  Id Software, Inc.