Replace inline_c.h contents with nugget's inline_n.h

1 files changed, 1171 insertions, 222 deletions

diff --git a/libpsn00b/include/inline_c.h b/libpsn00b/include/inline_c.h
index 177faf1..c5eaa59 100644
--- a/libpsn00b/include/inline_c.h
+++ b/libpsn00b/include/inline_c.h
@@ -1,32 +1,23 @@
-/* Inline GTE macros for the GNU C compiler.
- *
- * Part of the PSn00bSDK Project by Lameguy64.
- * 2019 Meido-Tek Production
- *
- * All GTE commands can be used without having to pass your object file
- * through some stupid tool such as DMPSX. Perhaps it was Sony's attempt
- * to prevent people from quickly discovering the GTE commands from the 
- * official SDK easily? Though people could just extract the cop2 opcodes
- * of an object file after it has been passed through DMPSX.
- *
- * Todo: A couple of GTE operation macros are still missing such as
- *  gte_rtv*() though they appear to be just variants of gte_mvmva more or
- *  less (gte_rtv0() is actually gte_mvmva(1, 0, 0, 3, 0) for example).
+/*
+ * PSn00bSDK GTE macros
+ * (C) 2019 Lameguy64
+ * (C) 2021-2022 Soapy (tweaked by spicyjpeg)
  *
+ * This header is basically identical to Nugget's inline_n.h. All GTE commands
+ * can be used right away without having to run DMPSX or any other tool on
+ * object files.
  */
 
 #ifndef _INLINE_C_H
 #define _INLINE_C_H
 
-/*
- *	GTE load macros
- */
+/* GTE load macros */
 
 /* Load a SVECTOR (passed as a pointer) to GTE V0
  */
 #define gte_ldv0( r0 ) __asm__ volatile ( \
-	"lwc2	$0 , 0( %0 );"	\
-	"lwc2	$1 , 4( %0 );"	\
+	"lwc2	$0, 0( %0 );"	\
+	"lwc2	$1, 4( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "$t0" )
@@ -34,8 +25,8 @@
 /* Load a SVECTOR (passed as a pointer) to GTE V1
  */
 #define gte_ldv1( r0 ) __asm__ volatile ( \
-	"lwc2	$2 , 0( %0 );"	\
-	"lwc2	$3 , 4( %0 );"	\
+	"lwc2	$2, 0( %0 );"	\
+	"lwc2	$3, 4( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "$t0" )
@@ -43,8 +34,8 @@
 /* Load a SVECTOR (passed as a pointer) to GTE V2
  */
 #define gte_ldv2( r0 ) __asm__ volatile ( \
-	"lwc2	$4 , 0( %0 );"	\
-	"lwc2	$5 , 4( %0 );"	\
+	"lwc2	$4, 0( %0 );"	\
+	"lwc2	$5, 4( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "$t0" )
@@ -52,20 +43,187 @@
 /* Load three SVECTORs (passed as a pointer) to the GTE at once
  */
 #define gte_ldv3( r0, r1, r2 ) __asm__ volatile ( \
-	"lwc2	$0 , 0( %0 );"	\
-	"lwc2	$1 , 4( %0 );"	\
-	"lwc2	$2 , 0( %1 );"	\
-	"lwc2	$3 , 4( %1 );"	\
-	"lwc2	$4 , 0( %2 );"	\
-	"lwc2	$5 , 4( %2 );"	\
+	"lwc2	$0, 0( %0 );"	\
+	"lwc2	$1, 4( %0 );"	\
+	"lwc2	$2, 0( %1 );"	\
+	"lwc2	$3, 4( %1 );"	\
+	"lwc2	$4, 0( %2 );"	\
+	"lwc2	$5, 4( %2 );"	\
 	:						\
 	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
-	
+
+#define gte_ldv3c( r0 ) __asm__ volatile ( \
+	"lwc2	$0, 0( %0 );"	\
+	"lwc2	$1, 4( %0 );"	\
+	"lwc2	$2, 8( %0 );"	\
+	"lwc2	$3, 12( %0 );"	\
+	"lwc2	$4, 16( %0 );"	\
+	"lwc2	$5, 20( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldv3c_vertc( r0 ) __asm__ volatile ( \
+	"lwc2	$0, 0( %0 );"	\
+	"lwc2	$1, 4( %0 );"	\
+	"lwc2	$2, 12( %0 );"	\
+	"lwc2	$3, 16( %0 );"	\
+	"lwc2	$4, 24( %0 );"	\
+	"lwc2	$5, 28( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldv01( r0, r1 ) __asm__ volatile ( \
+	"lwc2	$0, 0( %0 );"	\
+	"lwc2	$1, 4( %0 );"	\
+	"lwc2	$2, 0( %1 );"	\
+	"lwc2	$3, 4( %1 );"	\
+	:						\
+	: "r"( r0 ), "r"( r1 ) )
+
+#define gte_ldv01c( r0 ) __asm__ volatile ( \
+	"lwc2	$0, 0( %0 );"	\
+	"lwc2	$1, 4( %0 );"	\
+	"lwc2	$2, 8( %0 );"	\
+	"lwc2	$3, 12( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
 #define gte_ldrgb( r0 ) __asm__ volatile ( \
 	"lwc2	$6 , 0( %0 );"	\
 	:						\
 	: "r"( r0 ) )
