diff -ru tri-mov/dump tri2/dump
--- tri-mov/dump	2007-02-22 22:15:00.000000000 +0000
+++ tri2/dump	2007-02-21 19:12:17.000000000 +0000
@@ -106,12 +106,12 @@
 00001393
 00000000
 0001057a
-0008a8aa
+0008a8a3
 00000000
 00000394
 00000001
 00010578
-0008a8aa
+0008a8a3
 00000000
 000010f4
 0000ffff
@@ -166,16 +166,16 @@
 0000000f
 000101ce
 e0731000
-00000100
+000000fe
 00001393
 00000000
 0001057a
-0008a8ab
+0008a8a4
 00000000
 00000394
 00000001
 00010578
-0008a8ab
+0008a8a4
 00000000
 000010f4
 0000ffff
@@ -266,12 +266,12 @@
 00001393
 00000000
 0001057a
-0008a8ac
+0008a8a5
 00000000
 00000394
 00000001
 00010578
-0008a8ac
+0008a8a5
 00000000
 000010f4
 0000ffff
@@ -326,16 +326,16 @@
 0000000f
 000101ce
 e0731000
-000000f4
+00000146
 00001393
 00000000
 0001057a
-0008a8ad
+0008a8a6
 00000000
 00000394
 00000001
 00010578
-0008a8ad
+0008a8a6
 00000000
 000010f4
 0000ffff
@@ -368,16 +368,16 @@
 0000000f
 000101ce
 e0711000
-00000156
+00000174
 00001393
 00000000
 0001057a
-0008a8ae
+0008a8a7
 00000000
 00000394
 00000001
 00010578
-0008a8ae
+0008a8a7
 00000000
 000010f4
 0000ffff
@@ -438,16 +438,16 @@
 0000000f
 000101ce
 e0731000
-000000e2
+00000118
 00001393
 00000000
 0001057a
-0008a8af
+0008a8a8
 00000000
 00000394
 00000001
 00010578
-0008a8af
+0008a8a8
 00000000
 000010f4
 0000ffff
@@ -480,16 +480,16 @@
 0000000f
 000101ce
 e0711000
-000002c4
+00000304
 00001393
 00000000
 0001057a
-0008a8b0
+0008a8a9
 00000000
 00000394
 00000001
 00010578
-0008a8b0
+0008a8a9
 00000000
 000010f4
 0000ffff
diff -ru tri-mov/ib_0000_0004 tri2/ib_0000_0004
--- tri-mov/ib_0000_0004	2007-02-22 22:15:02.000000000 +0000
+++ tri2/ib_0000_0004	2007-02-21 19:12:20.000000000 +0000
@@ -1,4 +1,4 @@
 00001040
 00000000
-00000860
-00005555
+00031300
+003747ae
diff -ru tri-mov/ib_0000_0004.txt tri2/ib_0000_0004.txt
--- tri-mov/ib_0000_0004.txt	2007-02-22 22:15:44.000000000 +0000
+++ tri2/ib_0000_0004.txt	2007-02-21 19:36:21.000000000 +0000
@@ -1,2 +1,6 @@
 packet0 XG_4100(4100)=00000000
-packet0 R300_VAP_INPUT_CNTL_0(2180)=00005555
+packet0 0
+	R300_PFS_PARAM_0_X(4c00)=003747ae
+	R300_PFS_PARAM_0_Y(4c04)=
+	R300_PFS_PARAM_0_Z(4c08)=
+	R300_PFS_PARAM_0_W(4c0c)=
Only in tri2: ib_0001_0254
Only in tri2: ib_0001_0254.txt
Only in tri-mov: ib_0001_0256
Only in tri-mov: ib_0001_0256.txt
diff -ru tri-mov/ib_0002_0370 tri2/ib_0002_0370
--- tri-mov/ib_0002_0370	2007-02-22 22:15:02.000000000 +0000
+++ tri2/ib_0002_0370	2007-02-21 19:12:20.000000000 +0000
@@ -91,7 +91,7 @@
 00000005
 00010824
 00000003
-00000000
+00000004
 0001082c
 0000043f
 00000008
@@ -196,40 +196,67 @@
 00005432
 00021180
 00000000
-00000000
 00000001
