Index: vlib/vmput.c
===================================================================
--- vlib/vmput.c	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vmput.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -28,5 +28,5 @@
 */
 
-void vmput(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t ma, int8_t *ms[])
+void vmput(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *ms[], uint16_t ma)
 {
 	register uint16_t c, tc, tr;
@@ -56,5 +56,5 @@
 */
 
-void vmputa(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t *ma[], int8_t *ms[])
+void vmputa(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *ms[], uint16_t *ma[])
 {
 	register uint16_t c, tc, tr;
Index: vlib/vmput.x
===================================================================
--- vlib/vmput.x	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vmput.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -15,4 +15,4 @@
 */
 
-extern	void		vmput(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t ma, int8_t *ms[]);
-extern	void		vmputa(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t *ma[], int8_t *ms[]);
+extern	void		vmput(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *ms[], uint16_t ma);
+extern	void		vmputa(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *ms[], uint16_t *ma[]);
Index: vlib/vobjfns.c
===================================================================
--- vlib/vobjfns.c	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vobjfns.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -140,5 +140,5 @@
 */
 
-void SetObj(int16_t obj, int16_t type, int16_t bank, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, int16_t flags, int16_t pri, uint16_t *base)
+void SetObj(int16_t obj, int16_t type, int16_t bank, uint16_t *base, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, int16_t flags, int16_t pri)
 {
 	register struct octent *op;
Index: vlib/vobjfns.x
===================================================================
--- vlib/vobjfns.x	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vobjfns.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -27,4 +27,4 @@
 extern	void		CpyObj(uint16_t *from, uint16_t *to, uint16_t w, uint16_t h, uint16_t sw);
 extern	void		SelObj(int16_t obj);
-extern	void		SetObj(int16_t obj, int16_t type, int16_t bank, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, int16_t flags, int16_t pri, uint16_t *base);
+extern	void		SetObj(int16_t obj, int16_t type, int16_t bank, uint16_t *base, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, int16_t flags, int16_t pri);
 extern	void		SetPri(int16_t obj, int16_t pri);
Index: vlib/vputs.c
===================================================================
--- vlib/vputs.c	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vputs.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -23,5 +23,5 @@
 */
 
-void vputs(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t attrib, int8_t *str)
+void vputs(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *str, uint16_t attrib)
 {
 	uint16_t	c;
@@ -53,5 +53,5 @@
 */
 
-void vputsa(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t *attrib, int8_t *str)
+void vputsa(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *str, uint16_t *attrib)
 {
 	uint16_t	c;
Index: vlib/vputs.x
===================================================================
--- vlib/vputs.x	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vputs.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -15,4 +15,4 @@
 */
 
-extern	void		vputs(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t attrib, int8_t *str);
-extern	void		vputsa(uint16_t *sbase, uint16_t row, uint16_t col, uint16_t *attrib, int8_t *str);
+extern	void		vputs(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *str, uint16_t attrib);
+extern	void		vputsa(uint16_t *sbase, uint16_t row, uint16_t col, int8_t *str, uint16_t *attrib);
Index: vlib/vspray4.c
===================================================================
--- vlib/vspray4.c	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vspray4.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -29,5 +29,5 @@
 */
 
-void vspray4(uint16_t *vobj, int16_t vwid, int16_t fg, int16_t vb, int16_t pitch, int8_t *ml[])
+void vspray4(uint16_t *vobj, int16_t vwid, int16_t fg, int8_t *ml[], int16_t vb, int16_t pitch)
 {
 	register int8_t *cp, *lp, c;
Index: vlib/vspray4.x
===================================================================
--- vlib/vspray4.x	(revision 526a9931ecf963fd88914bbf92cee82eb60a80bd)
+++ vlib/vspray4.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -15,3 +15,3 @@
 */
 
-extern	void		vspray4(uint16_t *vobj, int16_t vwid, int16_t fg, int16_t vb, int16_t pitch, int8_t *ml[]);
+extern	void		vspray4(uint16_t *vobj, int16_t vwid, int16_t fg, int8_t *ml[], int16_t vb, int16_t pitch);