Comments out or reworks lines that were flagged by conflictingOverridesChecker in NWM TR_Transitions.txt file.

Author: TarkusSC4

Controller/RUL2/08_NWM/TR_Transitions.txt

@@ -443,10 +443,10 @@
 0x5120F289,2,0,0x5120F500,2,0=0x5120F289,2,0,0x5120F209,2,0
 0x5120F289,0,1,0x5120F500,0,1=0x5120F289,0,1,0x5120F209,0,1
 ;
-0x51100100,1,0,0x5120F400,1,0=0x5120F209,1,0,0x5120F100,1,0
-0x51100100,3,1,0x5120F400,3,1=0x5120F209,3,1,0x5120F100,3,1
-0x51100100,3,1,0x5122F400,1,0=0x5120F289,1,0,0x5122F100,1,0
-0x51100100,1,0,0x5122F400,3,1=0x5120F289,3,1,0x5122F100,3,1
+0x51100100,1,0,0x5120F100,1,0=0x5120F209,1,0,0x5120F100,1,0
+0x51100100,3,1,0x5120F100,3,1=0x5120F209,3,1,0x5120F100,3,1
+0x51100100,3,1,0x5122F100,1,0=0x5120F289,1,0,0x5122F100,1,0
+0x51100100,1,0,0x5122F100,3,1=0x5120F289,3,1,0x5122F100,3,1
 ;
 0x5120F209,1,0,0x5120F400,1,0=0x5120F209,1,0,0x5120F100,1,0
 0x5120F209,3,1,0x5120F400,3,1=0x5120F209,3,1,0x5120F100,3,1
@@ -877,7 +877,7 @@
 
 ;AVE-2/TLA-3 Diag Draggable Transition
 0x51000300,0,1,0x51010300,2,1=0x5101E600,0,0,0x51010200,2,0
-0x51000300,2,0,0x51010300,0,0=0x5101E600,2,1,0x51010200,1,0
+;0x51000300,2,0,0x51010300,0,0=0x5101E600,2,1,0x51010200,1,0
 ;
 0x51010200,3,0,0x5100E180,2,1=0x51010200,3,0,0x51010200,1,0
 0x51010200,0,0,0x5100E180,0,0=0x51010200,0,0,0x51010200,2,0
@@ -893,32 +893,32 @@
 0x51010200,0,0,0x5101E205,0,0=0x51010200,0,0,0x51010200,2,0
 0x51010200,3,0,0x5101E205,2,1=0x51010200,3,0,0x51010200,1,0
 0x5101E600,1,1,0x5100E105,0,0=0x5101E600,1,1,0x51000200,2,0
-0x5101E600,3,0,0x5100E105,2,1=0x5101E600,3,0,0x51000200,1,0
+;0x5101E600,3,0,0x5100E105,2,1=0x5101E600,3,0,0x51000200,1,0
 
 ;Stability
 0x5101E600,0,0,0x51010300,0,0=0x5101E600,0,0,0x51010200,2,0
-0x5101E600,2,1,0x51010300,2,1=0x5101E600,2,1,0x51010200,1,0
+;0x5101E600,2,1,0x51010300,2,1=0x5101E600,2,1,0x51010200,1,0
 0x5101E600,1,1,0x51000200,0,0=0x5101E600,1,1,0x51000200,2,0
-0x5101E600,3,0,0x51000200,2,1=0x5101E600,3,0,0x51000200,1,0
+;0x5101E600,3,0,0x51000200,2,1=0x5101E600,3,0,0x51000200,1,0
 
 0x51000300,0,1,0x51010200,2,0=0x5101E600,0,0,0x51010200,2,0
 0x51000300,2,0,0x51010200,1,0=0x5101E600,2,1,0x51010200,1,0
 0x51000200,0,0,0x51010300,2,1=0x5101E600,0,0,0x51010200,2,0
 0x51000200,3,0,0x51010300,0,0=0x5101E600,2,1,0x51010200,1,0
 
 0x5101E600,0,0,0x51010300,2,1=0x5101E600,0,0,0x51010200,2,0