+000000c1
 000011ad
 00000001
 00031184
 00000000
 00000000
 00000000
-00400000
+004000c0
+00031300
+003747ae
+00000000
+00000000
+003f0000
+00031304
+00480000
+00478000
+003e0000
+00000000
+00031308
+00480000
+00478000
+003e0000
+00000000
 000110c0
-00040080
+00040084
 000000c0
 000010cc
-00004000
+00000048
 000710c4
 00d10000
-00d10440
-00d10080
-00d100c0
-00d10000
-00d10000
-00d10000
-00d10000
-00011230
-00050a80
+00d10444
+00d10084
+00d100c4
+00d10004
+00d10004
+00d10004
+00d10004
+00041230
 00050a80
-000111b0
+00050a14
+00050600
+00020200
+00050280
+000411b0
 1c020800
+00020820
+03820801
+03822840
 1c020800
-00011270
+00041270
 00040889
-00040889
-000111f0
+05040809
+00040810
+00040810
+00040189
+000411f0
 01020800
+00820801
+00020800
+00020820
 01020800
 00000880
 00000406
@@ -312,7 +339,7 @@
 00000000
 00000880
 00000080
-00138882
+001b8882
 00f00002
 00d10062
 00db6001
@@ -329,42 +356,15 @@
 00d10022
 00492001
 00d10000
-00f00204
+00f00004
 00d10002
 00000001
 00d10000
-000208b4
-08421080
-00040080
-00000084
-000008b7
-00000000
-000008a1
-00000000
-00000820
-00300458
-000008a1
-00000000
-00000880
-00000280
-000f8882
-3f800000
-00000000
-00000000
-00000000
-00000000
-3f800000
-00000000
-00000000
-00000000
-00000000
-bb0301aa
-00000000
-00000000
-00000000
-bf7fbe7f
-3f800000
-00001041
-00000000
-00001182
-00000002
+00f00202
+00d10000
+016da000
+016da005
+00f04202
+00d10000
+016da000
+016da005
diff -ru tri-mov/ib_0002_0370.txt tri2/ib_0002_0370.txt
--- tri-mov/ib_0002_0370.txt	2007-02-22 22:15:44.000000000 +0000
+++ tri2/ib_0002_0370.txt	2007-02-21 19:36:21.000000000 +0000
@@ -67,7 +67,7 @@
 packet0 R300_VAP_INPUT_CNTL_1(2184)=00000005
 packet0 0
 	R300_VAP_OUTPUT_VTX_FMT_0(2090)=00000003
-	R300_VAP_OUTPUT_VTX_FMT_1(2094)=00000000
+	R300_VAP_OUTPUT_VTX_FMT_1(2094)=00000004
 packet0 0
 	XG_20b0(20b0)=0000043f
 	XG_20b4(20b4)=00000008
@@ -148,39 +148,66 @@
 	XG_4f88(4f88)=00005432
 packet0 0
 	R300_PFS_CNTL_0(4600)=00000000
-	R300_PFS_CNTL_1(4604)=00000000
-	R300_PFS_CNTL_2(4608)=00000001
+	R300_PFS_CNTL_1(4604)=00000001
+	R300_PFS_CNTL_2(4608)=000000c1
 packet0 XG_46b4(46b4)=00000001
 packet0 0
 	R300_PFS_NODE_0(4610)=00000000
 	R300_PFS_NODE_1(4614)=00000000
 	R300_PFS_NODE_2(4618)=00000000
-	R300_PFS_NODE_3(461c)=00400000
+	R300_PFS_NODE_3(461c)=004000c0
 packet0 0
-	R300_RS_COUNT(4300)=00040080
+	R300_PFS_PARAM_0_X(4c00)=003747ae
+	R300_PFS_PARAM_0_Y(4c04)=00000000
+	R300_PFS_PARAM_0_Z(4c08)=00000000
+	R300_PFS_PARAM_0_W(4c0c)=003f0000
+packet0 0
+	R300_PFS_PARAM_1_X(4c10)=00480000
+	R300_PFS_PARAM_1_Y(4c14)=00478000
+	R300_PFS_PARAM_1_Z(4c18)=003e0000
+	R300_PFS_PARAM_1_W(4c1c)=00000000
+packet0 0
+	R300_PFS_PARAM_2_X(4c20)=00480000
+	R300_PFS_PARAM_2_Y(4c24)=00478000
+	R300_PFS_PARAM_2_Z(4c28)=003e0000
+	R300_PFS_PARAM_2_W(4c2c)=00000000
+packet0 0
+	R300_RS_COUNT(4300)=00040084
 	R300_RS_INST_COUNT(4304)=000000c0
