Skip to content

Commit f366972

Browse files
clarencechenclarencechen
committed
Merge remote-tracking branch 'NAMTeam/street-sam-revisions-v50' into street-sam-revisions-v50
2 parents 9c7fd99 + 1054858 commit f366972

17 files changed

Lines changed: 3327 additions & 1879 deletions

‎Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19667,14 +19667,14 @@
1966719667
;from STR side
1966819668
0x5D302000,0,0,0x5C004500,2,1=0x5D302000,0,0,0x5C004505,2,1
1966919669
0x5D302000,3,0,0x5C004500,0,0=0x5D302000,3,0,0x5C004505,0,0
19670-
0x5D500100,0,0,0x5C004500,2,1=0x5D500100,0,0,0x5C004505,2,1
19671-
0x5D500100,3,0,0x5C004500,0,0=0x5D500100,3,0,0x5C004505,0,0
19670+
0x5d302000,0,0,0x5C004500,2,1=0x5d302000,0,0,0x5C004505,2,1
19671+
0x5d302000,3,0,0x5C004500,0,0=0x5d302000,3,0,0x5C004505,0,0
1967219672
;
1967319673
0x5C004505,3,0,0x5C004500,1,0=0x5C004505,3,0,0x5C004505,1,0
1967419674
0x5C004505,1,1,0x5C004500,3,1=0x5C004505,1,1,0x5C004505,3,1
1967519675
;
19676-
0x5C004505,2,0,0x5D540100,1,0=0x5C004505,2,0,0x5D500100,1,0
19677-
0x5C004505,0,1,0x5D540100,2,0=0x5C004505,0,1,0x5D500100,2,0
19676+
0x5C004505,2,0,0x5D540100,1,0=0x5C004505,2,0,0x5d302000,1,0
19677+
0x5C004505,0,1,0x5D540100,2,0=0x5C004505,0,1,0x5d302000,2,0
1967819678
0x5C004505,2,0,0x03001A00,1,0=0x5C004505,2,0,0x5D302000,1,0
1967919679
0x5C004505,0,1,0x03001A00,2,0=0x5C004505,0,1,0x5D302000,2,0
1968019680
;----Light Rail (47)----
@@ -23156,14 +23156,14 @@
2315623156
;from STR side
2315723157
0x5D302000,0,0,0x5C014500,2,1=0x5D302000,0,0,0x5C014505,2,1
2315823158
0x5D302000,3,0,0x5C014500,0,0=0x5D302000,3,0,0x5C014505,0,0
23159-
0x5D500100,0,0,0x5C014500,2,1=0x5D500100,0,0,0x5C014505,2,1
23160-
0x5D500100,3,0,0x5C014500,0,0=0x5D500100,3,0,0x5C014505,0,0
23159+
0x5d302000,0,0,0x5C014500,2,1=0x5d302000,0,0,0x5C014505,2,1
23160+
0x5d302000,3,0,0x5C014500,0,0=0x5d302000,3,0,0x5C014505,0,0
2316123161
;
2316223162
0x5C014505,3,0,0x5C014500,1,0=0x5C014505,3,0,0x5C014505,1,0
2316323163
0x5C014505,1,1,0x5C014500,3,1=0x5C014505,1,1,0x5C014505,3,1
2316423164
;
23165-
0x5C014505,2,0,0x5D540100,1,0=0x5C014505,2,0,0x5D500100,1,0
23166-
0x5C014505,0,1,0x5D540100,2,0=0x5C014505,0,1,0x5D500100,2,0
23165+
0x5C014505,2,0,0x5D540100,1,0=0x5C014505,2,0,0x5d302000,1,0
23166+
0x5C014505,0,1,0x5D540100,2,0=0x5C014505,0,1,0x5d302000,2,0
2316723167
0x5C014505,2,0,0x09301A00,1,0=0x5C014505,2,0,0x5D302000,1,0; missing_paths
2316823168
0x5C014505,0,1,0x09301A00,2,0=0x5C014505,0,1,0x5D302000,2,0; missing_paths
2316923169
;----Light Rail (47)----
@@ -31884,12 +31884,12 @@
3188431884
0x5C02A505,3,1,0x5712A389,0,0=0x5C02A505,3,1,0x5712A39A,0,0; missing_paths
3188531885
0x5C02A505,1,0,0x5712A389,3,0=0x5C02A505,1,0,0x5712A39A,3,0; missing_paths
3188631886
;-STR Side-
31887-
0x5D500100,3,0,0x5C02A500,1,0=0x5D500100,3,0,0x5C02A505,1,0
31888-
0x5D500100,0,0,0x5C02A500,3,1=0x5D500100,0,0,0x5C02A505,3,1
31887+
0x5d302000,3,0,0x5C02A500,1,0=0x5d302000,3,0,0x5C02A505,1,0
31888+
0x5d302000,0,0,0x5C02A500,3,1=0x5d302000,0,0,0x5C02A505,3,1
3188931889
0x5C02A505,3,0,0x03001a00,1,0=0x5C02A505,3,0,0x5d302000,1,0
31890-
0x5C02A505,3,0,0x5d540100,1,0=0x5C02A505,3,0,0x5d500100,1,0
31890+
0x5C02A505,3,0,0x5d540100,1,0=0x5C02A505,3,0,0x5d302000,1,0
3189131891
0x5C02A505,1,1,0x03001a00,2,0=0x5C02A505,1,1,0x5d302000,2,0
31892-
0x5C02A505,1,1,0x5d540100,2,0=0x5C02A505,1,1,0x5d500100,2,0
31892+
0x5C02A505,1,1,0x5d540100,2,0=0x5C02A505,1,1,0x5d302000,2,0
3189331893
;--Ground Light Rail (A7a)--
3189431894
0x5C020200,0,0,0x5f882600,3,0=0x5C020200,0,0,0x5C02A780,0,0
3189531895
0x5C020200,1,0,0x5f882600,2,0=0x5C020200,1,0,0x5C02A780,3,0