-0x5101E600,2,1,0x51010300,0,0=0x5101E600,2,1,0x51010200,1,0
+;0x5101E600,2,1,0x51010300,0,0=0x5101E600,2,1,0x51010200,1,0
 
-0x00000200,0,1,0x5101E600,3,1=0x51000200,3,1,0x5101E600,3,1
-0x00000200,2,0,0x5101E600,1,0=0x51000200,1,0,0x5101E600,1,0
-0x5101E280,3,1,0x51010300,2,1=0x51000200,0,0,0x5101E600,3,1
-0x5101E280,1,0,0x51010300,0,0=0x51000200,3,0,0x5101E600,1,0
+0x00000200,0,1,0x5101E600,3,1=0x51000200,0,0,0x5101E600,3,1
+;0x00000200,2,0,0x5101E600,1,0=0x51000200,3,0,0x5101E600,1,0
+0x5101E200,1,1,0x51000300,2,1=0x5101E600,1,1,0x51000200,2,0
+;0x5101E200,3,0,0x51000300,0,0=0x5101E600,3,0,0x51000200,1,0
 
 ;ARD-3/TLA-3 Diag Draggable Transition
 0x51000300,0,1,0x51020300,2,1=0x5102E600,0,0,0x51020200,2,0
-0x51000300,2,0,0x51020300,0,0=0x5102E600,2,1,0x51020200,1,0
+;0x51000300,2,0,0x51020300,0,0=0x5102E600,2,1,0x51020200,1,0
 0x51000300,0,1,0x51020A00,2,1=0x5102E680,0,0,0x51020900,2,0
-0x51000300,2,0,0x51020A00,0,0=0x5102E680,2,1,0x51020900,1,0
+;0x51000300,2,0,0x51020A00,0,0=0x5102E680,2,1,0x51020900,1,0
 ;
 0x51020200,3,0,0x5100E180,2,1=0x51020200,3,0,0x51020900,1,0
 0x51020200,0,0,0x5100E180,0,0=0x51020200,0,0,0x51020900,2,0
@@ -946,19 +946,19 @@
 0x51020200,3,0,0x5102E409,2,1=0x51020200,3,0,0x51020900,1,0
 
 0x5102E600,1,1,0x5100E105,0,0=0x5102E600,1,1,0x51000200,2,0
-0x5102E600,3,0,0x5100E105,2,1=0x5102E600,3,0,0x51000200,1,0
+;0x5102E600,3,0,0x5100E105,2,1=0x5102E600,3,0,0x51000200,1,0
 0x5102E680,1,1,0x5100E105,0,0=0x5102E680,1,1,0x51000200,2,0
-0x5102E680,3,0,0x5100E105,2,1=0x5102E680,3,0,0x51000200,1,0
+;0x5102E680,3,0,0x5100E105,2,1=0x5102E680,3,0,0x51000200,1,0
 
 ;Stability
 0x5102E600,0,0,0x51020300,0,0=0x5102E600,0,0,0x51020200,2,0
-0x5102E600,2,1,0x51020300,2,1=0x5102E600,2,1,0x51020200,1,0
+;0x5102E600,2,1,0x51020300,2,1=0x5102E600,2,1,0x51020200,1,0
 0x5102E600,1,1,0x51000200,0,0=0x5102E600,1,1,0x51000200,2,0
-0x5102E600,3,0,0x51000200,2,1=0x5102E600,3,0,0x51000200,1,0
+;0x5102E600,3,0,0x51000200,2,1=0x5102E600,3,0,0x51000200,1,0
 0x5102E680,0,0,0x51020A00,0,0=0x5102E680,0,0,0x51020900,2,0
-0x5102E680,2,1,0x51020A00,2,1=0x5102E680,2,1,0x51020900,1,0
+;0x5102E680,2,1,0x51020A00,2,1=0x5102E680,2,1,0x51020900,1,0
 0x5102E680,1,1,0x51000200,0,0=0x5102E680,1,1,0x51000200,2,0