-	
+
+#define gte_ldrgb3( r0, r1, r2 ) __asm__ volatile ( \
+	"lwc2	$20, 0( %0 );"	\
+	"lwc2	$21, 0( %1 );"	\
+	"lwc2	$22, 0( %2 );"	\
+	"lwc2	$6, 0( %2 );"	\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
+
+#define gte_ldrgb3c( r0 ) __asm__ volatile ( \
+	"lwc2	$20, 0( %0 );"	\
+	"lwc2	$21, 4( %0 );"	\
+	"lwc2	$22, 8( %0 );"	\
+	"lwc2	$6, 8( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldlv0( r0 ) __asm__ volatile ( \
+	"lhu	$13, 4( %0 );"	\
+	"lhu	$12, 0( %0 );"	\
+	"sll	$13, $13, 16;"	\
+	"or	$12, $12, $13;"		\
+	"mtc2	$12, $0;"		\
+	"lwc2	$1, 8( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
+#define gte_ldlvl( r0 ) __asm__ volatile ( \
+	"lwc2	$9, 0( %0 );"	\
+	"lwc2	$10, 4( %0 );"	\
+	"lwc2	$11, 8( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldsv( r0 ) __asm__ volatile ( \
+	"lhu	$12, 0( %0 );"	\
+	"lhu	$13, 2( %0 );"	\
+	"lhu	$14, 4( %0 );"	\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"mtc2	$14, $11;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ldbv( r0 ) __asm__ volatile ( \
+	"lbu	$12, 0( %0 );"	\
+	"lbu	$13, 1( %0 );"	\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
+#define gte_ldcv( r0 ) __asm__ volatile ( \
+	"lbu	$12, 0( %0 );"	\
+	"lbu	$13, 1( %0 );"	\
+	"lbu	$14, 2( %0 );"	\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"mtc2	$14, $11;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ldclmv( r0 ) __asm__ volatile ( \
+	"lhu	$12, 0( %0 );"	\
+	"lhu	$13, 6( %0 );"	\
+	"lhu	$14, 12( %0 );"	\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"mtc2	$14, $11;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ldsxy0( r0 ) __asm__ volatile ( \
+	"mtc2	%0, $12;"		\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldsxy1( r0 ) __asm__ volatile ( \
+	"mtc2	%0, $13;"		\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldsxy2( r0 ) __asm__ volatile ( \
+	"mtc2	%0, $14;"		\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldsxy3( r0, r1, r2 ) __asm__ volatile ( \
+	"mtc2	%0, $12;"		\
+	"mtc2	%2, $14;"		\
+	"mtc2	%1, $13;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
+
+#define gte_ldsxy3c( r0 ) __asm__ volatile ( \
+	"lwc2	$12, 0( %0 );"	\
+	"lwc2	$13, 4( %0 );"	\
+	"lwc2	$14, 8( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldsz3( r0, r1, r2 ) __asm__ volatile ( \
+	"mtc2	%0, $17;"		\
+	"mtc2	%1, $18;"		\
+	"mtc2	%2, $19;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
+
+#define gte_ldsz4( r0, r1, r2, r3 ) __asm__ volatile ( \
+	"mtc2	%0, $16;"		\
+	"mtc2	%1, $17;"		\
+	"mtc2	%2, $18;"		\
+	"mtc2	%3, $19;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ), "r"( r3 ) )
+
+#define gte_ldopv1( r0 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 4( %0 );"		\
+	"ctc2	$12, $0;"		\
+	"lw	$14, 8( %0 );"		\
+	"ctc2	$13, $2;"		\
+	"ctc2	$14, $4;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
 #define gte_ldopv2( r0 ) __asm__ volatile ( \
 	"lwc2	$11, 8( %0 );"	\
 	"lwc2	$9 , 0( %0 );"	\
@@ -77,9 +235,53 @@
 	"mtc2	%0, $8;"		\
 	:						\
 	: "r"( r0 ) )
-	
-/* Sets the GTE offset
- */
+
+#define gte_ldlzc( r0 ) __asm__ volatile ( \
+	"mtc2	%0, $30;"		\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_SetRGBcd( r0 ) __asm__ volatile ( \
+	"lwc2	$6, 0( %0 );"	\
+	:						\
+	: "r"( r0 ) )
+
+#define gte_ldbkdir( r0, r1, r2 ) __asm__ volatile ( \
+	"ctc2	%0, $13;"		\
+	"ctc2	%1, $14;"		\
+	"ctc2	%2, $15;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
+
+#define gte_SetBackColor( r0, r1, r2 ) __asm__ volatile ( \
+	"sll	$t0, %0, 4;"	\
+	"sll	$t1, %1, 4;"	\
+	"sll	$t2, %2, 4;"	\
+	"ctc2	$t0, $13;"		\
+	"ctc2	$t1, $14;"		\
+	"ctc2	$t2, $15;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "$t0", "$t1", "$t2" )
+
+#define gte_ldfcdir( r0, r1, r2 ) __asm__ volatile ( \
+	"ctc2	%0, $21;"		\
+	"ctc2	%1, $22;"		\
+	"ctc2	%2, $23;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
+
+#define gte_SetFarColor( r0, r1, r2 ) __asm__ volatile ( \
+	"sll	$12, %0, 4;"	\
+	"sll	$13, %1, 4;"	\
+	"sll	$14, %2, 4;"	\
+	"ctc2	$12, $21;"		\
+	"ctc2	$13, $22;"		\
+	"ctc2	$14, $23;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "$12", "$13", "$14" )
+
 #define gte_SetGeomOffset( r0, r1 ) __asm__ volatile ( \
 	"sll	$t0, %0, 16;"	\
 	"sll	$t1, %1, 16;"	\
@@ -88,23 +290,21 @@
 	:						\
 	: "r"( r0 ), "r"( r1 )	\
 	: "$t0", "$t1" )
-	
+
 #define gte_SetGeomScreen( r0 ) __asm__ volatile ( \
 	"ctc2	%0, $26;"		\
 	:						\
 	: "r"( r0 ) )
 
-#define gte_SetTransMatrix( r0 ) __asm__ volatile ( \
-	"lw		$t0, 20( %0 );"	\
-	"lw		$t1, 24( %0 );"	\
-	"ctc2	$t0, $5;"		\
-	"lw		$t2, 28( %0 );"	\
-	"ctc2	$t1, $6;"		\
-	"ctc2	$t2, $7;"		\
+#define gte_ldsvrtrow0( r0 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 4( %0 );"		\
+	"ctc2	$12, $0;"		\
+	"ctc2	$13, $1;"		\
 	:						\
 	: "r"( r0 )				\
-	: "$t2" )
-	
+	: "$12", "$13" )
+
 #define gte_SetRotMatrix( r0 ) __asm__ volatile ( \
 	"lw		$t0, 0( %0 );"	\
 	"lw		$t1, 4( %0 );"	\
@@ -120,6 +320,15 @@
 	: "r"( r0 )				\
 	: "$t2" )
 
+#define gte_ldsvllrow0( r0 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 4( %0 );"		\
+	"ctc2	$12, $8;"		\
+	"ctc2	$13, $9;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
 #define gte_SetLightMatrix( r0 ) __asm__ volatile ( \
 	"lw		$t0, 0( %0 );"	\
 	"lw		$t1, 4( %0 );"	\
