Fixes some conflicts in manual NWM ortho and diag RUL2 code with diag stubs and T-ints.

Author: TarkusSC4

Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt

@@ -9266,20 +9266,20 @@
 ;Tile 2 End-T
 0x5102A700,3,0,0x09803C00,1,0=0x5102A700,3,0,0x5102A709,1,0
 0x7102A700,1,1,0x09803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
-0x51025100,3,0,0x09803C00,1,0=0x5102A700,3,0,0x5102A709,1,0
-0x51025100,1,1,0x09803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
+0x51025200,3,0,0x09803C00,1,0=0x5102A700,3,0,0x5102A709,1,0
+0x51025200,1,1,0x09803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
 0x5102A700,3,0,0x09000A00,2,0=0x5102A700,3,0,0x5102A709,1,0
 0x7102A700,1,1,0x09000A00,1,0=0x7102A700,1,1,0x7102A709,3,1
-0x51025100,3,0,0x09000A00,2,0=0x5102A700,3,0,0x5102A709,1,0
-0x51025100,1,1,0x09000A00,1,0=0x7102A700,1,1,0x7102A709,3,1
+0x51025200,3,0,0x09000A00,2,0=0x5102A700,3,0,0x5102A709,1,0
+0x51025200,1,1,0x09000A00,1,0=0x7102A700,1,1,0x7102A709,3,1
 0x5102A780,3,0,0x09803C00,1,0=0x5102A780,3,0,0x5102A789,1,0
 0x7102A780,1,1,0x09803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
-0x51025180,3,0,0x09803C00,1,0=0x5102A780,3,0,0x5102A789,1,0
-0x51025180,1,1,0x09803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
+0x51025280,3,0,0x09803C00,1,0=0x5102A780,3,0,0x5102A789,1,0
+0x51025280,1,1,0x09803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
 0x5102A780,3,0,0x09000A00,2,0=0x5102A780,3,0,0x5102A789,1,0
 0x7102A780,1,1,0x09000A00,1,0=0x7102A780,1,1,0x7102A789,3,1
-0x51025180,3,0,0x09000A00,2,0=0x5102A780,3,0,0x5102A789,1,0
-0x51025180,1,1,0x09000A00,1,0=0x7102A780,1,1,0x7102A789,3,1
+0x51025280,3,0,0x09000A00,2,0=0x5102A780,3,0,0x5102A789,1,0
+0x51025280,1,1,0x09000A00,1,0=0x7102A780,1,1,0x7102A789,3,1
 
 ;Avenue-Short (A8)
 ;0x51020000,1,0,0x5F077800,1,0=0x51020000,1,0,0x7102A880,2,1
@@ -12045,12 +12045,12 @@
 ;Tile 2 End-T
 0x5103A700,3,0,0x09003C00,1,0=0x5103A700,3,0,0x5103A709,1,0
 0x5103A700,1,1,0x09003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
-0x51035100,3,0,0x09003C00,1,0=0x5103A700,3,0,0x5103A709,1,0
-0x51035100,1,1,0x09003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
+0x51035200,3,0,0x09003C00,1,0=0x5103A700,3,0,0x5103A709,1,0
+0x51035200,1,1,0x09003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
 0x5103A700,3,0,0x09000A00,2,0=0x5103A700,3,0,0x5103A709,1,0
 0x5103A700,1,1,0x09000A00,1,0=0x5103A700,1,1,0x5103A709,3,1
-0x51035100,3,0,0x09000A00,2,0=0x5103A700,3,0,0x5103A709,1,0
-0x51035100,1,1,0x09000A00,1,0=0x5103A700,1,1,0x5103A709,3,1
+0x51035200,3,0,0x09000A00,2,0=0x5103A700,3,0,0x5103A709,1,0
+0x51035200,1,1,0x09000A00,1,0=0x5103A700,1,1,0x5103A709,3,1
 
 ;Avenue-Short (A8)
 0x51030000,1,0,0x5F977800,1,0=0x51030000,1,0,0x5103A800,2,1
@@ -14831,12 +14831,12 @@
 ;Tile 2 End-T
 0x5104A700,3,0,0x09003C00,1,0=0x5104A700,3,0,0x5104A709,1,0
 0x7104A700,1,1,0x09003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
