Fixes NWM-related issues involving new Avenue Ts and DxO NWM-Thru x S…

…treet-End Ts.
NAMTeam · May 14, 2024 · 032161d · 032161d
1 parent b26d00c
commit 032161d
Show file tree

Hide file tree

Showing 2 changed files with 336 additions and 177 deletions.
diff --git a/Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt b/Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt
@@ -1369,19 +1369,17 @@
 0x51005309,1,0,0x04005700,3,1=0x51005309,1,0,0x51005300,1,0
 0x51005309,3,0,0x04005700,3,1=0x51005309,3,0,0x51005300,1,0
 ;TILE 3 T-INT (A9)
-0x71005309,1,1,0x04006600,1,0=0x7100A909,1,1,0x7100A900,3,1
+0x71005309,1,1,0x04006600,1,0=0x7100A909,3,1,0x7100A900,3,1
 0x71005309,3,1,0x04006600,1,0=0x7100A909,3,1,0x7100A900,3,1
 0x51005309,1,0,0x04006600,3,1=0x5100A909,1,0,0x5100A900,1,0
-0x51005309,3,0,0x04006600,3,1=0x5100A909,3,0,0x5100A900,1,0
+0x51005309,3,0,0x04006600,3,1=0x5100A909,1,0,0x5100A900,1,0
 ;
-0x7100A909,1,1,0x04006600,1,0=0x7100A909,1,1,0x7100A900,3,1
 0x7100A909,3,1,0x04006600,1,0=0x7100A909,3,1,0x7100A900,3,1
 0x5100A909,1,0,0x04006600,3,1=0x5100A909,1,0,0x5100A900,1,0
-0x5100A909,3,0,0x04006600,3,1=0x5100A909,3,0,0x5100A900,1,0
-0x71005309,1,1,0x7100A900,3,1=0x7100A909,1,1,0x7100A900,3,1
+0x71005309,1,1,0x7100A900,3,1=0x7100A909,3,1,0x7100A900,3,1
 0x71005309,3,1,0x7100A900,3,1=0x7100A909,3,1,0x7100A900,3,1
 0x51005309,1,0,0x5100A900,1,0=0x5100A909,1,0,0x5100A900,1,0
-0x51005309,3,0,0x5100A900,1,0=0x5100A909,3,0,0x5100A900,1,0
+0x51005309,3,0,0x5100A900,1,0=0x5100A909,1,0,0x5100A900,1,0
 ;Temp Continuation
 0x71005300,3,1,0x00004b00,1,0=0x71005300,3,1,0x51000000,1,0
 0x71005300,3,1,0x00004b00,3,0=0x71005300,3,1,0x51000000,3,0
@@ -4493,19 +4491,17 @@
 0x51015309,1,0,0x04005700,3,1=0x51015309,1,0,0x51015300,1,0
 0x51015309,3,0,0x04005700,3,1=0x51015309,3,0,0x51015300,1,0
 ;TILE 3 T-INT (A9)
-0x51015309,1,1,0x04006600,1,0=0x5101A909,1,1,0x5101A900,3,1
+0x51015309,1,1,0x04006600,1,0=0x5101A909,3,1,0x5101A900,3,1
 0x51015309,3,1,0x04006600,1,0=0x5101A909,3,1,0x5101A900,3,1
 0x51015309,1,0,0x04006600,3,1=0x5101A909,1,0,0x5101A900,1,0
-0x51015309,3,0,0x04006600,3,1=0x5101A909,3,0,0x5101A900,1,0
+0x51015309,3,0,0x04006600,3,1=0x5101A909,1,0,0x5101A900,1,0
 ;
-0x5101A909,1,1,0x04006600,1,0=0x5101A909,1,1,0x5101A900,3,1
 0x5101A909,3,1,0x04006600,1,0=0x5101A909,3,1,0x5101A900,3,1
 0x5101A909,1,0,0x04006600,3,1=0x5101A909,1,0,0x5101A900,1,0