@@ -134,7 +343,16 @@
 	:						\
 	: "r"( r0 )				\
 	: "$t2" )
-	
+
+#define gte_ldsvlcrow0( r0 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 4( %0 );"		\
+	"ctc2	$12, $16;"		\
+	"ctc2	$13, $17;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
 #define gte_SetColorMatrix( r0 ) __asm__ volatile ( \
 	"lw		$t0, 0( %0 );"	\
 	"lw		$t1, 4( %0 );"	\
@@ -149,44 +367,153 @@
 	:						\
 	: "r"( r0 )				\
 	: "$t2" )
-	
-#define gte_SetBackColor( r0, r1, r2 ) __asm__ volatile ( \
-	"sll	$t0, %0, 4;"	\
-	"sll	$t1, %1, 4;"	\
-	"sll	$t2, %2, 4;"	\
-	"ctc2	$t0, $13;"		\
-	"ctc2	$t1, $14;"		\
-	"ctc2	$t2, $15;"		\
+
+#define gte_SetTransMatrix( r0 ) __asm__ volatile ( \
+	"lw		$t0, 20( %0 );"	\
+	"lw		$t1, 24( %0 );"	\
+	"ctc2	$t0, $5;"		\
+	"lw		$t2, 28( %0 );"	\
+	"ctc2	$t1, $6;"		\
+	"ctc2	$t2, $7;"		\
 	:						\
-	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
-	: "$t0", "$t1", "$t2" )
-	
-/*
- *	GTE store macros
- */
-	
-#define gte_otz( r0 ) __asm__ volatile ( \
-	"swc2	$7, 0( %0 );"	\
+	: "r"( r0 )				\
+	: "$t2" )
+
+#define gte_ldtr( r0, r1, r2 ) __asm__ volatile ( \
+	"ctc2	%0, $5;"		\
+	"ctc2	%1, $6;"		\
+	"ctc2	%2, $7;"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ) )
+
+#define gte_SetTransVector( r0 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 4( %0 );"		\
+	"lw	$14, 8( %0 );"		\
+	"ctc2	$12, $5;"		\
+	"ctc2	$13, $6;"		\
+	"ctc2	$14, $7;"		\
 	:						\
 	: "r"( r0 )				\
-	: "memory" )
-	
-#define gte_stflg( r0 ) __asm__ volatile ( \
-	"cfc2	$t0, $31;"		\
-	"nop;"					\
-	"sw		$t0, 0( %0 );"	\
+	: "$12", "$13", "$14" )
+
+#define gte_ld_intpol_uv0( r0 ) __asm__ volatile ( \
+	"lbu	$12, 0( %0 );"	\
+	"lbu	$13, 1( %0 );"	\
+	"ctc2	$12, $21;"		\
+	"ctc2	$13, $22;"		\
 	:						\
 	: "r"( r0 )				\