-packet0 R300_RS_ROUTE_0(4330)=00004000
+packet0 R300_RS_ROUTE_0(4330)=00000048
 packet0 0
 	R300_X_MEM0_0(4310)=00d10000
-	R300_X_MEM0_1(4314)=00d10440
-	R300_X_MEM0_2(4318)=00d10080
-	R300_X_MEM0_3(431c)=00d100c0
-	R300_X_MEM0_4(4320)=00d10000
-	R300_X_MEM0_5(4324)=00d10000
-	R300_X_MEM0_6(4328)=00d10000
-	R300_X_MEM0_7(432c)=00d10000
+	R300_X_MEM0_1(4314)=00d10444
+	R300_X_MEM0_2(4318)=00d10084
+	R300_X_MEM0_3(431c)=00d100c4
+	R300_X_MEM0_4(4320)=00d10004
+	R300_X_MEM0_5(4324)=00d10004
+	R300_X_MEM0_6(4328)=00d10004
+	R300_X_MEM0_7(432c)=00d10004
 packet0 0
 	R300_PFS_INSTR0_0(48c0)=EASY_PFS_INSTR0(MAD, SRC0C_XYZ, ONE, ZERO)=00050a80
-	R300_PFS_INSTR0_1(48c4)=EASY_PFS_INSTR0(MAD, SRC0C_XYZ, ONE, ZERO)=00050a80
+	R300_PFS_INSTR0_1(48c4)=EASY_PFS_INSTR0(MAD, ZERO, ZERO, ZERO)=00050a14
+	R300_PFS_INSTR0_2(48c8)=EASY_PFS_INSTR0(MAD, SRC0C_XYZ, SRC0A, ZERO)=00050600
+	R300_PFS_INSTR0_3(48cc)=EASY_PFS_INSTR0(MAD, SRC0C_XYZ, SRC1C_XYZ, SRC2C_XYZ)=00020200
+	R300_PFS_INSTR0_4(48d0)=EASY_PFS_INSTR0(MAD, SRC0C_XYZ, SRC1C_XXX, ZERO)=00050280
 packet0 0
 	R300_PFS_INSTR1_0(46c0)=EASY_PFS_INSTR1(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, NONE, ALL)=1c020800
-	R300_PFS_INSTR1_1(46c4)=EASY_PFS_INSTR1(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, NONE, ALL)=1c020800
+	R300_PFS_INSTR1_1(46c4)=EASY_PFS_INSTR1(0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, NONE, NONE)=00020820
+	R300_PFS_INSTR1_2(46c8)=EASY_PFS_INSTR1(0, 1, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, ALL, NONE)=03820801
+	R300_PFS_INSTR1_3(46cc)=EASY_PFS_INSTR1(0, 0, 1 | PFS_FLAG_CONST, 2 | PFS_FLAG_CONST, ALL, NONE)=03822840
+	R300_PFS_INSTR1_4(46d0)=EASY_PFS_INSTR1(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, NONE, ALL)=1c020800
 packet0 0
 	R300_PFS_INSTR2_0(49c0)=EASY_PFS_INSTR2(MAD, SRC0A, ONE, ZERO)=00040889
-	R300_PFS_INSTR2_1(49c4)=EASY_PFS_INSTR2(MAD, SRC0A, ONE, ZERO)=00040889
+	R300_PFS_INSTR2_1(49c4)=EASY_PFS_INSTR2(??, SRC0A, ZERO, ZERO)=05040809
+	R300_PFS_INSTR2_2(49c8)=EASY_PFS_INSTR2(MAD, ZERO, ZERO, ZERO)=00040810
+	R300_PFS_INSTR2_3(49cc)=EASY_PFS_INSTR2(MAD, ZERO, ZERO, ZERO)=00040810
+	R300_PFS_INSTR2_4(49d0)=EASY_PFS_INSTR2(MAD, SRC0A, SRC1C_X, ZERO)=00040189
 packet0 0
 	R300_PFS_INSTR3_0(47c0)=EASY_PFS_INSTR3(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, OUTPUT)=01020800