-0x5101A909,3,0,0x04006600,3,1=0x5101A909,3,0,0x5101A900,1,0
-0x51015309,1,1,0x5101A900,3,1=0x5101A909,1,1,0x5101A900,3,1
+0x51015309,1,1,0x5101A900,3,1=0x5101A909,3,1,0x5101A900,3,1
 0x51015309,3,1,0x5101A900,3,1=0x5101A909,3,1,0x5101A900,3,1
 0x51015309,1,0,0x5101A900,1,0=0x5101A909,1,0,0x5101A900,1,0
-0x51015309,3,0,0x5101A900,1,0=0x5101A909,3,0,0x5101A900,1,0
+0x51015309,3,0,0x5101A900,1,0=0x5101A909,1,0,0x5101A900,1,0
 ;Temp Continuation
 0x51015300,3,1,0x00004b00,1,0=0x51015300,3,1,0x51010000,1,0
 0x51015300,3,1,0x00004b00,3,0=0x51015300,3,1,0x51010000,3,0
@@ -7498,19 +7494,19 @@
 0x51025309,1,0,0x04005700,3,1=0x51025309,1,0,0x51025300,1,0
 0x51025309,3,0,0x04005700,3,1=0x51025309,3,0,0x51025380,1,0
 ;TILE 3 T-INT (A9)
-0x51025309,1,1,0x04006600,1,0=0x5102A909,1,1,0x5102A980,3,1
+0x51025309,1,1,0x04006600,1,0=0x5102A989,3,1,0x5102A980,3,1
 0x51025309,3,1,0x04006600,1,0=0x5102A909,3,1,0x5102A900,3,1
 0x51025309,1,0,0x04006600,3,1=0x5102A909,1,0,0x5102A900,1,0
-0x51025309,3,0,0x04006600,3,1=0x5102A909,3,0,0x5102A980,1,0
+0x51025309,3,0,0x04006600,3,1=0x5102A989,1,0,0x5102A980,1,0
 ;
-0x5102A909,1,1,0x04006600,1,0=0x5102A909,1,1,0x5102A980,3,1
+0x5102A989,3,1,0x04006600,1,0=0x5102A989,3,1,0x5102A980,3,1
 0x5102A909,3,1,0x04006600,1,0=0x5102A909,3,1,0x5102A900,3,1
 0x5102A909,1,0,0x04006600,3,1=0x5102A909,1,0,0x5102A900,1,0
-0x5102A909,3,0,0x04006600,3,1=0x5102A909,3,0,0x5102A980,1,0
-0x51025309,1,1,0x5102A900,3,1=0x5102A909,1,1,0x5102A980,3,1
+0x5102A989,1,0,0x04006600,3,1=0x5102A989,1,0,0x5102A980,1,0
+0x51025309,1,1,0x5102A900,3,1=0x5102A989,3,1,0x5102A980,3,1
 0x51025309,3,1,0x5102A900,3,1=0x5102A909,3,1,0x5102A900,3,1
 0x51025309,1,0,0x5102A900,1,0=0x5102A909,1,0,0x5102A900,1,0
-0x51025309,3,0,0x5102A900,1,0=0x5102A909,3,0,0x5102A980,1,0
+0x51025309,3,0,0x5102A900,1,0=0x5102A989,1,0,0x5102A980,1,0
 ;Temp Continuation
 0x51025300,3,1,0x00004b00,1,0=0x51025300,3,1,0x51020000,1,0
 0x51025300,3,1,0x00004b00,3,0=0x51025300,3,1,0x51020000,1,0
@@ -11103,19 +11099,17 @@
 0x51035309,1,0,0x091a5700,3,1=0x51035309,1,0,0x51035300,1,0
 0x51035309,3,0,0x091a5700,3,1=0x51035309,3,0,0x51035300,1,0
 ;TILE 3 T-INT (A9)
-0x51035309,1,1,0x091a6600,1,0=0x5103A909,1,1,0x5103A900,3,1
+0x51035309,1,1,0x091a6600,1,0=0x5103A909,3,1,0x5103A900,3,1
 0x51035309,3,1,0x091a6600,1,0=0x5103A909,3,1,0x5103A900,3,1
 0x51035309,1,0,0x091a6600,3,1=0x5103A909,1,0,0x5103A900,1,0