-	: "memory" )
-	
+	: "$12", "$13" )
+
+#define gte_ld_intpol_uv1( r0 ) __asm__ volatile ( \
+	"lbu	$12, 0( %0 );"	\
+	"lbu	$13, 1( %0 );"	\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
+#define gte_ld_intpol_bv0( r0 ) __asm__ volatile ( \
+	"lbu	$12, 0( %0 );"	\
+	"lbu	$13, 1( %0 );"	\
+	"ctc2	$12, $21;"		\
+	"ctc2	$13, $22;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
+#define gte_ld_intpol_bv1( r0 ) __asm__ volatile ( \
+	"lbu	$12, 0( %0 );"	\
+	"lbu	$13, 1( %0 );"	\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13" )
+
+#define gte_ld_intpol_sv0( r0 ) __asm__ volatile ( \
+	"lh	$12, 0( %0 );"		\
+	"lh	$13, 2( %0 );"		\
+	"lh	$14, 4( %0 );"		\
+	"ctc2	$12, $21;"		\
+	"ctc2	$13, $22;"		\
+	"ctc2	$14, $23;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ld_intpol_sv1( r0 ) __asm__ volatile ( \
+	"lh	$12, 0( %0 );"		\
+	"lh	$13, 2( %0 );"		\
+	"lh	$14, 4( %0 );"		\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"mtc2	$14, $11;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ldfc( r0 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 4( %0 );"		\
+	"lw	$14, 8( %0 );"		\
+	"ctc2	$12, $21;"		\
+	"ctc2	$13, $22;"		\
+	"ctc2	$14, $23;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ldopv2SV( r0 ) __asm__ volatile ( \
+	"lh	$12, 0( %0 );"		\
+	"lh	$13, 2( %0 );"		\
+	"lh	$14, 4( %0 );"		\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"mtc2	$14, $11;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+#define gte_ldopv1SV( r0 ) __asm__ volatile ( \
+	"lh	$12, 0( %0 );"		\
+	"lh	$13, 2( %0 );"		\
+	"ctc2	$12, $0;"		\
+	"lh	$14, 4( %0 );"		\
+	"ctc2	$13, $2;"		\
+	"ctc2	$14, $4;"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14" )
+
+/* GTE store macros */
+
 #define gte_stsxy( r0 ) __asm__ volatile ( \
 	"swc2	$14, 0( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
-	
-#define gte_stsxy0( r0 ) __asm__ volatile ( \
+
+#define gte_stsxy3( r0, r1, r2 ) __asm__ volatile ( \
 	"swc2	$12, 0( %0 );"	\
+	"swc2	$13, 0( %1 );"	\
+	"swc2	$14, 0( %2 );"	\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "memory" )
+
+#define gte_stsxy3c( r0 ) __asm__ volatile ( \
+	"swc2	$12, 0( %0 );"	\
+	"swc2	$13, 4( %0 );"	\
+	"swc2	$14, 8( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stsxy2( r0 ) __asm__ volatile ( \
+	"swc2	$14, 0( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
@@ -197,140 +524,526 @@
 	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy2( r0 ) __asm__ volatile ( \
-	"swc2	$14, 0( %0 );"	\
+#define gte_stsxy0( r0 ) __asm__ volatile ( \
+	"swc2	$12, 0( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3( r0, r1, r2 ) __asm__ volatile ( \
+#define gte_stsxy01( r0, r1 ) __asm__ volatile ( \
 	"swc2	$12, 0( %0 );"	\
 	"swc2	$13, 0( %1 );"	\
-	"swc2	$14, 0( %2 );"	\
 	:						\
-	: "r"( r0 ), "r"( r1 ), "r"( r2 ) \
+	: "r"( r0 ), "r"( r1 )	\
+	: "memory" )
+
+#define gte_stsxy01c( r0 ) __asm__ volatile ( \
+	"swc2	$12, 0( %0 );"	\
+	"swc2	$13, 4( %0 );"	\
+	:						\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_f3( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_f3( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 12( %0 );"	\
-	"swc2	$14, 16( %0 )"	\
+	"swc2	$14, 16( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_g3( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_g3( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 16( %0 );"	\
-	"swc2	$14, 24( %0 )"	\
+	"swc2	$14, 24( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_ft3( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_ft3( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 16( %0 );"	\
-	"swc2	$14, 24( %0 )"	\
+	"swc2	$14, 24( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_gt3( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_gt3( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 20( %0 );"	\
-	"swc2	$14, 32( %0 )"	\
+	"swc2	$14, 32( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_f4( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_f4( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 12( %0 );"	\
-	"swc2	$14, 16( %0 )"	\
+	"swc2	$14, 16( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_g4( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_g4( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 16( %0 );"	\
-	"swc2	$14, 24( %0 )"	\
+	"swc2	$14, 24( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_ft4( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_ft4( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 16( %0 );"	\
-	"swc2	$14, 24( %0 )"	\
+	"swc2	$14, 24( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
-#define gte_stsxy3_gt4( r0 ) __asm__ volatile (	\
+#define gte_stsxy3_gt4( r0 ) __asm__ volatile ( \
 	"swc2	$12, 8( %0 );"	\
 	"swc2	$13, 20( %0 );"	\
-	"swc2	$14, 32( %0 )"	\
+	"swc2	$14, 32( %0 );"	\
 	:						\
-	: "r"( r0 )	\
+	: "r"( r0 )				\
 	: "memory" )
 
+#define gte_stdp( r0 ) __asm__ volatile ( \
+	"swc2	$8, 0( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stflg( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $31;"		\
+	"nop;"					\
+	"sw	$12, 0( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "memory" )
+
+#define gte_stflg_4( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $31;"		\
+	"addi	$13, $0, 4;"	\
+	"sll	$13, $13, 16;"	\
+	"and	$12, $12, $13;"	\
+	"sw	$12, 0( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "memory" )
+
 #define gte_stsz( r0 ) __asm__ volatile ( \
 	"swc2	$19, 0( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
-	
+
+#define gte_stsz3( r0, r1, r2 ) __asm__ volatile ( \
+	"swc2	$17, 0( %0 );"	\
+	"swc2	$18, 0( %1 );"	\
+	"swc2	$19, 0( %2 );"	\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "memory" )
+
+#define gte_stsz4( r0, r1, r2, r3 ) __asm__ volatile ( \
+	"swc2	$16, 0( %0 );"	\
+	"swc2	$17, 0( %1 );"	\
+	"swc2	$18, 0( %2 );"	\
+	"swc2	$19, 0( %3 );"	\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 ), "r"( r3 )	\
+	: "memory" )
+
+#define gte_stsz3c( r0 ) __asm__ volatile ( \
+	"swc2	$17, 0( %0 );"	\
+	"swc2	$18, 4( %0 );"	\
+	"swc2	$19, 8( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stsz4c( r0 ) __asm__ volatile ( \
+	"swc2	$16, 0( %0 );"	\
+	"swc2	$17, 4( %0 );"	\
+	"swc2	$18, 8( %0 );"	\
+	"swc2	$19, 12( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stszotz( r0 ) __asm__ volatile ( \
+	"mfc2	$12, $19;"		\
+	"nop;"					\
+	"sra	$12, $12, 2;"	\
+	"sw	$12, 0( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "memory" )
+
 #define gte_stotz( r0 ) __asm__ volatile ( \
 	"swc2	$7, 0( %0 );"	\
 	:						\
-	: "r"( r0 ) 			\
+	: "r"( r0 )				\
 	: "memory" )
-	
+
 #define gte_stopz( r0 ) __asm__ volatile ( \
 	"swc2	$24, 0( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
-	
+
+#define gte_stlvl( r0 ) __asm__ volatile ( \
+	"swc2	$9, 0( %0 );"	\
+	"swc2	$10, 4( %0 );"	\
+	"swc2	$11, 8( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stlvnl( r0 ) __asm__ volatile ( \
+	"swc2	$25, 0( %0 );"	\
+	"swc2	$26, 4( %0 );"	\
+	"swc2	$27, 8( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stlvnl0( r0 ) __asm__ volatile ( \
+	"swc2	$25, 0( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stlvnl1( r0 ) __asm__ volatile ( \
+	"swc2	$26, 0( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stlvnl2( r0 ) __asm__ volatile ( \
+	"swc2	$27, 0( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stsv( r0 ) __asm__ volatile ( \
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"mfc2	$14, $11;"		\
+	"sh	$12, 0( %0 );"		\
+	"sh	$13, 2( %0 );"		\
+	"sh	$14, 4( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_stclmv( r0 ) __asm__ volatile ( \
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"mfc2	$14, $11;"		\
+	"sh	$12, 0( %0 );"		\
+	"sh	$13, 6( %0 );"		\
+	"sh	$14, 12( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_stbv( r0 ) __asm__ volatile ( \
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"sb	$12, 0( %0 );"		\
+	"sb	$13, 1( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "memory" )
+
+#define gte_stcv( r0 ) __asm__ volatile ( \
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"mfc2	$14, $11;"		\
+	"sb	$12, 0( %0 );"		\
+	"sb	$13, 1( %0 );"		\
+	"sb	$14, 2( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
 #define gte_strgb( r0 ) __asm__ volatile ( \
 	"swc2	$22, 0( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
-	
+
 #define gte_strgb3( r0, r1, r2 ) __asm__ volatile ( \
 	"swc2	$20, 0( %0 );"	\
 	"swc2	$21, 0( %1 );"	\
 	"swc2	$22, 0( %2 );"	\
 	:						\
-	: "r"( r0 ), "r"( r1 ), "r" ( r2 )	\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
 	: "memory" )
 
-#define gte_stsv( r0 ) __asm__ volatile ( \
-	"mfc2	$t0, $9;"		\
-	"mfc2	$t1, $10;"		\
-	"mfc2	$t2, $11;"		\
-	"sh		$t0, 0( %0 );"	\
-	"sh		$t1, 2( %0 );"	\
-	"sh		$t2, 4( %0 );"	\
+#define gte_strgb3_g3( r0 ) __asm__ volatile ( \
+	"swc2	$20, 4( %0 );"	\
+	"swc2	$21, 12( %0 );"	\
+	"swc2	$22, 20( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
-	
-#define gte_stlvnl( r0 ) __asm__ volatile ( \
-	"swc2	$25, 0( %0 );"	\
-	"swc2	$26, 4( %0 );"	\
-	"swc2	$27, 8( %0 );"	\
+
+#define gte_strgb3_gt3( r0 ) __asm__ volatile ( \
+	"swc2	$20, 4( %0 );"	\
+	"swc2	$21, 16( %0 );"	\
+	"swc2	$22, 28( %0 );"	\
 	:						\
 	: "r"( r0 )				\
 	: "memory" )
-	
-	
-/*
- *	GTE operation macros (does not need a stupid tool such as dmpsx!)
- */
- 
+
+#define gte_strgb3_g4( r0 ) __asm__ volatile ( \
+	"swc2	$20, 4( %0 );"	\
+	"swc2	$21, 12( %0 );"	\
+	"swc2	$22, 20( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_strgb3_gt4( r0 ) __asm__ volatile ( \
+	"swc2	$20, 4( %0 );"	\
+	"swc2	$21, 16( %0 );"	\
+	"swc2	$22, 28( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_ReadGeomOffset( r0, r1 ) __asm__ volatile ( \
+	"cfc2	$12, $24;"		\
+	"cfc2	$13, $25;"		\
+	"sra	$12, $12, 16;"	\
+	"sra	$13, $13, 16;"	\
+	"sw	$12, 0( %0 );"		\
+	"sw	$13, 0( %1 );"		\
+	:						\
+	: "r"( r0 ), "r"( r1 )	\
+	: "$12", "$13", "memory" )
+
+#define gte_ReadGeomScreen( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $26;"		\
+	"nop;"					\
+	"sw	$12, 0( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "memory" )
+
+#define gte_ReadRotMatrix( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $0;"		\
+	"cfc2	$13, $1;"		\
+	"sw	$12, 0( %0 );"		\
+	"sw	$13, 4( %0 );"		\
+	"cfc2	$12, $2;"		\
+	"cfc2	$13, $3;"		\
+	"cfc2	$14, $4;"		\
+	"sw	$12, 8( %0 );"		\
+	"sw	$13, 12( %0 );"		\
+	"sw	$14, 16( %0 );"		\
+	"cfc2	$12, $5;"		\
+	"cfc2	$13, $6;"		\
+	"cfc2	$14, $7;"		\
+	"sw	$12, 20( %0 );"		\
+	"sw	$13, 24( %0 );"		\
+	"sw	$14, 28( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_sttr( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $5;"		\
+	"cfc2	$13, $6;"		\
+	"cfc2	$14, $7;"		\
+	"sw	$12, 0( %0 );"		\
+	"sw	$13, 4( %0 );"		\
+	"sw	$14, 8( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_ReadLightMatrix( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $8;"		\
+	"cfc2	$13, $9;"		\
+	"sw	$12, 0( %0 );"		\
+	"sw	$13, 4( %0 );"		\
+	"cfc2	$12, $10;"		\
+	"cfc2	$13, $11;"		\
+	"cfc2	$14, $12;"		\
+	"sw	$12, 8( %0 );"		\
+	"sw	$13, 12( %0 );"		\
+	"sw	$14, 16( %0 );"		\
+	"cfc2	$12, $13;"		\
+	"cfc2	$13, $14;"		\
+	"cfc2	$14, $15;"		\
+	"sw	$12, 20( %0 );"		\
+	"sw	$13, 24( %0 );"		\
+	"sw	$14, 28( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_ReadColorMatrix( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $16;"			\
+	"cfc2	$13, $17;"		\
+	"sw	$12, 0( %0 );"		\
+	"sw	$13, 4( %0 );"		\
+	"cfc2	$12, $18;"		\
+	"cfc2	$13, $19;"		\
+	"cfc2	$14, $20;"		\
+	"sw	$12, 8( %0 );"		\
+	"sw	$13, 12( %0 );"		\
+	"sw	$14, 16( %0 );"		\
+	"cfc2	$12, $21;"		\
+	"cfc2	$13, $22;"		\
+	"cfc2	$14, $23;"		\
+	"sw	$12, 20( %0 );"		\
+	"sw	$13, 24( %0 );"		\
+	"sw	$14, 28( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_stlzc( r0 ) __asm__ volatile ( \
+	"swc2	$31, 0( %0 );"	\
+	:						\
+	: "r"( r0 )				\
+	: "memory" )
+
+#define gte_stfc( r0 ) __asm__ volatile ( \
+	"cfc2	$12, $21;"		\
+	"cfc2	$13, $22;"		\
+	"cfc2	$14, $23;"		\
+	"sw	$12, 0( %0 );"		\
+	"sw	$13, 4( %0 );"		\
+	"sw	$14, 8( %0 );"		\
+	:						\
+	: "r"( r0 )				\
+	: "$12", "$13", "$14", "memory" )
+
+#define gte_mvlvtr() __asm__ volatile ( \
+	"mfc2	$12, $25;"		\
+	"mfc2	$13, $26;"		\
+	"mfc2	$14, $27;"		\
+	"ctc2	$12, $5;"		\
+	"ctc2	$13, $6;"		\
+	"ctc2	$14, $7;"		\
+	:						\
+	:						\
+	: "$12", "$13", "$14" )
+
+/*#define gte_nop() __asm__ volatile ( \
+	"nop;" )*/
+
+#define gte_subdvl( r0, r1, r2 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 0( %1 );"		\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"sra	$12, $12, 16;"	\
+	"sra	$13, $13, 16;"	\
+	"subu	$15, $12, $13;"	\
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"sw	$15, 4( %2 );"		\
+	"subu	$12, $12, $13;"	\
+	"sw	$12, 0( %2 );"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "$12", "$13", "$14", "$15", "memory" )
+
+#define gte_subdvd( r0, r1, r2 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 0( %1 );"		\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"sra	$12, $12, 16;"	\
+	"sra	$13, $13, 16;"	\
+	"subu	$15, $12, $13;"	\
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"sh	$15, 2( %2 );"		\
+	"subu	$12, $12, $13;"	\
+	"sh	$12, 0( %2 );"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "$12", "$13", "$14", "$15", "memory" )
+
+#define gte_adddvl( r0, r1, r2 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 0( %1 );"		\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"sra	$12, $12, 16;"	\
+	"sra	$13, $13, 16;"	\
+	"addu	$15, $12, $13;"	\
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"sw	$15, 4( %2 );"		\
+	"addu	$12, $12, $13;"	\
+	"sw	$12, 0( %2 );"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "$12", "$13", "$14", "$15", "memory" )
+
+#define gte_adddvd( r0, r1, r2 ) __asm__ volatile ( \
+	"lw	$12, 0( %0 );"		\
+	"lw	$13, 0( %1 );"		\
+	"mtc2	$12, $9;"		\
+	"mtc2	$13, $10;"		\
+	"sra	$12, $12, 16;"	\
+	"sra	$13, $13, 16;"	\
+	"addu	$15, $12, $13;"	\
+	"mfc2	$12, $9;"		\
+	"mfc2	$13, $10;"		\
+	"sh	$15, 2( %2 );"		\
+	"addu	$12, $12, $13;"	\
+	"sh	$12, 0( %2 );"		\
+	:						\
+	: "r"( r0 ), "r"( r1 ), "r"( r2 )	\
+	: "$12", "$13", "$14", "$15", "memory" )
+
+#define gte_FlipRotMatrixX() __asm__ volatile ( \
+	"cfc2	$12, $0;"		\
+	"cfc2	$13, $1;"		\
+	"sll	$14, $12, 16;"	\
+	"sra	$14, $14, 16;"	\
+	"subu	$14, $0, $14;"	\
+	"sra	$15, $12, 16;"	\
+	"subu	$15, $0, $15;"	\
+	"sll	$15, $15, 16;"	\
+	"sll	$14, $14, 16;"	\
+	"srl	$14, $14, 16;"	\
+	"or	$14, $14, $15;"		\
+	"ctc2	$14, $0;"		\
+	"sll	$14, $13, 16;"	\
+	"sra	$14, $14, 16;"	\
+	"subu	$14, $0, $14;"	\
+	"sra	$15, $13, 16;"	\
+	"sll	$15, $15, 16;"	\
+	"sll	$14, $14, 16;"	\
+	"srl	$14, $14, 16;"	\
+	"or	$14, $14, $15;"		\
+	"ctc2	$14, $1;"		\
+	:						\
+	:						\
+	: "$12", "$13", "$14", "$15" )
+
+#define gte_FlipTRX() __asm__ volatile ( \
+	"cfc2	$12, $5;"		\
+	"nop;"					\
+	"subu	$12, $0, $12;"	\
+	"ctc2	$12, $5;"		\
+	:						\
+	:						\
+	: "$12" )
+
+/* GTE operation macros */
+
 #define gte_rtps() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
@@ -340,169 +1053,405 @@
 	"nop;"					\
 	"nop;"					\
 	"cop2 0x0280030;" )
-	
-#define gte_nclip() __asm__ volatile ( \
+
+#define gte_rt() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2 0x1400006;" )
-	
-#define gte_avsz3() __asm__ volatile ( \
+	"cop2 0x0480012;" )
+
+#define gte_rtv0() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2 0x158002D;" )
-	
-#define gte_avsz4() __asm__ volatile ( \
+	"cop2 0x0486012;" )
+
+#define gte_rtv1() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2 0x168002E;" )
-	
-#define gte_sqr0() __asm__ volatile ( \
+	"cop2 0x048E012;" )
+
+#define gte_rtv2() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0A00428;" )
-	
-#define gte_sqr12() __asm__ volatile ( \
+	"cop2 0x0496012;" )
+
+#define gte_rtir() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0A80428;" )
-	
-#define gte_op0() __asm__ volatile ( \
+	"cop2 0x049E012;" )
+
+#define gte_rtir_sf0() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x170000C;"	)
+	"cop2 0x041E012;" )
 
-#define gte_op12() __asm__ volatile ( \
+#define gte_rtv0tr() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x178000C;"	)
-	
-#define gte_ncs() __asm__ volatile ( \
+	"cop2 0x0480012;" )
+
+#define gte_rtv1tr() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0C8041E;" )
-	
-#define gte_nct() __asm__ volatile ( \
+	"cop2 0x0488012;" )
+
+#define gte_rtv2tr() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0D80420;" )
-	
-#define gte_nccs() __asm__ volatile ( \
+	"cop2 0x0490012;" )
+
+#define gte_rtirtr() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x108041B;" )	\
-	
-#define gte_ncct() __asm__ volatile ( \
+	"cop2 0x0498012;" )
+
+#define gte_rtv0bk() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x118043F;"	)
-	
-#define gte_ncds() __asm__ volatile ( \
+	"cop2 0x0482012;" )
+
+#define gte_rtv1bk() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0E80413;"	)
-	
-#define gte_ncdt() __asm__ volatile ( \
+	"cop2 0x048A012;" )
+
+#define gte_rtv2bk() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0F80416;" )
-	
-#define gte_cc() __asm__ volatile ( \
+	"cop2 0x0492012;" )
+
+#define gte_rtirbk() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x138041C;" )
-	
-#define gte_cdp() __asm__ volatile ( \
+	"cop2 0x049A012;" )
+
+#define gte_ll() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04A6412;" )
+
+#define gte_llv0() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04A6012;" )
+
+#define gte_llv1() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04AE012;" )
+
+#define gte_llv2() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04B6012;" )
+
+#define gte_llir() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04BE012;" )
+
+#define gte_llv0tr() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04A0012;" )
+
+#define gte_llv1tr() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04A8012;" )
+
+#define gte_llv2tr() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04B0012;" )
+
+#define gte_llirtr() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04B8012;" )
+
+#define gte_llv0bk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04A2012;" )
+
+#define gte_llv1bk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04AA012;" )
+
+#define gte_llv2bk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04B2012;" )
+
+#define gte_llirbk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04BA012;" )
+
+
+#define gte_lc() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04DA412;" )
+
+#define gte_lcv0() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04C6012;" )
+
+#define gte_lcv1() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04CE012;" )
+
+#define gte_lcv2() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04D6012;" )
+
+#define gte_lcir() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x1280414;" )
-	
-#define gte_dcpl() __asm__ volatile ( \
+	"cop2 0x04DE012;" )
+
+#define gte_lcv0tr() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04C0012;" )
+
+#define gte_lcv1tr() __asm__ volatile ( \
+	"nop;"					\
 	"nop;"					\
+	"cop2 0x04C8012;" )
+
+#define gte_lcv2tr() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04D0012;" )
+
+#define gte_lcirtr() __asm__ volatile ( \
 	"nop;"					\