‎Controller/RUL2/06_Road_Viaducts/Sec6b_L2.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11499,14 +11499,14 @@
1149911499
;from STR side
1150011500
0x5D302000,0,0,0x5C034500,2,1=0x5D302000,0,0,0x5C034505,2,1
1150111501
0x5D302000,3,0,0x5C034500,0,0=0x5D302000,3,0,0x5C034505,0,0
11502-
0x5D500100,0,0,0x5C034500,2,1=0x5D500100,0,0,0x5C034505,2,1
11503-
0x5D500100,3,0,0x5C034500,0,0=0x5D500100,3,0,0x5C034505,0,0
11502+
0x5d302000,0,0,0x5C034500,2,1=0x5d302000,0,0,0x5C034505,2,1
11503+
0x5d302000,3,0,0x5C034500,0,0=0x5d302000,3,0,0x5C034505,0,0
1150411504
;
1150511505
0x5C034505,3,0,0x5C034500,1,0=0x5C034505,3,0,0x5C034505,1,0
1150611506
0x5C034505,1,1,0x5C034500,3,1=0x5C034505,1,1,0x5C034505,3,1
1150711507
;
11508-
0x5C034505,2,0,0x5D540100,1,0=0x5C034505,2,0,0x5D500100,1,0
11509-
0x5C034505,0,1,0x5D540100,2,0=0x5C034505,0,1,0x5D500100,2,0
11508+
0x5C034505,2,0,0x5D540100,1,0=0x5C034505,2,0,0x5d302000,1,0
11509+
0x5C034505,0,1,0x5D540100,2,0=0x5C034505,0,1,0x5d302000,2,0
1151011510
0x5C034505,2,0,0x03001A00,1,0=0x5C034505,2,0,0x5D302000,1,0
1151111511
0x5C034505,0,1,0x03001A00,2,0=0x5C034505,0,1,0x5D302000,2,0
1151211512
;----Light Rail (47)----
@@ -15138,14 +15138,14 @@
1513815138
;from STR side
1513915139
0x5D302000,0,0,0x5C044500,2,1=0x5D302000,0,0,0x5C044505,2,1
1514015140
0x5D302000,3,0,0x5C044500,0,0=0x5D302000,3,0,0x5C044505,0,0
15141-
0x5D500100,0,0,0x5C044500,2,1=0x5D500100,0,0,0x5C044505,2,1
15142-
0x5D500100,3,0,0x5C044500,0,0=0x5D500100,3,0,0x5C044505,0,0
15141+
0x5d302000,0,0,0x5C044500,2,1=0x5d302000,0,0,0x5C044505,2,1
15142+
0x5d302000,3,0,0x5C044500,0,0=0x5d302000,3,0,0x5C044505,0,0
1514315143
;
1514415144
0x5C044505,3,0,0x5C044500,1,0=0x5C044505,3,0,0x5C044505,1,0
1514515145
0x5C044505,1,1,0x5C044500,3,1=0x5C044505,1,1,0x5C044505,3,1
1514615146
;
15147-
0x5C044505,2,0,0x5D540100,1,0=0x5C044505,2,0,0x5D500100,1,0
15148-
0x5C044505,0,1,0x5D540100,2,0=0x5C044505,0,1,0x5D500100,2,0
15147+
0x5C044505,2,0,0x5D540100,1,0=0x5C044505,2,0,0x5d302000,1,0
15148+
0x5C044505,0,1,0x5D540100,2,0=0x5C044505,0,1,0x5d302000,2,0
1514915149
0x5C044505,2,0,0x09301A00,1,0=0x5C044505,2,0,0x5D302000,1,0; missing_paths
1515015150
0x5C044505,0,1,0x09301A00,2,0=0x5C044505,0,1,0x5D302000,2,0; missing_paths
1515115151
;----Light Rail (47)----
@@ -23934,12 +23934,12 @@
2393423934
0x5C05A505,3,1,0x5722A389,0,0=0x5C05A505,3,1,0x5722A3AA,0,0; missing_paths
2393523935
0x5C05A505,1,0,0x5722A389,3,0=0x5C05A505,1,0,0x5722A3AA,3,0; missing_paths
2393623936
;-STR Side-
23937-
0x5D500100,3,0,0x5C05A500,1,0=0x5D500100,3,0,0x5C05A505,1,0
23938-
0x5D500100,0,0,0x5C05A500,3,1=0x5D500100,0,0,0x5C05A505,3,1
23937+
0x5d302000,3,0,0x5C05A500,1,0=0x5d302000,3,0,0x5C05A505,1,0
23938+
0x5d302000,0,0,0x5C05A500,3,1=0x5d302000,0,0,0x5C05A505,3,1
2393923939
0x5C05A505,3,0,0x03001a00,1,0=0x5C05A505,3,0,0x5d302000,1,0
23940-
0x5C05A505,3,0,0x5d540100,1,0=0x5C05A505,3,0,0x5d500100,1,0
23940+
0x5C05A505,3,0,0x5d540100,1,0=0x5C05A505,3,0,0x5d302000,1,0
2394123941
0x5C05A505,1,1,0x03001a00,2,0=0x5C05A505,1,1,0x5d302000,2,0
23942-
0x5C05A505,1,1,0x5d540100,2,0=0x5C05A505,1,1,0x5d500100,2,0
23942+
0x5C05A505,1,1,0x5d540100,2,0=0x5C05A505,1,1,0x5d302000,2,0
2394323943
;--Ground Light Rail (A7a)--
2394423944
0x5C050200,0,0,0x5f882600,3,0=0x5C050200,0,0,0x5C05A780,0,0
2394523945
0x5C050200,1,0,0x5f882600,2,0=0x5C050200,1,0,0x5C05A780,3,0