-0x5102E680,3,0,0x51000200,2,1=0x5102E680,3,0,0x51000200,1,0
+;0x5102E680,3,0,0x51000200,2,1=0x5102E680,3,0,0x51000200,1,0
 
 0x51000300,0,1,0x51020200,2,0=0x5102E600,0,0,0x51020200,2,0
 0x51000300,2,0,0x51020200,1,0=0x5102E600,2,1,0x51020200,1,0
@@ -970,24 +970,24 @@
 0x51000200,3,0,0x51020A00,0,0=0x5102E680,2,1,0x51020900,1,0
 
 0x5102E600,0,0,0x51020300,2,1=0x5102E600,0,0,0x51020200,2,0
-0x5102E600,2,1,0x51020300,0,0=0x5102E600,2,1,0x51020200,1,0
+;0x5102E600,2,1,0x51020300,0,0=0x5102E600,2,1,0x51020200,1,0
 0x5102E680,0,0,0x51020A00,2,1=0x5102E680,0,0,0x51020900,2,0
-0x5102E680,2,1,0x51020A00,0,0=0x5102E680,2,1,0x51020900,1,0
+;0x5102E680,2,1,0x51020A00,0,0=0x5102E680,2,1,0x51020900,1,0
 
-0x00000200,0,1,0x5102E600,3,1=0x51000200,3,1,0x5102E600,3,1
-0x00000200,2,0,0x5102E600,1,0=0x51000200,1,0,0x5102E600,1,0
-0x5102E380,3,1,0x51020300,2,1=0x51000200,0,0,0x5102E600,3,1
-0x5102E380,1,0,0x51020300,0,0=0x51000200,3,0,0x5102E600,1,0
-0x00000200,0,1,0x5102E680,3,1=0x51000200,3,1,0x5102E680,3,1
-0x00000200,2,0,0x5102E680,1,0=0x51000200,1,0,0x5102E680,1,0
-0x5102E480,3,1,0x51020A00,2,1=0x51000200,0,0,0x5102E680,3,1
-0x5102E480,1,0,0x51020A00,0,0=0x51000200,3,0,0x5102E680,1,0
+0x00000200,0,1,0x5102E600,3,1=0x51000200,0,0,0x5102E600,3,1
+;0x00000200,2,0,0x5102E600,1,0=0x51000200,3,0,0x5102E600,1,0
+0x5102E300,1,1,0x51000300,2,1=0x5102E600,1,1,0x51000200,2,0
+;0x5102E300,3,0,0x51000300,0,0=0x5102E600,3,0,0x51000200,1,0
+0x00000200,0,1,0x5102E680,3,1=0x51000200,0,0,0x5102E680,3,1
+;0x00000200,2,0,0x5102E680,1,0=0x51000200,3,0,0x5102E680,1,0
+0x5102E400,1,1,0x51000300,2,1=0x5102E680,1,1,0x51000200,2,0
+;0x5102E400,3,0,0x51000300,0,0=0x5102E680,3,0,0x51000200,1,0
 
 ;ARD-3/AVE-2 Diag Draggable Transition
 0x51010300,0,1,0x51020300,2,1=0x5102E700,0,0,0x51020200,2,0
-0x51010300,2,0,0x51020300,0,0=0x5102E700,2,1,0x51020200,1,0
+;0x51010300,2,0,0x51020300,0,0=0x5102E700,2,1,0x51020200,1,0
 0x51010300,0,1,0x51020A00,2,1=0x5102E780,0,0,0x51020900,2,0
-0x51010300,2,0,0x51020A00,0,0=0x5102E780,2,1,0x51020900,1,0
+;0x51010300,2,0,0x51020A00,0,0=0x5102E780,2,1,0x51020900,1,0
 ;
 0x51020200,3,0,0x5101E280,2,1=0x51020200,3,0,0x51020900,1,0
 0x51020200,0,0,0x5101E280,0,0=0x51020200,0,0,0x51020900,2,0
@@ -1015,19 +1015,19 @@
 0x51020200,3,0,0x5102E409,2,1=0x51020200,3,0,0x51020900,1,0
 
 0x5102E700,1,1,0x5101E205,0,0=0x5102E700,1,1,0x51010200,2,0