-	"cop2	0x0680029;"	)
-	
+	"nop;"					\
+	"cop2 0x04D8012;" )
+
+#define gte_lcv0bk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04C2012;" )
+
+#define gte_lcv1bk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04CA012;" )
+
+#define gte_lcv2bk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04D2012;" )
+
+#define gte_lcirbk() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x04DA012;" )
+
+#define gte_dpcl() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0680029;" )
+
 #define gte_dpcs() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0780010;" )
-	
+	"cop2 0x0780010;" )
+
 #define gte_dpct() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0180001;" )
+	"cop2 0x0F8002A;" )
 
 #define gte_intpl() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x0980011;" )
+	"cop2 0x0980011;" )
 
-#define gte_gpf0() __asm__ volatile ( \
+#define gte_sqr12() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0A80428;" )
+
+#define gte_sqr0() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x190003D;"	)
+	"cop2 0x0A00428;" )
+
+#define gte_ncs() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0C8041E;" )
+
+#define gte_nct() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0D80420;" )
+
+#define gte_ncds() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0E80413;" )
+
+#define gte_ncdt() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0F80416;" )
+
+#define gte_nccs() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0108041B;" )
+
+#define gte_ncct() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0118043F;" )
+
+#define gte_cdp() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x01280414;" )
+
+#define gte_cc() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0138041C;" )
+
+#define gte_nclip() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x01400006;" )
+
+#define gte_avsz3() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0158002D;" )
+
+#define gte_avsz4() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0168002E;" )
+
+#define gte_op12() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0178000C;" )
+
+#define gte_op0() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x0170000C;" )
 
 #define gte_gpf12() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x198003D;"	)