‎Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,14 +1565,14 @@
15651565
0x51005F00,1,0,0x00004b00,1,0=0x51005F00,1,0,0x51000000,1,0
15661566
0x51005F00,1,0,0x00004b00,3,0=0x51005F00,1,0,0x51000000,3,0
15671567
;Temp STR Side
1568-
0x5D500100,3,0,0x51005500,0,0=0x5D500100,3,0,0x51005F00,0,0
1569-
0x5D500100,0,0,0x51005500,2,1=0x5D500100,0,0,0x51005F00,2,1
1568+
0x5d302000,3,0,0x51005500,0,0=0x5d302000,3,0,0x51005F00,0,0
1569+
0x5d302000,0,0,0x51005500,2,1=0x5d302000,0,0,0x51005F00,2,1
15701570
;Tile 2
15711571
0x51005F00,3,0,0x51005500,1,0=0x51005F00,3,0,0x51005F00,1,0
15721572
0x51005F00,1,1,0x51005500,3,1=0x51005F00,1,1,0x51005F00,3,1
15731573
;Continuation
1574-
0x51005F00,2,0,0x5D540100,1,0=0x51005F00,2,0,0x5D500100,1,0
1575-
0x51005F00,0,1,0x5D540100,2,0=0x51005F00,0,1,0x5D500100,2,0
1574+
0x51005F00,2,0,0x5D540100,1,0=0x51005F00,2,0,0x5d302000,1,0
1575+
0x51005F00,0,1,0x5D540100,2,0=0x51005F00,0,1,0x5d302000,2,0
15761576