-0x5102E700,3,0,0x5101E205,2,1=0x5102E700,3,0,0x51010200,1,0
+;0x5102E700,3,0,0x5101E205,2,1=0x5102E700,3,0,0x51010200,1,0
 0x5102E780,1,1,0x5101E205,0,0=0x5102E780,1,1,0x51010200,2,0
-0x5102E780,3,0,0x5101E205,2,1=0x5102E780,3,0,0x51010200,1,0
+;0x5102E780,3,0,0x5101E205,2,1=0x5102E780,3,0,0x51010200,1,0
 
 ;Stability
 0x5102E700,0,0,0x51020300,0,0=0x5102E700,0,0,0x51020200,2,0
-0x5102E700,2,1,0x51020300,2,1=0x5102E700,2,1,0x51020200,1,0
+;0x5102E700,2,1,0x51020300,2,1=0x5102E700,2,1,0x51020200,1,0
 0x5102E700,1,1,0x51010200,0,0=0x5102E700,1,1,0x51010200,2,0
-0x5102E700,3,0,0x51010200,2,1=0x5102E700,3,0,0x51010200,1,0
+;0x5102E700,3,0,0x51010200,2,1=0x5102E700,3,0,0x51010200,1,0
 0x5102E780,0,0,0x51020A00,0,0=0x5102E780,0,0,0x51020900,2,0
-0x5102E780,2,1,0x51020A00,2,1=0x5102E780,2,1,0x51020900,1,0
+;0x5102E780,2,1,0x51020A00,2,1=0x5102E780,2,1,0x51020900,1,0
 0x5102E780,1,1,0x51010200,0,0=0x5102E780,1,1,0x51010200,2,0
-0x5102E780,3,0,0x51010200,2,1=0x5102E780,3,0,0x51010200,1,0
+;0x5102E780,3,0,0x51010200,2,1=0x5102E780,3,0,0x51010200,1,0
 
 0x51010300,0,1,0x51020200,2,0=0x5102E700,0,0,0x51020200,2,0
 0x51010300,2,0,0x51020200,1,0=0x5102E700,2,1,0x51020200,1,0
@@ -1039,18 +1039,19 @@
 0x51010200,3,0,0x51020A00,0,0=0x5102E780,2,1,0x51020900,1,0
 
 0x5102E700,0,0,0x51020300,2,1=0x5102E700,0,0,0x51020200,2,0
-0x5102E700,2,1,0x51020300,0,0=0x5102E700,2,1,0x51020200,1,0
+;0x5102E700,2,1,0x51020300,0,0=0x5102E700,2,1,0x51020200,1,0
 0x5102E780,0,0,0x51020A00,2,1=0x5102E780,0,0,0x51020900,2,0
-0x5102E780,2,1,0x51020A00,0,0=0x5102E780,2,1,0x51020900,1,0
+;0x5102E780,2,1,0x51020A00,0,0=0x5102E780,2,1,0x51020900,1,0
+
+0x00000200,0,1,0x5102E700,3,1=0x51010200,0,0,0x5102E700,3,1
+;0x00000200,2,0,0x5102E700,1,0=0x51010200,3,0,0x5102E700,1,0
+0x5102E300,1,1,0x51010300,2,1=0x5102E700,1,1,0x51010200,2,0
+;0x5102E300,3,0,0x51010300,0,0=0x5102E700,3,0,0x51010200,1,0
+0x00000200,0,1,0x5102E780,3,1=0x51010200,0,0,0x5102E780,3,1
+;0x00000200,2,0,0x5102E780,1,0=0x51010200,3,0,0x5102E780,1,0
+0x5102E400,1,1,0x51010300,2,1=0x5102E780,1,1,0x51010200,2,0
+;0x5102E400,3,0,0x51010300,0,0=0x5102E780,3,0,0x51010200,1,0
 