-	R300_PFS_INSTR3_1(47c4)=EASY_PFS_INSTR3(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, OUTPUT)=01020800
+	R300_PFS_INSTR3_1(47c4)=EASY_PFS_INSTR3(0, 1, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, REG)=00820801
+	R300_PFS_INSTR3_2(47c8)=EASY_PFS_INSTR3(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, NONE)=00020800
+	R300_PFS_INSTR3_3(47cc)=EASY_PFS_INSTR3(0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, NONE)=00020820
+	R300_PFS_INSTR3_4(47d0)=EASY_PFS_INSTR3(0, 0, 0 | PFS_FLAG_CONST, 0 | PFS_FLAG_CONST, OUTPUT)=01020800
 packet0 R300_VAP_PVS_UPLOAD_ADDRESS(2200)=00000406
 packet0 1
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
@@ -270,35 +297,15 @@
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00d10022
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00492001
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00d10000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00f00204
+	R300_VAP_PVS_UPLOAD_DATA(2208)=00f00004
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00d10002
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00000001
 	R300_VAP_PVS_UPLOAD_DATA(2208)=00d10000
-packet0 0
-	R300_VAP_PVS_CNTL_0(22d0)=08421080
-	R300_VAP_PVS_CNTL_1(22d4)=00040080
-	R300_VAP_PVS_CNTL(22d8)=00000084
-packet0 XG_22dc(22dc)=00000000
-packet0 R300_VAP_PVS_WAITIDLE(2284)=00000000
-packet0 R300_SE_VAP_CNTL(2080)=00300458
-packet0 R300_VAP_PVS_WAITIDLE(2284)=00000000
-packet0 R300_VAP_PVS_UPLOAD_ADDRESS(2200)=00000280
-packet0 1
-	R300_VAP_PVS_UPLOAD_DATA(2208)=3f800000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=3f800000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=bb0301aa
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=00000000
-	R300_VAP_PVS_UPLOAD_DATA(2208)=bf7fbe7f
-	R300_VAP_PVS_UPLOAD_DATA(2208)=3f800000
-packet0 R300_TX_ENABLE(4104)=00000000
-packet0 R300_PFS_CNTL_2(4608)=00000002
+	R300_VAP_PVS_UPLOAD_DATA(2208)=00f00202
+	R300_VAP_PVS_UPLOAD_DATA(2208)=00d10000
+	R300_VAP_PVS_UPLOAD_DATA(2208)=016da000
+	R300_VAP_PVS_UPLOAD_DATA(2208)=016da005
+	R300_VAP_PVS_UPLOAD_DATA(2208)=00f04202
+	R300_VAP_PVS_UPLOAD_DATA(2208)=00d10000
+	R300_VAP_PVS_UPLOAD_DATA(2208)=016da000
+	R300_VAP_PVS_UPLOAD_DATA(2208)=016da005
Only in tri-mov: ib_0003_0244
Only in tri-mov: ib_0003_0244.txt
Only in tri2: ib_0003_0326
Only in tri2: ib_0003_0326.txt
Only in tri-mov: ib_0004_0342
Only in tri-mov: ib_0004_0342.txt
Only in tri2: ib_0004_0372
Only in tri2: ib_0004_0372.txt
Only in tri-mov: ib_0005_0226
Only in tri-mov: ib_0005_0226.txt
Only in tri2: ib_0005_0280
Only in tri2: ib_0005_0280.txt
diff -ru tri-mov/nrta tri2/nrta
--- tri-mov/nrta	2007-02-22 22:15:02.000000000 +0000
+++ tri2/nrta	2007-02-21 19:12:20.000000000 +0000
@@ -4,27 +4,16 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
-program unknown2 132
-program unknown 0
-pvs_addr 280 len 16:
-
-param 00:3f800000(1.000000) 00000000           00000000           00000000           
-param 01:00000000           3f800000(1.000000) 00000000           00000000           
-param 02:00000000           00000000           bb0301aa(-0.001999)00000000           
-param 03:00000000           00000000           bf7fbe7f(-0.999000)3f800000(1.000000) 
-program start 128
-program unknown_0 128
-program len 129
-program param start 128
-program param count 0
-program unknown2 129
-program unknown 0
+program unknown2 164
+program unknown 4
 pvs_addr 406 len 4:
 
 param 00:00000000           00000000           3f800000(1.000000) 00000000           