15771577
;---TLA-3 (60)---
15781578
0x51000000,1,0,0x51007100,0,0=0x51000000,1,0,0x51006000,3,0
@@ -4575,14 +4575,14 @@
45754575
0x51015F00,1,0,0x00004b00,1,0=0x51015F00,1,0,0x51010000,1,0
45764576
0x51015F00,1,0,0x00004b00,3,0=0x51015F00,1,0,0x51010000,3,0
45774577
;Temp STR Side
4578-
0x5D500100,3,0,0x51015500,0,0=0x5D500100,3,0,0x51015F00,0,0
4579-
0x5D500100,0,0,0x51015500,2,1=0x5D500100,0,0,0x51015F00,2,1
4578+
0x5d302000,3,0,0x51015500,0,0=0x5d302000,3,0,0x51015F00,0,0
4579+
0x5d302000,0,0,0x51015500,2,1=0x5d302000,0,0,0x51015F00,2,1
45804580
;Tile 2
45814581
0x51015F00,3,0,0x51015500,1,0=0x51015F00,3,0,0x51015F00,1,0
45824582
0x51015F00,1,1,0x51015500,3,1=0x51015F00,1,1,0x51015F00,3,1
45834583
;Continuation
4584-
0x51015F00,2,0,0x5D540100,1,0=0x51015F00,2,0,0x5D500100,1,0
4585-
0x51015F00,0,1,0x5D540100,2,0=0x51015F00,0,1,0x5D500100,2,0
4584+
0x51015F00,2,0,0x5D540100,1,0=0x51015F00,2,0,0x5d302000,1,0
4585+
0x51015F00,0,1,0x5D540100,2,0=0x51015F00,0,1,0x5d302000,2,0
45864586

45874587
;---TLA-3 (60)---
45884588
0x51010000,1,0,0x51007100,0,0=0x51010000,1,0,0x51016000,3,0
@@ -7600,20 +7600,20 @@
76007600
0x51025F80,1,0,0x00004b00,1,0=0x51025F80,1,0,0x51020000,1,0
76017601
0x51025F80,1,0,0x00004b00,3,0=0x51025F80,1,0,0x51020000,1,0
76027602
;Temp STR Side
7603-
0x5D500100,3,0,0x51025500,0,0=0x5D500100,3,0,0x51025F00,0,0
7604-
0x5D500100,0,0,0x51025500,2,1=0x5D500100,0,0,0x51025F00,2,1
7605-
0x5D500100,3,0,0x51025580,0,0=0x5D500100,3,0,0x51025F80,0,0
7606-
0x5D500100,0,0,0x51025580,2,1=0x5D500100,0,0,0x51025F80,2,1
7603+
0x5d302000,3,0,0x51025500,0,0=0x5d302000,3,0,0x51025F00,0,0
7604+
0x5d302000,0,0,0x51025500,2,1=0x5d302000,0,0,0x51025F00,2,1
7605+
0x5d302000,3,0,0x51025580,0,0=0x5d302000,3,0,0x51025F80,0,0
7606+
0x5d302000,0,0,0x51025580,2,1=0x5d302000,0,0,0x51025F80,2,1
76077607
;Tile 2
76087608
0x51025F00,3,0,0x51025580,1,0=0x51025F00,3,0,0x51025F80,1,0
76097609
0x51025F00,1,1,0x51025580,3,1=0x51025F00,1,1,0x51025F80,3,1
76107610
0x51025F80,3,0,0x51025500,1,0=0x51025F80,3,0,0x51025F00,1,0
76117611
0x51025F80,1,1,0x51025500,3,1=0x51025F80,1,1,0x51025F00,3,1
76127612
;Continuation
7613-
0x51025F00,2,0,0x5D540100,1,0=0x51025F00,2,0,0x5D500100,1,0
7614-
0x51025F00,0,1,0x5D540100,2,0=0x51025F00,0,1,0x5D500100,2,0
7615-
0x51025F80,2,0,0x5D540100,1,0=0x51025F80,2,0,0x5D500100,1,0
7616-
0x51025F80,0,1,0x5D540100,2,0=0x51025F80,0,1,0x5D500100,2,0
7613+
0x51025F00,2,0,0x5D540100,1,0=0x51025F00,2,0,0x5d302000,1,0
7614+
0x51025F00,0,1,0x5D540100,2,0=0x51025F00,0,1,0x5d302000,2,0
7615+
0x51025F80,2,0,0x5D540100,1,0=0x51025F80,2,0,0x5d302000,1,0
7616+
0x51025F80,0,1,0x5D540100,2,0=0x51025F80,0,1,0x5d302000,2,0
76177617