-0x00000200,0,1,0x5102E700,3,1=0x51010200,3,1,0x5102E700,3,1
-0x00000200,2,0,0x5102E700,1,0=0x51010200,1,0,0x5102E700,1,0
-0x5102E380,3,1,0x51020300,2,1=0x51010200,0,0,0x5102E700,3,1
-0x5102E380,1,0,0x51020300,0,0=0x51010200,3,0,0x5102E700,1,0
-0x00000200,0,1,0x5102E780,3,1=0x51010200,3,1,0x5102E780,3,1
-0x00000200,2,0,0x5102E780,1,0=0x51010200,1,0,0x5102E780,1,0
-0x5102E480,3,1,0x51020A00,2,1=0x51010200,0,0,0x5102E780,3,1
-0x5102E480,1,0,0x51020A00,0,0=0x51010200,3,0,0x5102E780,1,0
 
 ;NRD-4/TLA-3 Diag Draggable Transition
 0x51000300,0,1,0x51050300,2,1=0x5105E680,3,1,0x5105E600,3,1
@@ -1075,10 +1076,10 @@
 
 ;TILE 3
 0x5105E600,0,0,0x5100E105,0,0=0x5105E600,0,0,0x51050200,2,0
-0x5105E600,2,1,0x5100E105,2,1=0x5105E600,2,1,0x51050200,1,0
+;0x5105E600,2,1,0x5100E105,2,1=0x5105E600,2,1,0x51050200,1,0
 
 0x5105E680,2,0,0x5100E105,0,0=0x5105E680,2,0,0x51000200,2,0
-0x5105E680,0,1,0x5100E105,2,1=0x5105E680,0,1,0x51000200,1,0
+;0x5105E680,0,1,0x5100E105,2,1=0x5105E680,0,1,0x51000200,1,0
 
 ;Stability
 0x5105E680,1,0,0x51050300,0,0=0x5105E680,1,0,0x5105E600,1,0
@@ -1109,10 +1110,10 @@
 
 ;TILE 3
 0x5105E700,0,0,0x5101E205,0,0=0x5105E700,0,0,0x51050200,2,0
-0x5105E700,2,1,0x5101E205,2,1=0x5105E700,2,1,0x51050200,1,0
+;0x5105E700,2,1,0x5101E205,2,1=0x5105E700,2,1,0x51050200,1,0
 
 0x5105E780,2,0,0x5101E205,0,0=0x5105E780,2,0,0x51010200,2,0
-0x5105E780,0,1,0x5101E205,2,1=0x5105E780,0,1,0x51010200,1,0
+;0x5105E780,0,1,0x5101E205,2,1=0x5105E780,0,1,0x51010200,1,0
 
 ;Stability
 0x5105E780,1,0,0x51050300,0,0=0x5105E780,1,0,0x5105E700,1,0
@@ -1157,14 +1158,14 @@
 
 ;TILE 3
 0x5105E800,0,0,0x5102E309,0,0=0x5105E800,0,0,0x51050200,2,0
-0x5105E800,2,1,0x5102E309,2,1=0x5105E800,2,1,0x51050200,1,0
+;0x5105E800,2,1,0x5102E309,2,1=0x5105E800,2,1,0x51050200,1,0
 0x5105E900,0,0,0x5102E409,0,0=0x5105E900,0,0,0x51050200,2,0
-0x5105E900,2,1,0x5102E409,2,1=0x5105E900,2,1,0x51050200,1,0
+;0x5105E900,2,1,0x5102E409,2,1=0x5105E900,2,1,0x51050200,1,0
 
 0x5102E880,2,0,0x5102E409,0,0=0x5102E880,2,0,0x51020900,2,0
-0x5102E880,0,1,0x5102E409,2,1=0x5102E880,0,1,0x51020900,1,0
+;0x5102E880,0,1,0x5102E409,2,1=0x5102E880,0,1,0x51020900,1,0
 0x5102E980,2,0,0x5102E309,0,0=0x5102E980,2,0,0x51020200,2,0
-0x5102E980,0,1,0x5102E309,2,1=0x5102E980,0,1,0x51020200,1,0
+;0x5102E980,0,1,0x5102E309,2,1=0x5102E980,0,1,0x51020200,1,0
 
 ;Stability
 0x5105E980,1,0,0x51050300,0,0=0x5105E980,1,0,0x5105E900,1,0