@@ -34,30 +23,21 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
-program start 128
-program unknown_0 132
-program len 132
-program param start 128
-program param count 4
-program unknown2 132
-program unknown 0
-pvs_addr 280 len 16:
-
-param 00:3f800000(1.000000) 00000000           00000000           00000000           
-param 01:00000000           3f800000(1.000000) 00000000           00000000           
-param 02:00000000           00000000           bb0301aa(-0.001999)00000000           
-param 03:00000000           00000000           bf7fbe7f(-0.999000)3f800000(1.000000) 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 at addr 80
 program:
 MUL TMP 0.X Y Z W PARAM 3{X Y Z W} ATTR 0{W W W W} 
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
 program unknown2 132
@@ -68,12 +48,17 @@
 param 01:00000000           3f800000(1.000000) 00000000           00000000           
 param 02:00000000           00000000           bb0301aa(-0.001999)00000000           
 param 03:00000000           00000000           bf7fbe7f(-0.999000)3f800000(1.000000) 
+at addr 80
+program:
+MUL RESULT 0.X Y Z W ATTR 0{X Y Z W} ATTR 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W ATTR 0{X Y Z W} ATTR 0{ONE ONE ONE ONE} 
+MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 program start 128
 program unknown_0 128
-program len 129
+program len 130
 program param start 128
 program param count 0
-program unknown2 129
+program unknown2 130
 program unknown 0
 pvs_addr 406 len 4:
 
@@ -84,13 +69,15 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
-program start 128
-program unknown_0 132
-program len 132
-program param start 128
-program param count 4
-program unknown2 132
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+program start 128
+program unknown_0 133
+program len 134
+program param start 4160
+program param count 0
+program unknown2 0
 program unknown 0
 at addr 80
 program:
@@ -98,10 +85,12 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
 program unknown2 132
@@ -121,10 +110,12 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
 program unknown2 132
@@ -147,8 +138,8 @@
 program unknown2 255
 program unknown 0
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
 program unknown2 132
@@ -165,27 +156,16 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
-program unknown2 132
-program unknown 0
-pvs_addr 280 len 16:
-
-param 00:3f800000(1.000000) 00000000           00000000           00000000           
-param 01:00000000           3f800000(1.000000) 00000000           00000000           
-param 02:00000000           00000000           bb0301aa(-0.001999)00000000           
-param 03:00000000           00000000           bf7fbe7f(-0.999000)3f800000(1.000000) 
-program start 128
-program unknown_0 128
-program len 129
-program param start 128
-program param count 0
-program unknown2 129
-program unknown 0
+program unknown2 164
+program unknown 4
 pvs_addr 406 len 4:
 
 param 00:00000000           00000000           3f800000(1.000000) 00000000           
@@ -195,30 +175,21 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
-program start 128
-program unknown_0 132
-program len 132
-program param start 128
-program param count 4
-program unknown2 132
-program unknown 0
-pvs_addr 280 len 16:
-
-param 00:3f800000(1.000000) 00000000           00000000           00000000           
-param 01:00000000           3f800000(1.000000) 00000000           00000000           
-param 02:00000000           00000000           bb0301aa(-0.001999)00000000           
-param 03:00000000           00000000           bf7fbe7f(-0.999000)3f800000(1.000000) 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 at addr 80
 program:
 MUL TMP 0.X Y Z W PARAM 3{X Y Z W} ATTR 0{W W W W} 
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
 program unknown2 132
@@ -229,12 +200,17 @@
 param 01:00000000           3f800000(1.000000) 00000000           00000000           
 param 02:00000000           00000000           bb0301aa(-0.001999)00000000           
 param 03:00000000           00000000           bf7fbe7f(-0.999000)3f800000(1.000000) 