-0x51045100,3,0,0x09003C00,1,0=0x5104A700,3,0,0x5104A709,1,0
-0x51045100,1,1,0x09003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
+0x51045200,3,0,0x09003C00,1,0=0x5104A700,3,0,0x5104A709,1,0
+0x51045200,1,1,0x09003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
 0x5104A700,3,0,0x09000A00,2,0=0x5104A700,3,0,0x5104A709,1,0
 0x7104A700,1,1,0x09000A00,1,0=0x7104A700,1,1,0x7104A709,3,1
-0x51045100,3,0,0x09000A00,2,0=0x5104A700,3,0,0x5104A709,1,0
-0x51045100,1,1,0x09000A00,1,0=0x7104A700,1,1,0x7104A709,3,1
+0x51045200,3,0,0x09000A00,2,0=0x5104A700,3,0,0x5104A709,1,0
+0x51045200,1,1,0x09000A00,1,0=0x7104A700,1,1,0x7104A709,3,1
 
 ;Avenue-Short (A8)
 ;not supported by lane math
@@ -17610,12 +17610,12 @@
 ;Tile 2 End-T
 0x5105A700,3,0,0x09803C00,1,0=0x5105A700,3,0,0x5105A709,1,0
 0x7105A700,1,1,0x09803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
-0x51055100,3,0,0x09803C00,1,0=0x5105A700,3,0,0x5105A709,1,0
-0x51055100,1,1,0x09803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
+0x51055200,3,0,0x09803C00,1,0=0x5105A700,3,0,0x5105A709,1,0
+0x51055200,1,1,0x09803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
 0x5105A700,3,0,0x09000A00,2,0=0x5105A700,3,0,0x5105A709,1,0
 0x7105A700,1,1,0x09000A00,1,0=0x7105A700,1,1,0x7105A709,3,1
-0x51055100,3,0,0x09000A00,2,0=0x5105A700,3,0,0x5105A709,1,0
-0x51055100,1,1,0x09000A00,1,0=0x7105A700,1,1,0x7105A709,3,1
+0x51055200,3,0,0x09000A00,2,0=0x5105A700,3,0,0x5105A709,1,0
+0x51055200,1,1,0x09000A00,1,0=0x7105A700,1,1,0x7105A709,3,1
 
 ;Avenue-Short (A8)
 0x51050000,1,0,0x5F077800,1,0=0x51050000,1,0,0x7105A800,2,1

Controller/RUL2/08_NWM/02_Diagonal_NWM.txt

@@ -4231,7 +4231,7 @@
 0x51027309,2,1,0x5F077900,0,0=0x5102B309,0,0,0x5102B380,0,0
 0x51027309,0,0,0x5F077900,2,1=0x5102B309,2,1,0x5102B380,2,1
 0x51027309,2,1,0x5102B380,0,0=0x5102B309,0,0,0x5102B380,0,0
-0x51027309,0,0,0x5102B380,2,1=0x5102B309,2,1,0x5102B308,2,1
+0x51027309,0,0,0x5102B380,2,1=0x5102B309,2,1,0x5102B380,2,1
 
 0x5102B389,0,0,0x5F077900,0,0=0x5102B389,0,0,0x5102B300,0,0
 0x5102B389,2,1,0x5F077900,2,1=0x5102B389,2,1,0x5102B300,2,1
@@ -6255,13 +6255,13 @@
 0x51030200,0,0,0x09003C00,2,1=0x51030200,0,0,0x5103B209,1,1
 0x51030200,3,0,0x09003C00,0,0=0x51030200,3,0,0x5103B209,3,0
 ;Tile 2 T
-0x51037100,2,1,0x09003C00,3,1=0x5103B200,2,1,0x5103B209,2,1
+0x51037200,2,1,0x09003C00,3,1=0x5103B200,2,1,0x5103B209,2,1
 0x51037200,0,0,0x09003C00,1,0=0x5103B200,0,0,0x5103B209,0,0
-0x51037100,2,1,0x09000A00,1,0=0x5103B200,2,1,0x5103B209,2,1
+0x51037200,2,1,0x09000A00,1,0=0x5103B200,2,1,0x5103B209,2,1
 0x51037200,0,0,0x09000A00,2,0=0x5103B200,0,0,0x5103B209,0,0
-0x51037100,2,1,0x5103B209,2,1=0x5103B200,2,1,0x5103B209,2,1
+0x51037200,2,1,0x5103B209,2,1=0x5103B200,2,1,0x5103B209,2,1
 0x51037200,0,0,0x5103B209,0,0=0x5103B200,0,0,0x5103B209,0,0