-0x51035309,3,0,0x091a6600,3,1=0x5103A909,3,0,0x5103A900,1,0
+0x51035309,3,0,0x091a6600,3,1=0x5103A909,1,0,0x5103A900,1,0
 ;
-0x5103A909,1,1,0x091a6600,1,0=0x5103A909,1,1,0x5103A900,3,1
 0x5103A909,3,1,0x091a6600,1,0=0x5103A909,3,1,0x5103A900,3,1
 0x5103A909,1,0,0x091a6600,3,1=0x5103A909,1,0,0x5103A900,1,0
-0x5103A909,3,0,0x091a6600,3,1=0x5103A909,3,0,0x5103A900,1,0
-0x51035309,1,1,0x5103A900,3,1=0x5103A909,1,1,0x5103A900,3,1
+0x51035309,1,1,0x5103A900,3,1=0x5103A909,3,1,0x5103A900,3,1
 0x51035309,3,1,0x5103A900,3,1=0x5103A909,3,1,0x5103A900,3,1
 0x51035309,1,0,0x5103A900,1,0=0x5103A909,1,0,0x5103A900,1,0
-0x51035309,3,0,0x5103A900,1,0=0x5103A909,3,0,0x5103A900,1,0
+0x51035309,3,0,0x5103A900,1,0=0x5103A909,1,0,0x5103A900,1,0
 ;Temp Continuation
 0x51035300,3,1,0x09004b00,1,0=0x51035300,3,1,0x51030000,1,0
 0x51035300,3,1,0x09004b00,3,0=0x51035300,3,1,0x51030000,3,0
@@ -12379,55 +12373,65 @@
 
 ;00 to A3 (Avenue)
 ;00 to A4 (Avenue)
+;not possible due to lane math
+0x51030000,1,0,0x5F971E00,3,0=0,0,0,0,0,0
+0x51030000,3,0,0x5F971E00,3,0=0,0,0,0,0,0
+0x51030000,1,0,0x5F971E00,1,1=0,0,0,0,0,0
+0x51030000,3,0,0x5F971E00,1,1=0,0,0,0,0,0
+;
+;0x51030000,1,0,0x5F971D00,1,0=0x51030000,1,0,0x5103A309,1,0
+;0x51030000,3,0,0x5F971D00,1,0=0x51030000,3,0,0x5103A309,1,0
+;0x51030000,1,0,0x5F971D00,3,1=0x51030000,1,0,0x5103A309,3,1
+;0x51030000,3,0,0x5F971D00,3,1=0x51030000,3,0,0x5103A309,3,1
 ;Tile 1