76187618
;---TLA-3 (60)---
76197619
0x51020000,1,0,0x51007100,0,0=0x51020000,1,0,0x51026000,3,0
@@ -11046,14 +11046,14 @@
1104611046
0x51035F00,1,0,0x09004b00,1,0=0x51035F00,1,0,0x51030000,1,0
1104711047
0x51035F00,1,0,0x09004b00,3,0=0x51035F00,1,0,0x51030000,3,0
1104811048
;Temp STR Side
11049-
0x5D500100,3,0,0x51035500,0,0=0x5D500100,3,0,0x51035F00,0,0
11050-
0x5D500100,0,0,0x51035500,2,1=0x5D500100,0,0,0x51035F00,2,1
11049+
0x5d302000,3,0,0x51035500,0,0=0x5d302000,3,0,0x51035F00,0,0
11050+
0x5d302000,0,0,0x51035500,2,1=0x5d302000,0,0,0x51035F00,2,1
1105111051
;Tile 2
1105211052
0x51035F00,3,0,0x51035500,1,0=0x51035F00,3,0,0x51035F00,1,0
1105311053
0x51035F00,1,1,0x51035500,3,1=0x51035F00,1,1,0x51035F00,3,1
1105411054
;Continuation
11055-
0x51035F00,2,0,0x5D540100,1,0=0x51035F00,2,0,0x5D500100,1,0
11056-
0x51035F00,0,1,0x5D540100,2,0=0x51035F00,0,1,0x5D500100,2,0
11055+
0x51035F00,2,0,0x5D540100,1,0=0x51035F00,2,0,0x5d302000,1,0
11056+
0x51035F00,0,1,0x5D540100,2,0=0x51035F00,0,1,0x5d302000,2,0
1105711057

1105811058
;---TLA-3 (60)---
1105911059
0x51030000,1,0,0x51007200,0,0=0x51030000,1,0,0x51036000,3,0
@@ -13869,14 +13869,14 @@
1386913869
0x51045F00,1,0,0x09004b00,1,0=0x51045F00,1,0,0x51040000,1,0
1387013870
0x51045F00,1,0,0x09004b00,3,0=0x51045F00,1,0,0x51040000,3,0
1387113871
;Temp STR Side
13872-
0x5D500100,3,0,0x51045500,0,0=0x5D500100,3,0,0x51045F00,0,0
13873-
0x5D500100,0,0,0x51045500,2,1=0x5D500100,0,0,0x51045F00,2,1
13872+
0x5d302000,3,0,0x51045500,0,0=0x5d302000,3,0,0x51045F00,0,0
13873+
0x5d302000,0,0,0x51045500,2,1=0x5d302000,0,0,0x51045F00,2,1
1387413874
;Tile 2
1387513875
0x51045F00,3,0,0x51045500,1,0=0x51045F00,3,0,0x51045F00,1,0
1387613876
0x51045F00,1,1,0x51045500,3,1=0x51045F00,1,1,0x51045F00,3,1
1387713877
;Continuation
13878-
0x51045F00,2,0,0x5D540100,1,0=0x51045F00,2,0,0x5D500100,1,0
13879-
0x51045F00,0,1,0x5D540100,2,0=0x51045F00,0,1,0x5D500100,2,0
13878+
0x51045F00,2,0,0x5D540100,1,0=0x51045F00,2,0,0x5d302000,1,0
13879+
0x51045F00,0,1,0x5D540100,2,0=0x51045F00,0,1,0x5d302000,2,0
1388013880

1388113881
;---TLA-3 (60)---
1388213882
0x51040000,1,0,0x51007200,0,0=0x51040000,1,0,0x51046000,3,0
@@ -16696,14 +16696,14 @@
1669616696
0x51055F00,1,0,0x00004b00,1,0=0x51055F00,1,0,0x51050000,1,0
1669716697
0x51055F00,1,0,0x00004b00,3,0=0x51055F00,1,0,0x51050000,3,0
1669816698
;Temp STR Side
16699-
0x5D500100,3,0,0x51055500,0,0=0x5D500100,3,0,0x51055F00,0,0
16700-
0x5D500100,0,0,0x51055500,2,1=0x5D500100,0,0,0x51055F00,2,1
16699+
0x5d302000,3,0,0x51055500,0,0=0x5d302000,3,0,0x51055F00,0,0
16700+
0x5d302000,0,0,0x51055500,2,1=0x5d302000,0,0,0x51055F00,2,1
1670116701
;Tile 2
1670216702
0x51055F00,3,0,0x51055500,1,0=0x51055F00,3,0,0x51055F00,1,0
1670316703
0x51055F00,1,1,0x51055500,3,1=0x51055F00,1,1,0x51055F00,3,1
1670416704
;Continuation
16705-
0x51055F00,2,0,0x5D540100,1,0=0x51055F00,2,0,0x5D500100,1,0
16706-
0x51055F00,0,1,0x5D540100,2,0=0x51055F00,0,1,0x5D500100,2,0
16705+
0x51055F00,2,0,0x5D540100,1,0=0x51055F00,2,0,0x5d302000,1,0
16706+
0x51055F00,0,1,0x5D540100,2,0=0x51055F00,0,1,0x5d302000,2,0
1670716707

1670816708
;---TLA-3 (60)---
1670916709
0x51050000,1,0,0x51007100,0,0=0x51050000,1,0,0x51056000,3,0