-0x51037100,2,1,0x5103B209,2,1=0x5103B200,2,1,0x5103B209,2,1
+0x51037200,2,1,0x5103B209,2,1=0x5103B200,2,1,0x5103B209,2,1
 0x51037200,0,0,0x5103B209,0,0=0x5103B200,0,0,0x5103B209,0,0
 0x5103B200,2,1,0x09003C00,3,1=0x5103B200,2,1,0x5103B209,2,1
 0x5103B200,0,0,0x09003C00,1,0=0x5103B200,0,0,0x5103B209,0,0
@@ -7423,13 +7423,13 @@
 0x51040200,0,0,0x09003C00,2,1=0x51040200,0,0,0x5104B209,1,1
 0x51040200,3,0,0x09003C00,0,0=0x51040200,3,0,0x5104B209,3,0
 ;Tile 2 T
-0x51047100,2,1,0x09003C00,3,1=0x5104B200,2,1,0x5104B209,2,1
+0x51047200,2,1,0x09003C00,3,1=0x5104B200,2,1,0x5104B209,2,1
 0x51047200,0,0,0x09003C00,1,0=0x5104B200,0,0,0x5104B209,0,0
-0x51047100,2,1,0x09000A00,1,0=0x5104B200,2,1,0x5104B209,2,1
+0x51047200,2,1,0x09000A00,1,0=0x5104B200,2,1,0x5104B209,2,1
 0x51047200,0,0,0x09000A00,2,0=0x5104B200,0,0,0x5104B209,0,0
-0x51047100,2,1,0x5104B209,2,1=0x5104B200,2,1,0x5104B209,2,1
+0x51047200,2,1,0x5104B209,2,1=0x5104B200,2,1,0x5104B209,2,1
 0x51047200,0,0,0x5104B209,0,0=0x5104B200,0,0,0x5104B209,0,0
-0x51047100,2,1,0x5104B209,2,1=0x5104B200,2,1,0x5104B209,2,1
+0x51047200,2,1,0x5104B209,2,1=0x5104B200,2,1,0x5104B209,2,1
 0x51047200,0,0,0x5104B209,0,0=0x5104B200,0,0,0x5104B209,0,0
 0x5104B200,2,1,0x09003C00,3,1=0x5104B200,2,1,0x5104B209,2,1
 0x5104B200,0,0,0x09003C00,1,0=0x5104B200,0,0,0x5104B209,0,0
@@ -8975,13 +8975,13 @@
 0x51050200,0,0,0x09703C00,2,1=0x51050200,0,0,0x5105B209,1,1
 0x51050200,3,0,0x09703C00,0,0=0x51050200,3,0,0x5105B209,3,0
 ;Tile 2 T
-0x51057100,2,1,0x09703C00,3,1=0x5105B200,2,1,0x5105B209,2,1
+0x51057200,2,1,0x09703C00,3,1=0x5105B200,2,1,0x5105B209,2,1
 0x51057200,0,0,0x09703C00,1,0=0x5105B200,0,0,0x5105B209,0,0
-0x51057100,2,1,0x00000A00,1,0=0x5105B200,2,1,0x5105B209,2,1
+0x51057200,2,1,0x00000A00,1,0=0x5105B200,2,1,0x5105B209,2,1
 0x51057200,0,0,0x00000A00,2,0=0x5105B200,0,0,0x5105B209,0,0
-0x51057100,2,1,0x5105B209,2,1=0x5105B200,2,1,0x5105B209,2,1
+0x51057200,2,1,0x5105B209,2,1=0x5105B200,2,1,0x5105B209,2,1
 0x51057200,0,0,0x5105B209,0,0=0x5105B200,0,0,0x5105B209,0,0
-0x51057100,2,1,0x5105B209,2,1=0x5105B200,2,1,0x5105B209,2,1
+0x51057200,2,1,0x5105B209,2,1=0x5105B200,2,1,0x5105B209,2,1
 0x51057200,0,0,0x5105B209,0,0=0x5105B200,0,0,0x5105B209,0,0
 0x5105B200,2,1,0x09703C00,3,1=0x5105B200,2,1,0x5105B209,2,1
 0x5105B200,0,0,0x09703C00,1,0=0x5105B200,0,0,0x5105B209,0,0
@@ -9834,10 +9834,6 @@
 0x51100200,3,0,0x00000200,3,1=0x51100200,3,0,0x51100d00,3,1
 0x51100300,1,0,0x00000200,3,1=0x51100300,1,0,0x51100c00,3,1
 0x51100300,2,0,0x00000200,1,0=0x51100300,2,0,0x51100c00,1,0