-0x51030000,1,0,0x5F971E00,3,0=0x51030000,1,0,0x5103A300,3,0
-0x51030000,3,0,0x5F971E00,3,0=0x51030000,3,0,0x5103A300,3,0
-0x51030000,1,0,0x5F971E00,1,1=0x51030000,1,0,0x5103A300,1,1
-0x51030000,3,0,0x5F971E00,1,1=0x51030000,3,0,0x5103A300,1,1
-;
-0x51030000,1,0,0x5F971D00,1,0=0x51030000,1,0,0x5103A309,1,0
-0x51030000,3,0,0x5F971D00,1,0=0x51030000,3,0,0x5103A309,1,0
-0x51030000,1,0,0x5F971D00,3,1=0x51030000,1,0,0x5103A309,3,1
-0x51030000,3,0,0x5F971D00,3,1=0x51030000,3,0,0x5103A309,3,1
-;Tile 2
-0x5103A300,3,0,0x5F971F00,3,0=0x5103A300,3,0,0x5103A400,3,0
-0x5103A300,1,1,0x5F971F00,1,1=0x5103A300,1,1,0x5103A400,1,1
-0x51030000,1,0,0x5F971F00,3,0=0x5103A300,3,0,0x5103A400,3,0
-0x51030000,3,0,0x5F971F00,3,0=0x5103A300,3,0,0x5103A400,3,0
-0x51030000,1,0,0x5F971F00,1,1=0x5103A300,1,1,0x5103A400,1,1
-0x51030000,3,0,0x5F971F00,1,1=0x5103A300,1,1,0x5103A400,1,1
-;
-0x5103A309,1,0,0x5F971F00,1,0=0x5103A309,1,0,0x5103A400,1,0
-0x5103A309,3,1,0x5F971F00,3,1=0x5103A309,3,1,0x5103A400,3,1
-0x51030000,1,0,0x5F971F00,1,0=0x5103A309,1,0,0x5103A400,1,0
-0x51030000,3,0,0x5F971F00,1,0=0x5103A309,1,0,0x5103A400,1,0
-0x51030000,1,0,0x5F971F00,3,1=0x5103A309,3,1,0x5103A400,3,1
-0x51030000,3,0,0x5F971F00,3,1=0x5103A309,3,1,0x5103A400,3,1
+;0x51030000,1,0,0x5F971E00,3,0=0x51030000,1,0,0x5103A300,3,0
+;0x51030000,3,0,0x5F971E00,3,0=0x51030000,3,0,0x5103A300,3,0
+;0x51030000,1,0,0x5F971E00,1,1=0x51030000,1,0,0x5103A300,1,1
+;0x51030000,3,0,0x5F971E00,1,1=0x51030000,3,0,0x5103A300,1,1
+;
+;0x51030000,1,0,0x5F971D00,1,0=0x51030000,1,0,0x5103A309,1,0
+;0x51030000,3,0,0x5F971D00,1,0=0x51030000,3,0,0x5103A309,1,0
+;0x51030000,1,0,0x5F971D00,3,1=0x51030000,1,0,0x5103A309,3,1
+;0x51030000,3,0,0x5F971D00,3,1=0x51030000,3,0,0x5103A309,3,1
+;Tile 2
+;0x5103A300,3,0,0x5F971F00,3,0=0x5103A300,3,0,0x5103A400,3,0
+;0x5103A300,1,1,0x5F971F00,1,1=0x5103A300,1,1,0x5103A400,1,1
+;0x51030000,1,0,0x5F971F00,3,0=0x5103A300,3,0,0x5103A400,3,0
+;0x51030000,3,0,0x5F971F00,3,0=0x5103A300,3,0,0x5103A400,3,0
+;0x51030000,1,0,0x5F971F00,1,1=0x5103A300,1,1,0x5103A400,1,1
+;0x51030000,3,0,0x5F971F00,1,1=0x5103A300,1,1,0x5103A400,1,1
+;
+;0x5103A309,1,0,0x5F971F00,1,0=0x5103A309,1,0,0x5103A400,1,0
+;0x5103A309,3,1,0x5F971F00,3,1=0x5103A309,3,1,0x5103A400,3,1
+;0x51030000,1,0,0x5F971F00,1,0=0x5103A309,1,0,0x5103A400,1,0
+;0x51030000,3,0,0x5F971F00,1,0=0x5103A309,1,0,0x5103A400,1,0
+;0x51030000,1,0,0x5F971F00,3,1=0x5103A309,3,1,0x5103A400,3,1
+;0x51030000,3,0,0x5F971F00,3,1=0x5103A309,3,1,0x5103A400,3,1
 ;Tile 3