‎Controller/RUL2/08_NWM/02_Diagonal_NWM.txt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -458,14 +458,14 @@
458458
0x51008F00,0,0,0x00000A00,2,0=0x51008F00,0,0,0x51000200,2,0
459459
0x51008F00,2,1,0x00000A00,1,0=0x51008F00,2,1,0x51000200,1,0
460460
;STR Side Temp
461-
0x5D500100,3,0,0x51008500,0,0=0x5D500100,3,0,0x51008F00,0,0
462-
0x5D500100,0,0,0x51008500,2,1=0x5D500100,0,0,0x51008F00,2,1
461+
0x5d302000,3,0,0x51008500,0,0=0x5d302000,3,0,0x51008F00,0,0
462+
0x5d302000,0,0,0x51008500,2,1=0x5d302000,0,0,0x51008F00,2,1
463463
;Tile 2
464464
0x51008F00,3,0,0x51008500,1,0=0x51008F00,3,0,0x51008F00,1,0
465465
0x51008F00,1,1,0x51008500,3,1=0x51008F00,1,1,0x51008F00,3,1
466466
;Continuation
467-
0x51008F00,2,0,0x5D540100,1,0=0x51008F00,2,0,0x5D500100,1,0
468-
0x51008F00,0,1,0x5D540100,2,0=0x51008F00,0,1,0x5D500100,2,0
467+
0x51008F00,2,0,0x5D540100,1,0=0x51008F00,2,0,0x5d302000,1,0
468+
0x51008F00,0,1,0x5D540100,2,0=0x51008F00,0,1,0x5d302000,2,0
469469

470470
;unused extender tiles from non-overhang NWM x NWM DxD attempt
471471
;0x51008D00,3,0,0x00000a00,1,0=0x51008D00,3,0,0x51000200,1,0
@@ -1941,14 +1941,14 @@
19411941
0x51018F00,0,0,0x00000A00,2,0=0x51018F00,0,0,0x51010200,2,0
19421942
0x51018F00,2,1,0x00000A00,1,0=0x51018F00,2,1,0x51010200,1,0
19431943
;STR Side Temp
1944-
0x5D500100,3,0,0x51018500,0,0=0x5D500100,3,0,0x51018F00,0,0
1945-
0x5D500100,0,0,0x51018500,2,1=0x5D500100,0,0,0x51018F00,2,1
1944+
0x5d302000,3,0,0x51018500,0,0=0x5d302000,3,0,0x51018F00,0,0
1945+
0x5d302000,0,0,0x51018500,2,1=0x5d302000,0,0,0x51018F00,2,1
19461946
;Tile 2
19471947
0x51018F00,3,0,0x51018500,1,0=0x51018F00,3,0,0x51018F00,1,0
19481948
0x51018F00,1,1,0x51018500,3,1=0x51018F00,1,1,0x51018F00,3,1
19491949
;Continuation
1950-
0x51018F00,2,0,0x5D540100,1,0=0x51018F00,2,0,0x5D500100,1,0
1951-
0x51018F00,0,1,0x5D540100,2,0=0x51018F00,0,1,0x5D500100,2,0
1950+
0x51018F00,2,0,0x5D540100,1,0=0x51018F00,2,0,0x5d302000,1,0
1951+
0x51018F00,0,1,0x5D540100,2,0=0x51018F00,0,1,0x5d302000,2,0
19521952