-;mirror fix
-0x51100300,0,1,0x00000200,3,1=0x51100300,1,0,0x51100c00,3,1
-0x51100300,3,1,0x00000200,1,0=0x51100300,2,0,0x51100c00,1,0
-
 
 ;----DxO + Crossings----
 ;00 to 71 (Road)
@@ -10026,13 +10022,13 @@
 0x51110300,3,0,0x04001000,1,0=0x51110300,3,0,0x51110200,1,0
 ;from 0800 orth-diag
 0x51110800,0,0,0x04001000,3,1=0x51110800,0,0,0x51110200,2,0
-0x51110800,1,0,0x04001000,1,0=0x51110800,1,0,0x51150200,1,0
+;0x51110800,1,0,0x04001000,1,0=0x51110800,1,0,0x51150200,1,0
 0x51110800,3,1,0x04001000,3,1=0x51110800,3,1,0x51150200,2,0
-0x51110800,2,1,0x04001000,1,0=0x51110800,2,1,0x51110200,1,0
+;0x51110800,2,1,0x04001000,1,0=0x51110800,2,1,0x51110200,1,0
 0x51150800,0,0,0x04001000,3,1=0x51150800,0,0,0x51150200,2,0
-0x51150800,1,0,0x04001000,1,0=0x51150800,1,0,0x51110200,1,0
+;0x51150800,1,0,0x04001000,1,0=0x51150800,1,0,0x51110200,1,0
 0x51150800,3,1,0x04001000,3,1=0x51150800,3,1,0x51110200,2,0
-0x51150800,2,1,0x04001000,1,0=0x51150800,2,1,0x51150200,1,0
+;0x51150800,2,1,0x04001000,1,0=0x51150800,2,1,0x51150200,1,0
 
 ;Stub
 0x51110200,0,0,0x04004200,0,0=0x51110200,0,0,0x51110D00,0,1
@@ -10048,14 +10044,11 @@
 ;-------------------------
 ;----L0 OWR-5 (0x5112)----
 ;-------------------------
-;02 to 03 (Diag Stub)
-0x51120200,0,0,0x09000200,1,0=0x51120200,0,0,0x51120d00,1,0
-0x51120200,3,0,0x09000200,3,1=0x51120200,3,0,0x51120d00,3,1
-0x51120300,1,0,0x09000200,3,1=0x51120300,1,0,0x51120c00,3,1
-0x51120300,2,0,0x09000200,1,0=0x51120300,2,0,0x51120c00,1,0
-;mirror fix
-0x51120300,0,1,0x09000200,3,1=0x51120300,1,0,0x51120c00,3,1
-0x51120300,3,1,0x09000200,1,0=0x51120300,2,0,0x51120c00,1,0
+;Diag Stub
+0x51120200,0,0,0x09000200,1,0=0x51120200,0,0,0x51120D00,1,0
+0x51120200,3,0,0x09000200,3,1=0x51120200,3,0,0x51120D00,3,1
+0x51120300,2,0,0x09000200,1,0=0x51120300,2,0,0x51120C00,1,0
+0x51120300,1,0,0x09000200,3,1=0x51120300,1,0,0x51120C00,3,1
 
 ;-------------------------
 ;----L0 RD-4 (0x5113)----
@@ -10067,43 +10060,9 @@
 0x51130300,1,0,0x00000200,3,1=0x51130300,1,0,0x51130c00,3,1
 0x51130300,2,0,0x00000200,1,0=0x51130300,2,0,0x51130c00,1,0
 ;mirror fix
-0x51130300,0,1,0x00000200,3,1=0x51130300,1,0,0x51130c00,3,1
-0x51130300,3,1,0x00000200,1,0=0x51130300,2,0,0x51130c00,1,0
+;0x51130300,0,1,0x00000200,3,1=0x51130300,1,0,0x51130c00,3,1
+;0x51130300,3,1,0x00000200,1,0=0x51130300,2,0,0x51130c00,1,0
 ;Avenue-based