-0x5103A400,3,0,0x5F971D00,3,0=0x5103A400,3,0,0x5103A309,3,0
-0x5103A400,1,1,0x5F971D00,1,1=0x5103A400,1,1,0x5103A309,1,1
-0x5103A400,3,0,0x09004b00,1,0=0x5103A400,3,0,0x5103A309,3,0
-0x5103A400,3,0,0x09004b00,3,0=0x5103A400,3,0,0x5103A309,3,0
-0x5103A400,1,1,0x09004b00,1,0=0x5103A400,1,1,0x5103A309,1,1
-0x5103A400,1,1,0x09004b00,3,0=0x5103A400,1,1,0x5103A309,1,1
-;
-0x5103A400,1,0,0x5F971E00,1,0=0x5103A400,1,0,0x5103A300,1,0
-0x5103A400,3,1,0x5F971E00,3,1=0x5103A400,3,1,0x5103A300,3,1
-0x5103A400,1,0,0x09004b00,1,0=0x5103A400,1,0,0x5103A300,1,0
-0x5103A400,1,0,0x09004b00,3,0=0x5103A400,1,0,0x5103A300,1,0
-0x5103A400,3,1,0x09004b00,1,0=0x5103A400,3,1,0x5103A300,3,1
-0x5103A400,3,1,0x09004b00,3,0=0x5103A400,3,1,0x5103A300,3,1
+;0x5103A400,3,0,0x5F971D00,3,0=0x5103A400,3,0,0x5103A309,3,0
+;0x5103A400,1,1,0x5F971D00,1,1=0x5103A400,1,1,0x5103A309,1,1
+;0x5103A400,3,0,0x09004b00,1,0=0x5103A400,3,0,0x5103A309,3,0
+;0x5103A400,3,0,0x09004b00,3,0=0x5103A400,3,0,0x5103A309,3,0
+;0x5103A400,1,1,0x09004b00,1,0=0x5103A400,1,1,0x5103A309,1,1
+;0x5103A400,1,1,0x09004b00,3,0=0x5103A400,1,1,0x5103A309,1,1
+;
+;0x5103A400,1,0,0x5F971E00,1,0=0x5103A400,1,0,0x5103A300,1,0
+;0x5103A400,3,1,0x5F971E00,3,1=0x5103A400,3,1,0x5103A300,3,1
+;0x5103A400,1,0,0x09004b00,1,0=0x5103A400,1,0,0x5103A300,1,0
+;0x5103A400,1,0,0x09004b00,3,0=0x5103A400,1,0,0x5103A300,1,0
+;0x5103A400,3,1,0x09004b00,1,0=0x5103A400,3,1,0x5103A300,3,1
+;0x5103A400,3,1,0x09004b00,3,0=0x5103A400,3,1,0x5103A300,3,1
 
 ;Temporary Continuation
-0x5103A300,1,0,0x09004b00,1,0=0x5103A300,1,0,0x51030000,1,0
-0x5103A300,1,0,0x09004b00,3,0=0x5103A300,1,0,0x51030000,3,0
-0x5103A300,3,1,0x09004b00,1,0=0x5103A300,3,1,0x51030000,1,0
-0x5103A300,3,1,0x09004b00,3,0=0x5103A300,3,1,0x51030000,3,0
+;0x5103A300,1,0,0x09004b00,1,0=0x5103A300,1,0,0x51030000,1,0
+;0x5103A300,1,0,0x09004b00,3,0=0x5103A300,1,0,0x51030000,3,0
+;0x5103A300,3,1,0x09004b00,1,0=0x5103A300,3,1,0x51030000,1,0
+;0x5103A300,3,1,0x09004b00,3,0=0x5103A300,3,1,0x51030000,3,0
 ;
-0x5103A309,3,0,0x09004b00,1,0=0x5103A309,3,0,0x51030000,1,0
-0x5103A309,3,0,0x09004b00,3,0=0x5103A309,3,0,0x51030000,3,0
-0x5103A309,1,1,0x09004b00,1,0=0x5103A309,1,1,0x51030000,1,0
-0x5103A309,1,1,0x09004b00,3,0=0x5103A309,1,1,0x51030000,3,0
+;0x5103A309,3,0,0x09004b00,1,0=0x5103A309,3,0,0x51030000,1,0
+;0x5103A309,3,0,0x09004b00,3,0=0x5103A309,3,0,0x51030000,3,0
+;0x5103A309,1,1,0x09004b00,1,0=0x5103A309,1,1,0x51030000,1,0
+;0x5103A309,1,1,0x09004b00,3,0=0x5103A309,1,1,0x51030000,3,0
 
 ;00 to AA (TLA-3)
 0x51030000,1,0,0x5100B700,1,0=0x51030000,1,0,0x5103AA00,1,0
@@ -13972,19 +13976,17 @@
 0x51045309,1,0,0x091a5700,3,1=0x51045309,1,0,0x51045300,1,0
 0x51045309,3,0,0x091a5700,3,1=0x51045309,3,0,0x51045300,1,0
 ;TILE 3 T-INT (A9)