19531953
;00 to 90 (TLA-3)
19541954
0x51010200,0,0,0x71008100,2,1=0x51010200,0,0,0x51019000,2,0
@@ -3681,20 +3681,20 @@
36813681
0x51028F80,0,0,0x00000A00,2,0=0x51028F80,0,0,0x51020900,2,0
36823682
0x51028F80,2,1,0x00000A00,1,0=0x51028F80,2,1,0x51020900,1,0
36833683
;STR Side Temp
3684-
0x5D500100,3,0,0x51028500,0,0=0x5D500100,3,0,0x51028F00,0,0
3685-
0x5D500100,0,0,0x51028500,2,1=0x5D500100,0,0,0x51028F00,2,1
3686-
0x5D500100,3,0,0x51028580,0,0=0x5D500100,3,0,0x51028F80,0,0
3687-
0x5D500100,0,0,0x51028580,2,1=0x5D500100,0,0,0x51028F80,2,1
3684+
0x5d302000,3,0,0x51028500,0,0=0x5d302000,3,0,0x51028F00,0,0
3685+
0x5d302000,0,0,0x51028500,2,1=0x5d302000,0,0,0x51028F00,2,1
3686+
0x5d302000,3,0,0x51028580,0,0=0x5d302000,3,0,0x51028F80,0,0
3687+
0x5d302000,0,0,0x51028580,2,1=0x5d302000,0,0,0x51028F80,2,1
36883688
;Tile 2
36893689
0x51028F00,3,0,0x51028580,1,0=0x51028F00,3,0,0x51028F80,1,0
36903690
0x51028F00,1,1,0x51028580,3,1=0x51028F00,1,1,0x51028F80,3,1
36913691
0x51028F80,3,0,0x51028500,1,0=0x51028F80,3,0,0x51028F00,1,0
36923692
0x51028F80,1,1,0x51028500,3,1=0x51028F80,1,1,0x51028F00,3,1
36933693
;Continuation
3694-
0x51028F00,2,0,0x5D540100,1,0=0x51028F00,2,0,0x5D500100,1,0
3695-
0x51028F00,0,1,0x5D540100,2,0=0x51028F00,0,1,0x5D500100,2,0
3696-
0x51028F80,2,0,0x5D540100,1,0=0x51028F80,2,0,0x5D500100,1,0
3697-
0x51028F80,0,1,0x5D540100,2,0=0x51028F80,0,1,0x5D500100,2,0
3694+
0x51028F00,2,0,0x5D540100,1,0=0x51028F00,2,0,0x5d302000,1,0
3695+
0x51028F00,0,1,0x5D540100,2,0=0x51028F00,0,1,0x5d302000,2,0
3696+
0x51028F80,2,0,0x5D540100,1,0=0x51028F80,2,0,0x5d302000,1,0
3697+
0x51028F80,0,1,0x5D540100,2,0=0x51028F80,0,1,0x5d302000,2,0
36983698

36993699
;00 to 90 (TLA-3)
37003700
0x51020200,0,0,0x71008100,2,1=0x51020200,0,0,0x51029000,2,0
@@ -5829,14 +5829,14 @@
58295829
0x51038F00,0,0,0x09000A00,2,0=0x51038F00,0,0,0x51030200,2,0
58305830
0x51038F00,2,1,0x09000A00,1,0=0x51038F00,2,1,0x51030200,1,0
58315831
;STR Side Temp
5832-
0x5D500100,3,0,0x51038500,0,0=0x5D500100,3,0,0x51038F00,0,0
5833-
0x5D500100,0,0,0x51038500,2,1=0x5D500100,0,0,0x51038F00,2,1
5832+
0x5d302000,3,0,0x51038500,0,0=0x5d302000,3,0,0x51038F00,0,0
5833+
0x5d302000,0,0,0x51038500,2,1=0x5d302000,0,0,0x51038F00,2,1
58345834
;Tile 2
58355835
0x51038F00,3,0,0x51038500,1,0=0x51038F00,3,0,0x51038F00,1,0
58365836
0x51038F00,1,1,0x51038500,3,1=0x51038F00,1,1,0x51038F00,3,1
58375837
;Continuation
5838-
0x51038F00,2,0,0x5D540100,1,0=0x51038F00,2,0,0x5D500100,1,0
5839-
0x51038F00,0,1,0x5D540100,2,0=0x51038F00,0,1,0x5D500100,2,0
5838+
0x51038F00,2,0,0x5D540100,1,0=0x51038F00,2,0,0x5d302000,1,0
5839+
0x51038F00,0,1,0x5D540100,2,0=0x51038F00,0,1,0x5d302000,2,0
58405840

58415841
;00 to 90 (TLA-3)
58425842
0x51030200,0,0,0x71008200,2,1=0x51030200,0,0,0x51039000,2,0
@@ -7261,14 +7261,14 @@
72617261
0x51048F00,0,0,0x09000A00,2,0=0x51048F00,0,0,0x51040200,2,0
72627262
0x51048F00,2,1,0x09000A00,1,0=0x51048F00,2,1,0x51040200,1,0
72637263
;STR Side Temp
7264-
0x5D500100,3,0,0x51048500,0,0=0x5D500100,3,0,0x51048F00,0,0
7265-
0x5D500100,0,0,0x51048500,2,1=0x5D500100,0,0,0x51048F00,2,1
7264+
0x5d302000,3,0,0x51048500,0,0=0x5d302000,3,0,0x51048F00,0,0
7265+
0x5d302000,0,0,0x51048500,2,1=0x5d302000,0,0,0x51048F00,2,1
72667266
;Tile 2
72677267
0x51048F00,3,0,0x51048500,1,0=0x51048F00,3,0,0x51048F00,1,0
72687268
0x51048F00,1,1,0x51048500,3,1=0x51048F00,1,1,0x51048F00,3,1
72697269
;Continuation
7270-
0x51048F00,2,0,0x5D540100,1,0=0x51048F00,2,0,0x5D500100,1,0
7271-
0x51048F00,0,1,0x5D540100,2,0=0x51048F00,0,1,0x5D500100,2,0
7270+
0x51048F00,2,0,0x5D540100,1,0=0x51048F00,2,0,0x5d302000,1,0
7271+
0x51048F00,0,1,0x5D540100,2,0=0x51048F00,0,1,0x5d302000,2,0
72727272