+at addr 80
+program:
+MUL RESULT 0.X Y Z W ATTR 0{X Y Z W} ATTR 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W ATTR 0{X Y Z W} ATTR 0{ONE ONE ONE ONE} 
+MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 program start 128
 program unknown_0 128
-program len 129
+program len 130
 program param start 128
 program param count 0
-program unknown2 129
+program unknown2 130
 program unknown 0
 pvs_addr 406 len 4:
 
@@ -245,13 +221,15 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
-program start 128
-program unknown_0 132
-program len 132
-program param start 128
-program param count 4
-program unknown2 132
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+program start 128
+program unknown_0 133
+program len 134
+program param start 4160
+program param count 0
+program unknown2 0
 program unknown 0
 at addr 80
 program:
@@ -259,10 +237,12 @@
 MUL RESULT 1.X Y Z W ATTR 1{X Y Z W} ATTR 1{ONE ONE ONE ONE} 
 MAD TMP 0.X Y Z W PARAM 2{X Y Z W} ATTR 0{Z Z Z Z} TMP 0{X Y Z W} 
 MAD TMP 0.X Y Z W PARAM 1{X Y Z W} ATTR 0{Y Y Y Y} TMP 0{X Y Z W} 
-MAD RESULT 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MAD TMP 0.X Y Z W PARAM 0{X Y Z W} ATTR 0{X X X X} TMP 0{X Y Z W} 
+MUL RESULT 0.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
+MUL RESULT 2.X Y Z W TMP 0{X Y Z W} TMP 0{ONE ONE ONE ONE} 
 program start 128
-program unknown_0 132
-program len 132
+program unknown_0 133
+program len 134
 program param start 128
 program param count 4
 program unknown2 132
diff -ru tri-mov/packet.c tri2/packet.c
--- tri-mov/packet.c	2007-02-22 22:15:44.000000000 +0000
+++ tri2/packet.c	2007-02-21 19:36:21.000000000 +0000
@@ -17,9 +17,99 @@
 e32(CP_PACKET0(XG_4100,0));
 	e32(0x00000000);
 
+e32(CP_PACKET0(0x4c00,3));
+	/* R300_PFS_PARAM_0_X(4c00) */
+	e32(0x003747ae);
+	/* R300_PFS_PARAM_0_Y(4c04) */
+	e32(0x00000000);
+	/* R300_PFS_PARAM_0_Z(4c08) */
+	e32(0x00000000);
+	/* R300_PFS_PARAM_0_W(4c0c) */
+	e32(0x003f0000);
+
+e32(CP_PACKET0(0x4c10,3));
+	/* R300_PFS_PARAM_1_X(4c10) */
+	e32(0x00480000);
+	/* R300_PFS_PARAM_1_Y(4c14) */
+	e32(0x00478000);
+	/* R300_PFS_PARAM_1_Z(4c18) */
+	e32(0x003e0000);
+	/* R300_PFS_PARAM_1_W(4c1c) */
+	e32(0x00000000);
+
+e32(CP_PACKET0(0x4c20,3));
+	/* R300_PFS_PARAM_2_X(4c20) */
+	e32(0x00480000);
+	/* R300_PFS_PARAM_2_Y(4c24) */
+	e32(0x00478000);
+	/* R300_PFS_PARAM_2_Z(4c28) */
+	e32(0x003e0000);
+	/* R300_PFS_PARAM_2_W(4c2c) */
+	e32(0x00000000);
+
+e32(CP_PACKET0(0x4c00,3));
+	/* R300_PFS_PARAM_0_X(4c00) */
+	e32(0x003747ae);
+	/* R300_PFS_PARAM_0_Y(4c04) */
+	e32(0x00000000);
+	/* R300_PFS_PARAM_0_Z(4c08) */
+	e32(0x00000000);
+	/* R300_PFS_PARAM_0_W(4c0c) */
+	e32(0x003f0000);
+
+e32(CP_PACKET0(0x4c10,3));
+	/* R300_PFS_PARAM_1_X(4c10) */
+	e32(0x00480000);
+	/* R300_PFS_PARAM_1_Y(4c14) */
+	e32(0x00478000);
+	/* R300_PFS_PARAM_1_Z(4c18) */
+	e32(0x003e0000);
+	/* R300_PFS_PARAM_1_W(4c1c) */
+	e32(0x00000000);
+
+e32(CP_PACKET0(0x4c20,3));
+	/* R300_PFS_PARAM_2_X(4c20) */
+	e32(0x00480000);
+	/* R300_PFS_PARAM_2_Y(4c24) */
+	e32(0x00478000);
+	/* R300_PFS_PARAM_2_Z(4c28) */
+	e32(0x003e0000);
+	/* R300_PFS_PARAM_2_W(4c2c) */
+	e32(0x00000000);
+
 e32(CP_PACKET0(R300_VAP_INPUT_CNTL_0,0));
 	e32(0x00005555);
 