-0x51045309,1,1,0x091a6600,1,0=0x5104A909,1,1,0x5104A900,3,1
+0x51045309,1,1,0x091a6600,1,0=0x5104A909,3,1,0x5104A900,3,1
 0x51045309,3,1,0x091a6600,1,0=0x5104A909,3,1,0x5104A900,3,1
 0x51045309,1,0,0x091a6600,3,1=0x5104A909,1,0,0x5104A900,1,0
-0x51045309,3,0,0x091a6600,3,1=0x5104A909,3,0,0x5104A900,1,0
+0x51045309,3,0,0x091a6600,3,1=0x5104A909,1,0,0x5104A900,1,0
 ;
-0x5104A909,1,1,0x091a6600,1,0=0x5104A909,1,1,0x5104A900,3,1
 0x5104A909,3,1,0x091a6600,1,0=0x5104A909,3,1,0x5104A900,3,1
 0x5104A909,1,0,0x091a6600,3,1=0x5104A909,1,0,0x5104A900,1,0
-0x5104A909,3,0,0x091a6600,3,1=0x5104A909,3,0,0x5104A900,1,0
-0x51045309,1,1,0x5104A900,3,1=0x5104A909,1,1,0x5104A900,3,1
+0x51045309,1,1,0x5104A900,3,1=0x5104A909,3,1,0x5104A900,3,1
 0x51045309,3,1,0x5104A900,3,1=0x5104A909,3,1,0x5104A900,3,1
 0x51045309,1,0,0x5104A900,1,0=0x5104A909,1,0,0x5104A900,1,0
-0x51045309,3,0,0x5104A900,1,0=0x5104A909,3,0,0x5104A900,1,0
+0x51045309,3,0,0x5104A900,1,0=0x5104A909,1,0,0x5104A900,1,0
 ;Temp Continuation
 0x51045300,3,1,0x09004b00,1,0=0x51045300,3,1,0x51040000,1,0
 0x51045300,3,1,0x09004b00,3,0=0x51045300,3,1,0x51040000,3,0
@@ -16836,19 +16838,17 @@
 0x51055309,1,0,0x04005700,3,1=0x51055309,1,0,0x51055300,1,0
 0x51055309,3,0,0x04005700,3,1=0x51055309,3,0,0x51055300,1,0
 ;TILE 3 T-INT (A9)
-0x51055309,1,1,0x04006600,1,0=0x5105A909,1,1,0x5105A900,3,1
+0x51055309,1,1,0x04006600,1,0=0x5105A909,3,1,0x5105A900,3,1
 0x51055309,3,1,0x04006600,1,0=0x5105A909,3,1,0x5105A900,3,1
 0x51055309,1,0,0x04006600,3,1=0x5105A909,1,0,0x5105A900,1,0
-0x51055309,3,0,0x04006600,3,1=0x5105A909,3,0,0x5105A900,1,0
+0x51055309,3,0,0x04006600,3,1=0x5105A909,1,0,0x5105A900,1,0
 ;
-0x5105A909,1,1,0x04006600,1,0=0x5105A909,1,1,0x5105A900,3,1
 0x5105A909,3,1,0x04006600,1,0=0x5105A909,3,1,0x5105A900,3,1
 0x5105A909,1,0,0x04006600,3,1=0x5105A909,1,0,0x5105A900,1,0
-0x5105A909,3,0,0x04006600,3,1=0x5105A909,3,0,0x5105A900,1,0
-0x51055309,1,1,0x5105A900,3,1=0x5105A909,1,1,0x5105A900,3,1
+0x51055309,1,1,0x5105A900,3,1=0x5105A909,3,1,0x5105A900,3,1
 0x51055309,3,1,0x5105A900,3,1=0x5105A909,3,1,0x5105A900,3,1
 0x51055309,1,0,0x5105A900,1,0=0x5105A909,1,0,0x5105A900,1,0
-0x51055309,3,0,0x5105A900,1,0=0x5105A909,3,0,0x5105A900,1,0
+0x51055309,3,0,0x5105A900,1,0=0x5105A909,1,0,0x5105A900,1,0
 ;Temp Continuation
 0x51055300,3,1,0x00004b00,1,0=0x51055300,3,1,0x51050000,1,0
 0x51055300,3,1,0x00004b00,3,0=0x51055300,3,1,0x51050000,3,0