72737273
;00 to 90 (TLA-3)
72747274
0x51040200,0,0,0x71008200,2,1=0x51040200,0,0,0x51049000,2,0
@@ -8664,14 +8664,14 @@
86648664
0x51058F00,0,0,0x00000A00,2,0=0x51058F00,0,0,0x51050200,2,0
86658665
0x51058F00,2,1,0x00000A00,1,0=0x51058F00,2,1,0x51050200,1,0
86668666
;STR Side Temp
8667-
0x5D500100,3,0,0x51058500,0,0=0x5D500100,3,0,0x51058F00,0,0
8668-
0x5D500100,0,0,0x51058500,2,1=0x5D500100,0,0,0x51058F00,2,1
8667+
0x5d302000,3,0,0x51058500,0,0=0x5d302000,3,0,0x51058F00,0,0
8668+
0x5d302000,0,0,0x51058500,2,1=0x5d302000,0,0,0x51058F00,2,1
86698669
;Tile 2
86708670
0x51058F00,3,0,0x51058500,1,0=0x51058F00,3,0,0x51058F00,1,0
86718671
0x51058F00,1,1,0x51058500,3,1=0x51058F00,1,1,0x51058F00,3,1
86728672
;Continuation
8673-
0x51058F00,2,0,0x5D540100,1,0=0x51058F00,2,0,0x5D500100,1,0
8674-
0x51058F00,0,1,0x5D540100,2,0=0x51058F00,0,1,0x5D500100,2,0
8673+
0x51058F00,2,0,0x5D540100,1,0=0x51058F00,2,0,0x5d302000,1,0
8674+
0x51058F00,0,1,0x5D540100,2,0=0x51058F00,0,1,0x5d302000,2,0
86758675

86768676
;00 to 90 (TLA-3)
86778677
0x51050200,0,0,0x71008100,2,1=0x51050200,0,0,0x51059000,2,0

‎Controller/RUL2/11_Rail/Sec11b_RAM-RRW_conversioncode.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
0x5d300000,1,0,0x5d540000,3,0=0x5d500000,1,0,0x5d500000,3,0
66
0x5d300000,3,0,0x5d540000,3,0=0x5d500000,3,0,0x5d500000,3,0
77
; old STR + new DTR dia
8-
0x5d302000,0,0,0x5d540100,2,0=0x5d500100,0,0,0x5d500100,2,0
9-
0x5d302000,0,0,0x5d540100,3,1=0x5d500100,0,0,0x5d500100,3,1
10-
0x5d302000,1,1,0x5d540100,2,0=0x5d500100,1,1,0x5d500100,2,0
11-
0x5d302000,1,1,0x5d540100,3,1=0x5d500100,1,1,0x5d500100,3,1
12-
0x5d302000,3,0,0x5d540100,1,0=0x5d500100,3,0,0x5d500100,1,0
13-
0x5d302000,3,0,0x5d540100,0,1=0x5d500100,3,0,0x5d500100,0,1
14-
0x5d302000,2,1,0x5d540100,1,0=0x5d500100,2,1,0x5d500100,1,0
15-
0x5d302000,2,1,0x5d540100,0,1=0x5d500100,2,1,0x5d500100,0,1
8+
0x5d302000,0,0,0x5d540100,2,0=0x5d302000,0,0,0x5d302000,2,0
9+
0x5d302000,0,0,0x5d540100,3,1=0x5d302000,0,0,0x5d302000,3,1
10+
0x5d302000,1,1,0x5d540100,2,0=0x5d302000,1,1,0x5d302000,2,0
11+
0x5d302000,1,1,0x5d540100,3,1=0x5d302000,1,1,0x5d302000,3,1
12+
0x5d302000,3,0,0x5d540100,1,0=0x5d302000,3,0,0x5d302000,1,0
13+
0x5d302000,3,0,0x5d540100,0,1=0x5d302000,3,0,0x5d302000,0,1
14+
0x5d302000,2,1,0x5d540100,1,0=0x5d302000,2,1,0x5d302000,1,0
15+
0x5d302000,2,1,0x5d540100,0,1=0x5d302000,2,1,0x5d302000,0,1
1616
;

0 commit comments

Comments
 (0)