-0x51130300,1,0,0x04001000,1,0=0x51130300,1,0,0x51130200,1,0
-0x51130300,0,0,0x04001000,3,1=0x51130300,0,0,0x51130200,2,0
-0x51130300,2,0,0x04001000,3,1=0x51130300,2,0,0x51130200,2,0
-0x51130300,3,0,0x04001000,1,0=0x51130300,3,0,0x51130200,1,0
-;
-0x51130200,0,0,0x04004200,0,0=0x51130200,0,0,0x51130d00,1,0
-0x51130200,3,0,0x04004200,1,0=0x51130200,3,0,0x51130d00,2,0
-;from Orth-Diag
-0x51130800,0,0,0x04001000,3,1=0x51130800,0,0,0x51130200,2,0
-0x51130800,3,1,0x04001000,3,1=0x51130800,3,1,0x51130200,2,0
-0x51130800,1,0,0x04001000,1,0=0x51130800,1,0,0x51130200,1,0
-0x51130800,2,1,0x04001000,1,0=0x51130800,2,1,0x51130200,1,0
-
-
-;-------------------------
-;----L0 RD-6 (0x5114)----
-;-------------------------
-;02 to 03 (Diag Stub)
-0x51140200,0,0,0x00000200,1,0=0x51140200,0,0,0x51140d00,1,0
-0x51140200,3,0,0x00000200,3,1=0x51140200,3,0,0x51140d00,3,1
-0x51140300,1,0,0x00000200,3,1=0x51140300,1,0,0x51140c00,3,1
-0x51140300,2,0,0x00000200,1,0=0x51140300,2,0,0x51140c00,1,0
-;mirror fix
-0x51140300,0,1,0x00000200,3,1=0x51140300,1,0,0x51140c00,3,1
-0x51140300,3,1,0x00000200,1,0=0x51140300,2,0,0x51140c00,1,0
-
-;---L0 OWR-5 (0x5112)---
-;Diag Stub
-0x51120200,0,0,0x09000200,1,0=0x51120200,0,0,0x51120D00,1,0
-0x51120200,3,0,0x09000200,3,1=0x51120200,3,0,0x51120D00,3,1
-0x51120300,2,0,0x09000200,1,0=0x51120300,2,0,0x51120C00,1,0
-0x51120300,1,0,0x09000200,3,1=0x51120300,1,0,0x51120C00,3,1
-
-;---L0 RD-4 (0x5113)---
 ;Diag Stub
 ;04001000 Override
 0x51130300,0,0,0x04001000,3,1=0x51130300,0,0,0x51130200,2,0
@@ -10112,18 +10071,21 @@
 0x51130300,3,0,0x04001000,1,0=0x51130300,3,0,0x51130200,1,0
 ;from 0800 orth-diag
 0x51130800,0,0,0x04001000,3,1=0x51130800,0,0,0x51130200,2,0
-0x51130800,1,0,0x04001000,1,0=0x51130800,1,0,0x51130200,1,0
+;0x51130800,1,0,0x04001000,1,0=0x51130800,1,0,0x51130200,1,0
 0x51130800,3,1,0x04001000,3,1=0x51130800,3,1,0x51130200,2,0
-0x51130800,2,1,0x04001000,1,0=0x51130800,2,1,0x51130200,1,0
+;0x51130800,2,1,0x04001000,1,0=0x51130800,2,1,0x51130200,1,0
 
 ;Stub
 0x51130200,0,0,0x04004200,0,0=0x51130200,0,0,0x51130D00,0,1
 0x51130200,3,0,0x04004200,1,0=0x51130200,3,0,0x51130D00,3,1
 0x51130200,1,1,0x04004200,0,0=0x51130200,0,0,0x51130D00,0,1
 0x51130200,2,1,0x04004200,1,0=0x51130200,3,0,0x51130D00,3,1
 
-;---L0 RD-6 (0x5114)---
-;Diag Stub
+
+;-------------------------
+;----L0 RD-6 (0x5114)----
+;-------------------------
+;02 to 03 (Diag Stub)
 0x51140200,0,0,0x00000200,1,0=0x51140200,0,0,0x51140D00,1,0
 0x51140200,3,0,0x00000200,3,1=0x51140200,3,0,0x51140D00,3,1
 0x51140300,2,0,0x00000200,1,0=0x51140300,2,0,0x51140C00,1,0
@@ -10137,9 +10099,6 @@
 0x51200300,3,0,0x00000200,3,1=0x51200300,3,0,0x51200c00,3,1
 0x51200200,1,0,0x00000200,3,1=0x51200200,1,0,0x51200d00,3,1
 0x51200200,2,0,0x00000200,1,0=0x51200200,2,0,0x51200d00,1,0
-;mirror fix
-0x51200200,0,1,0x00000200,3,1=0x51200200,1,0,0x51200d00,3,1
-0x51200200,3,1,0x00000200,1,0=0x51200200,2,0,0x51200d00,1,0
 
 ;----DxO + Crossings----
 ;00 to 71 (Road)