+e32(CP_PACKET0(0x4c00,3));
+	/* R300_PFS_PARAM_0_X(4c00) */
+	e32(0x003747ae);
+	/* R300_PFS_PARAM_0_Y(4c04) */
+	e32(0x00000000);
+	/* R300_PFS_PARAM_0_Z(4c08) */
+	e32(0x00000000);
+	/* R300_PFS_PARAM_0_W(4c0c) */
+	e32(0x003f0000);
+
+e32(CP_PACKET0(0x4c10,3));
+	/* R300_PFS_PARAM_1_X(4c10) */
+	e32(0x00480000);
+	/* R300_PFS_PARAM_1_Y(4c14) */
+	e32(0x00478000);
+	/* R300_PFS_PARAM_1_Z(4c18) */
+	e32(0x003e0000);
+	/* R300_PFS_PARAM_1_W(4c1c) */
+	e32(0x00000000);
+
+e32(CP_PACKET0(0x4c20,3));
+	/* R300_PFS_PARAM_2_X(4c20) */
+	e32(0x00480000);
+	/* R300_PFS_PARAM_2_Y(4c24) */
+	e32(0x00478000);
+	/* R300_PFS_PARAM_2_Z(4c28) */
+	e32(0x003e0000);
+	/* R300_PFS_PARAM_2_W(4c2c) */
+	e32(0x00000000);
+
 e32(CP_PACKET0(0x2310,2));
 	/* X_2310_FL(2310) */
 	efloat(0.000000);  /* 0.000000 = 0x00000000 */
@@ -309,7 +399,7 @@
 	e32(0x00000007);
 
 e32(CP_PACKET0(R300_VAP_OUTPUT_VTX_FMT_1,0));
-	e32(0x00000000);
+	e32(0x00000004);
 
 e32(CP_PACKET0(0x4f78,4));
 	/* XG_4f78(4f78) */
@@ -325,13 +415,15 @@
 
 e32(RADEON_CP_PACKET2);
 
+e32(RADEON_CP_PACKET2);
+
 e32(CP_PACKET0(R300_VAP_PVS_WAITIDLE,0));
 	e32(0x00000000);
 
 e32(CP_PACKET0(R300_VAP_PVS_UPLOAD_ADDRESS,0));
 	e32(0x00000080);
 
-e32(CP_PACKET0(R300_VAP_PVS_UPLOAD_DATA,19) | (1 << 15));
+e32(CP_PACKET0(R300_VAP_PVS_UPLOAD_DATA,27) | (1 << 15));
 	e32(0x00f00002);
 	e32(0x00d10062);
 	e32(0x00db6001);
@@ -348,14 +440,22 @@
 	e32(0x00d10022);
 	e32(0x00492001);
 	e32(0x00d10000);
-	e32(0x00f00204);
+	e32(0x00f00004);
 	e32(0x00d10002);
 	e32(0x00000001);
 	e32(0x00d10000);
+	e32(0x00f00202);
+	e32(0x00d10000);
+	e32(0x016da000);
+	e32(0x016da005);
+	e32(0x00f04202);
+	e32(0x00d10000);
+	e32(0x016da000);
+	e32(0x016da005);
 
 e32(CP_PACKET0(0x22d0,2));
 	/* R300_VAP_PVS_CNTL_0(22d0) */
-	e32(0x08421080);
+	e32(0x08621480);
 	/* R300_VAP_PVS_CNTL_1(22d4) */
 	e32(0x00040080);
 	/* R300_VAP_PVS_CNTL(22d8) */