-	
-#define gte_gpl0() __asm__ volatile ( \
+	"cop2 0x0198003D;" )
+
+#define gte_gpf0() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x1A0003E;" )
+	"cop2 0x0190003D;" )
 
 #define gte_gpl12() __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2	0x1A8003E;" )
+	"cop2 0x01A8003E;" )
+
+#define gte_gpl0() __asm__ volatile ( \
+	"nop;"					\
+	"nop;"					\
+	"cop2 0x01A0003E;" )
 
 #define gte_mvmva_core( r0 ) __asm__ volatile ( \
 	"nop;"					\
 	"nop;"					\
-	"cop2 %0"				\
+	"cop2 %0;"				\
 	:						\
 	: "g"( r0 ) )
-	
+
 #define gte_mvmva(sf, mx, v, cv, lm) gte_mvmva_core( 0x0400012 | \
 	((sf)<<19) | ((mx)<<17) | ((v)<<15) | ((cv)<<13) | ((lm)<<10) )
-	
-	
-/*
- *	GTE operation macros without leading nops
- *
- *	Checking assembler output when using these is advised.
- */
+
+/* GTE operation macros without leading nops */
  
-#define gte_rtps_b()	__asm__ volatile ( "cop2 0x0180001;" )
-#define gte_rtpt_b()	__asm__ volatile ( "cop2 0x0280030;" )
-#define gte_nclip_b()	__asm__ volatile ( "cop2 0x1400006;" )
-#define gte_avsz3_b()	__asm__ volatile ( "cop2 0x158002D;" )
-#define gte_avsz4_b()	__asm__ volatile ( "cop2 0x168002E;" )
-#define gte_sqr0_b()	__asm__ volatile ( "cop2 0x0A00428;" )
-#define gte_sqr12_b()	__asm__ volatile ( "cop2 0x0A80428;" )
-#define gte_op0_b()		__asm__ volatile ( "cop2 0x170000C;" )
-#define gte_op12_b()	__asm__ volatile ( "cop2 0x178000C;" )
-#define gte_ncs_b()		__asm__ volatile ( "cop2 0x0C8041E;" )
-#define gte_nct_b()		__asm__ volatile ( "cop2 0x0D80420;" )
-#define gte_nccs_b()	__asm__ volatile ( "cop2 0x108041B;" )
-#define gte_ncct_b()	__asm__ volatile ( "cop2 0x118043F;" )
-#define gte_ncds_b()	__asm__ volatile ( "cop2 0x0E80413;" )
-#define gte_ncdt_b()	__asm__ volatile ( "cop2 0x0F80416;" )
-#define gte_cc_b()		__asm__ volatile ( "cop2 0x138041C;" )
-#define gte_cdp_b()		__asm__ volatile ( "cop2 0x1280414;" )
-#define gte_dcpl_b()	__asm__ volatile ( "cop2 0x0680029;" )
-#define gte_dpcs_b()	__asm__ volatile ( "cop2 0x0780010;" )
-#define gte_dpct_b()	__asm__ volatile ( "cop2 0x0180001;" )
-#define gte_intpl_b()	__asm__ volatile ( "cop2 0x0980011;" )
-#define gte_gpf0_b()	__asm__ volatile ( "cop2 0x190003D;" )
-#define gte_gpf12_b()	__asm__ volatile ( "cop2 0x198003D;" )
-#define gte_gpl0_b()	__asm__ volatile ( "cop2 0x1A0003E;" )
-#define gte_gpl12_b()	__asm__ volatile ( "cop2 0x1A8003E;" )
+#define gte_rtps_b()		__asm__ volatile ( "cop2 0x0180001;" )
+#define gte_rtpt_b()		__asm__ volatile ( "cop2 0x0280030;" )
+#define gte_rt_b()			__asm__ volatile ( "cop2 0x0480012;" )
+#define gte_rtv0_b()		__asm__ volatile ( "cop2 0x0486012;" )
+#define gte_rtv1_b()		__asm__ volatile ( "cop2 0x048E012;" )
+#define gte_rtv2_b()		__asm__ volatile ( "cop2 0x0496012;" )
+#define gte_rtir_b()		__asm__ volatile ( "cop2 0x049E012;" )
+#define gte_rtir_sf0_b()	__asm__ volatile ( "cop2 0x041E012;" )
+#define gte_rtv0tr_b()		__asm__ volatile ( "cop2 0x0480012;" )
+#define gte_rtv1tr_b()		__asm__ volatile ( "cop2 0x0488012;" )
+#define gte_rtv2tr_b()		__asm__ volatile ( "cop2 0x0490012;" )
+#define gte_rtirtr_b()		__asm__ volatile ( "cop2 0x0498012;" )
+#define gte_rtv0bk_b()		__asm__ volatile ( "cop2 0x0482012;" )
+#define gte_rtv1bk_b()		__asm__ volatile ( "cop2 0x048A012;" )
+#define gte_rtv2bk_b()		__asm__ volatile ( "cop2 0x0492012;" )
+#define gte_rtirbk_b()		__asm__ volatile ( "cop2 0x049A012;" )
+#define gte_ll_b()			__asm__ volatile ( "cop2 0x04A6412;" )
+#define gte_llv0_b()		__asm__ volatile ( "cop2 0x04A6012;" )
+#define gte_llv1_b()		__asm__ volatile ( "cop2 0x04AE012;" )
+#define gte_llv2_b()		__asm__ volatile ( "cop2 0x04B6012;" )
+#define gte_llir_b()		__asm__ volatile ( "cop2 0x04BE012;" )
+#define gte_llv0tr_b()		__asm__ volatile ( "cop2 0x04A0012;" )
+#define gte_llv1tr_b()		__asm__ volatile ( "cop2 0x04A8012;" )
+#define gte_llv2tr_b()		__asm__ volatile ( "cop2 0x04B0012;" )
+#define gte_llirtr_b()		__asm__ volatile ( "cop2 0x04B8012;" )
+#define gte_llv0bk_b()		__asm__ volatile ( "cop2 0x04A2012;" )
+#define gte_llv1bk_b()		__asm__ volatile ( "cop2 0x04AA012;" )
+#define gte_llv2bk_b()		__asm__ volatile ( "cop2 0x04B2012;" )
+#define gte_llirbk_b()		__asm__ volatile ( "cop2 0x04BA012;" )
+#define gte_lc_b()			__asm__ volatile ( "cop2 0x04DA412;" )
+#define gte_lcv0_b()		__asm__ volatile ( "cop2 0x04C6012;" )
+#define gte_lcv1_b()		__asm__ volatile ( "cop2 0x04CE012;" )
+#define gte_lcv2_b()		__asm__ volatile ( "cop2 0x04D6012;" )
+#define gte_lcir_b()		__asm__ volatile ( "cop2 0x04DE012;" )
+#define gte_lcv0tr_b()		__asm__ volatile ( "cop2 0x04C0012;" )
+#define gte_lcv1tr_b()		__asm__ volatile ( "cop2 0x04C8012;" )
+#define gte_lcv2tr_b()		__asm__ volatile ( "cop2 0x04D0012;" )
+#define gte_lcirtr_b()		__asm__ volatile ( "cop2 0x04D8012;" )
+#define gte_lcv0bk_b()		__asm__ volatile ( "cop2 0x04C2012;" )
+#define gte_lcv1bk_b()		__asm__ volatile ( "cop2 0x04CA012;" )
+#define gte_lcv2bk_b()		__asm__ volatile ( "cop2 0x04D2012;" )
+#define gte_lcirbk_b()		__asm__ volatile ( "cop2 0x04DA012;" )
+#define gte_dpcl_b()		__asm__ volatile ( "cop2 0x0680029;" )
+#define gte_dpcs_b()		__asm__ volatile ( "cop2 0x0780010;" )
+#define gte_dpct_b()		__asm__ volatile ( "cop2 0x0F8002A;" )
+#define gte_intpl_b()		__asm__ volatile ( "cop2 0x0980011;" )
+#define gte_sqr12_b()		__asm__ volatile ( "cop2 0x0A80428;" )
+#define gte_sqr0_b()		__asm__ volatile ( "cop2 0x0A00428;" )
+#define gte_ncs_b()			__asm__ volatile ( "cop2 0x0C8041E;" )
+#define gte_nct_b()			__asm__ volatile ( "cop2 0x0D80420;" )
+#define gte_ncds_b()		__asm__ volatile ( "cop2 0x0E80413;" )
+#define gte_ncdt_b()		__asm__ volatile ( "cop2 0x0F80416;" )
+#define gte_nccs_b()		__asm__ volatile ( "cop2 0x0108041B;" )
+#define gte_ncct_b()		__asm__ volatile ( "cop2 0x0118043F;" )
+#define gte_cdp_b()			__asm__ volatile ( "cop2 0x01280414;" )
+#define gte_cc_b()			__asm__ volatile ( "cop2 0x0138041C;" )
+#define gte_nclip_b()		__asm__ volatile ( "cop2 0x01400006;" )
+#define gte_avsz3_b()		__asm__ volatile ( "cop2 0x0158002D;" )
+#define gte_avsz4_b()		__asm__ volatile ( "cop2 0x0168002E;" )
+#define gte_op12_b()		__asm__ volatile ( "cop2 0x0178000C;" )
+#define gte_op0_b()			__asm__ volatile ( "cop2 0x0170000C;" )
+#define gte_gpf12_b()		__asm__ volatile ( "cop2 0x0198003D;" )
+#define gte_gpf0_b()		__asm__ volatile ( "cop2 0x0190003D;" )
+#define gte_gpl12_b()		__asm__ volatile ( "cop2 0x01A8003E;" )
+#define gte_gpl0_b()		__asm__ volatile ( "cop2 0x01A0003E;" )
 #define gte_mvmva_core_b( r0 ) __asm__ volatile ( \
-	"cop2 %0"				\
+	"cop2 %0;"				\
 	:						\
-	: "g"( r0 ) )	
+	: "g"( r0 ) )
 #define gte_mvmva_b(sf, mx, v, cv, lm) gte_mvmva_core_b( 0x0400012 | \
 	((sf)<<19) | ((mx)<<17) | ((v)<<15) | ((cv)<<13) | ((lm)<<10) )
-	
-#endif // _INLINE_C_H
\ No newline at end of file
+
+#endif // _INLINE_C_H