Skip to content

Commit 12c39da

Browse files
TarkusSC4TarkusSC4
committed
Refixes last few conflicts on ARD-3 x OWR Ts.
1 parent 2ec200f commit 12c39da

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2858,9 +2858,9 @@
28582858
0x51000000,3,0,0x49803A00,3,1=0x51000000,3,0,0x7100A700,1,1
28592859
;Tile 2 End-T
28602860
0x5100A700,3,0,0x09803C00,1,0=0x5100A700,3,0,0x5100A709,1,0
2861-
0x7100A700,1,1,0x09803C00,3,1=0x7100A700,1,1,0x7100A709,3,1
2861+
0x7100A700,1,1,0x49803C00,3,1=0x7100A700,1,1,0x7100A709,3,1
28622862
0x51005100,3,0,0x09803C00,1,0=0x5100A700,3,0,0x5100A709,1,0
2863-
0x71005100,1,1,0x09803C00,3,1=0x7100A700,1,1,0x7100A709,3,1
2863+
0x71005100,1,1,0x49803C00,3,1=0x7100A700,1,1,0x7100A709,3,1
28642864
0x5100A700,3,0,0x09000A00,2,0=0x5100A700,3,0,0x5100A709,1,0
28652865
0x7100A700,1,1,0x09000A00,1,0=0x7100A700,1,1,0x7100A709,3,1
28662866
0x51005100,3,0,0x09000A00,2,0=0x5100A700,3,0,0x5100A709,1,0
@@ -5692,9 +5692,9 @@
56925692
0x51010000,3,0,0x49803A00,3,1=0x51010000,3,0,0x5101A700,1,1
56935693
;Tile 2 End-T
56945694
0x5101A700,3,0,0x09803C00,1,0=0x5101A700,3,0,0x5101A709,1,0
5695-
0x5101A700,1,1,0x09803C00,3,1=0x5101A700,1,1,0x5101A709,3,1
5695+
0x5101A700,1,1,0x49803C00,3,1=0x5101A700,1,1,0x5101A709,3,1
56965696
0x51015100,3,0,0x09803C00,1,0=0x5101A700,3,0,0x5101A709,1,0
5697-
0x51015100,1,1,0x09803C00,3,1=0x5101A700,1,1,0x5101A709,3,1
5697+
0x51015100,1,1,0x49803C00,3,1=0x5101A700,1,1,0x5101A709,3,1
56985698
0x5101A700,3,0,0x09000A00,2,0=0x5101A700,3,0,0x5101A709,1,0
56995699
0x5101A700,1,1,0x09000A00,1,0=0x5101A700,1,1,0x5101A709,3,1
57005700
0x51015100,3,0,0x09000A00,2,0=0x5101A700,3,0,0x5101A709,1,0
@@ -9265,17 +9265,17 @@
92659265
0x51020000,3,0,0x49803A00,3,1=0x51020000,3,0,0x7102A700,1,1
92669266
;Tile 2 End-T
92679267
0x5102A700,3,0,0x09803C00,1,0=0x5102A700,3,0,0x5102A709,1,0
9268-
0x7102A700,1,1,0x09803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
9268+
0x7102A700,1,1,0x49803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
92699269
0x51025200,3,0,0x09803C00,1,0=0x5102A700,3,0,0x5102A709,1,0
9270-
0x51025200,1,1,0x09803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
9270+
0x51025200,1,1,0x49803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
92719271
0x5102A700,3,0,0x09000A00,2,0=0x5102A700,3,0,0x5102A709,1,0
92729272
0x7102A700,1,1,0x09000A00,1,0=0x7102A700,1,1,0x7102A709,3,1
92739273
0x51025200,3,0,0x09000A00,2,0=0x5102A700,3,0,0x5102A709,1,0
92749274
0x51025200,1,1,0x09000A00,1,0=0x7102A700,1,1,0x7102A709,3,1
92759275
0x5102A780,3,0,0x09803C00,1,0=0x5102A780,3,0,0x5102A789,1,0
9276-
0x7102A780,1,1,0x09803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
9276+
0x7102A780,1,1,0x49803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
92779277
0x51025280,3,0,0x09803C00,1,0=0x5102A780,3,0,0x5102A789,1,0
9278-
0x51025280,1,1,0x09803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
9278+
0x51025280,1,1,0x49803C00,3,1=0x7102A780,1,1,0x7102A789,3,1
92799279
0x5102A780,3,0,0x09000A00,2,0=0x5102A780,3,0,0x5102A789,1,0
92809280
0x7102A780,1,1,0x09000A00,1,0=0x7102A780,1,1,0x7102A789,3,1
92819281
0x51025280,3,0,0x09000A00,2,0=0x5102A780,3,0,0x5102A789,1,0
@@ -17609,9 +17609,9 @@
1760917609
0x51050000,3,0,0x49803A00,3,1=0x51050000,3,0,0x7105A700,1,1
1761017610
;Tile 2 End-T
1761117611
0x5105A700,3,0,0x09803C00,1,0=0x5105A700,3,0,0x5105A709,1,0
17612-
0x7105A700,1,1,0x09803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
17612+
0x7105A700,1,1,0x49803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
1761317613
0x51055200,3,0,0x09803C00,1,0=0x5105A700,3,0,0x5105A709,1,0
17614-
0x51055200,1,1,0x09803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
17614+
0x51055200,1,1,0x49803C00,3,1=0x7105A700,1,1,0x7105A709,3,1
1761517615
0x5105A700,3,0,0x09000A00,2,0=0x5105A700,3,0,0x5105A709,1,0
1761617616
0x7105A700,1,1,0x09000A00,1,0=0x7105A700,1,1,0x7105A709,3,1
1761717617
0x51055200,3,0,0x09000A00,2,0=0x5105A700,3,0,0x5105A709,1,0

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6215,18 +6215,18 @@
62156215
;T-Int
62166216
0x51030200,0,0,0x49803A00,0,1=0x51030200,0,0,0x5103B100,3,1
62176217
0x51030200,3,0,0x09803A00,2,0=0x51030200,3,0,0x5103B100,1,0
6218-
0x51030200,0,0,0x09803C00,2,1=0x51030200,0,0,0x5103B109,1,1
6218+
0x51030200,0,0,0x49803C00,2,1=0x51030200,0,0,0x5103B109,1,1
62196219
0x51030200,3,0,0x09803C00,0,0=0x51030200,3,0,0x5103B109,3,0
62206220
;Tile 2 T
6221-
0x51037100,2,1,0x09803C00,3,1=0x5103B100,2,1,0x5103B109,2,1
6221+
0x51037100,2,1,0x49803C00,3,1=0x5103B100,2,1,0x5103B109,2,1
62226222
0x51037100,0,0,0x09803C00,1,0=0x5103B100,0,0,0x5103B109,0,0
62236223
0x51037100,2,1,0x09000A00,1,0=0x5103B100,2,1,0x5103B109,2,1
62246224
0x51037100,0,0,0x09000A00,2,0=0x5103B100,0,0,0x5103B109,0,0
62256225
0x51037100,2,1,0x5103B109,2,1=0x5103B100,2,1,0x5103B109,2,1
62266226
0x51037100,0,0,0x5103B109,0,0=0x5103B100,0,0,0x5103B109,0,0
62276227
0x51037100,2,1,0x5103B109,2,1=0x5103B100,2,1,0x5103B109,2,1
62286228
0x51037100,0,0,0x5103B109,0,0=0x5103B100,0,0,0x5103B109,0,0
6229-
0x5103B100,2,1,0x09803C00,3,1=0x5103B100,2,1,0x5103B109,2,1
6229+
0x5103B100,2,1,0x49803C00,3,1=0x5103B100,2,1,0x5103B109,2,1
62306230
0x5103B100,0,0,0x09803C00,1,0=0x5103B100,0,0,0x5103B109,0,0
62316231
0x5103B100,2,1,0x09000A00,1,0=0x5103B100,2,1,0x5103B109,2,1
62326232
0x5103B100,0,0,0x09000A00,2,0=0x5103B100,0,0,0x5103B109,0,0
@@ -6309,9 +6309,9 @@
63096309
;0x5103B100,2,1,0x7100A709,3,1=0x5103BA00,2,1,0x5103BA09,2,1
63106310
;
63116311
;0x5103BA00,0,0,0x09803C00,1,0=0x5103BA00,0,0,0x5103BA09,0,0
6312-
;0x5103BA00,2,1,0x09803C00,3,1=0x5103BA00,2,1,0x5103BA09,2,1
6312+
;0x5103BA00,2,1,0x49803C00,3,1=0x5103BA00,2,1,0x5103BA09,2,1
63136313
;0x51006300,3,0,0x09803C00,1,0=0x5103BA00,0,0,0x5103BA09,0,0
6314-
;0x51006300,1,1,0x09803C00,3,1=0x5103BA00,2,1,0x5103BA09,2,1
6314+
;0x51006300,1,1,0x49803C00,3,1=0x5103BA00,2,1,0x5103BA09,2,1
63156315
;0x5103BA00,0,0,0x09000A00,2,0=0x5103BA00,0,0,0x5103BA09,0,0
63166316
;0x5103BA00,2,1,0x09000A00,1,0=0x5103BA00,2,1,0x5103BA09,2,1
63176317
;0x5103BA00,0,0,0x51030200,2,0=0x5103BA00,0,0,0x5103BA09,0,0
@@ -6352,9 +6352,9 @@
63526352
;0x5103B100,2,1,0x5101A709,3,1=0x5103BB00,2,1,0x5103BB09,2,1
63536353
;
63546354
;0x5103BB00,0,0,0x09803C00,1,0=0x5103BB00,0,0,0x5103BB09,0,0
6355-
;0x5103BB00,2,1,0x09803C00,3,1=0x5103BB00,2,1,0x5103BB09,2,1
6355+
;0x5103BB00,2,1,0x49803C00,3,1=0x5103BB00,2,1,0x5103BB09,2,1
63566356
;0x51016300,3,0,0x09803C00,1,0=0x5103BB00,0,0,0x5103BB09,0,0
6357-
;0x51016300,1,1,0x09803C00,3,1=0x5103BB00,2,1,0x5103BB09,2,1
6357+
;0x51016300,1,1,0x49803C00,3,1=0x5103BB00,2,1,0x5103BB09,2,1
63586358
;0x5103BB00,0,0,0x09000A00,2,0=0x5103BB00,0,0,0x5103BB09,0,0
63596359
;0x5103BB00,2,1,0x09000A00,1,0=0x5103BB00,2,1,0x5103BB09,2,1
63606360
;0x5103BB00,0,0,0x51030200,2,0=0x5103BB00,0,0,0x5103BB09,0,0
@@ -7383,18 +7383,18 @@
73837383
;T-Int
73847384
0x51040200,0,0,0x49803A00,0,1=0x51040200,0,0,0x5104B100,3,1
73857385
0x51040200,3,0,0x09803A00,2,0=0x51040200,3,0,0x5104B100,1,0
7386-
0x51040200,0,0,0x09803C00,2,1=0x51040200,0,0,0x5104B109,1,1
7386+
0x51040200,0,0,0x49803C00,2,1=0x51040200,0,0,0x5104B109,1,1
73877387
0x51040200,3,0,0x09803C00,0,0=0x51040200,3,0,0x5104B109,3,0
73887388
;Tile 2 T
7389-
0x51047100,2,1,0x09803C00,3,1=0x5104B100,2,1,0x5104B109,2,1
7389+
0x51047100,2,1,0x49803C00,3,1=0x5104B100,2,1,0x5104B109,2,1
73907390
0x51047100,0,0,0x09803C00,1,0=0x5104B100,0,0,0x5104B109,0,0
73917391
0x51047100,2,1,0x09000A00,1,0=0x5104B100,2,1,0x5104B109,2,1
73927392
0x51047100,0,0,0x09000A00,2,0=0x5104B100,0,0,0x5104B109,0,0
73937393
0x51047100,2,1,0x5104B109,2,1=0x5104B100,2,1,0x5104B109,2,1
73947394
0x51047100,0,0,0x5104B109,0,0=0x5104B100,0,0,0x5104B109,0,0
73957395
0x51047100,2,1,0x5104B109,2,1=0x5104B100,2,1,0x5104B109,2,1
73967396
0x51047100,0,0,0x5104B109,0,0=0x5104B100,0,0,0x5104B109,0,0
7397-
0x5104B100,2,1,0x09803C00,3,1=0x5104B100,2,1,0x5104B109,2,1
7397+
0x5104B100,2,1,0x49803C00,3,1=0x5104B100,2,1,0x5104B109,2,1
73987398
0x5104B100,0,0,0x09803C00,1,0=0x5104B100,0,0,0x5104B109,0,0
73997399
0x5104B100,2,1,0x09000A00,1,0=0x5104B100,2,1,0x5104B109,2,1
74007400
0x5104B100,0,0,0x09000A00,2,0=0x5104B100,0,0,0x5104B109,0,0
@@ -7509,9 +7509,9 @@
75097509
;0x5104B100,2,1,0x7100A709,3,1=0x7104BA00,2,1,0x7104BA09,2,1
75107510
;
75117511
;0x5104BA00,0,0,0x09803C00,1,0=0x5104BA00,0,0,0x5104BA09,0,0
7512-
;0x7104BA00,2,1,0x09803C00,3,1=0x7104BA00,2,1,0x7104BA09,2,1
7512+
;0x7104BA00,2,1,0x49803C00,3,1=0x7104BA00,2,1,0x7104BA09,2,1
75137513
;0x51006400,3,0,0x09803C00,1,0=0x5104BA00,0,0,0x5104BA09,0,0
7514-
;0x51006400,1,1,0x09803C00,3,1=0x7104BA00,2,1,0x7104BA09,2,1
7514+
;0x51006400,1,1,0x49803C00,3,1=0x7104BA00,2,1,0x7104BA09,2,1
75157515
;0x5104BA00,0,0,0x09000A00,2,0=0x5104BA00,0,0,0x5104BA09,0,0
75167516
;0x7104BA00,2,1,0x09000A00,1,0=0x7104BA00,2,1,0x7104BA09,2,1
75177517
;0x5104BA00,0,0,0x51040200,2,0=0x5104BA00,0,0,0x5104BA09,0,0
@@ -7552,9 +7552,9 @@
75527552
;0x5104B100,2,1,0x5101A709,3,1=0x5104BB00,2,1,0x5104BB09,2,1
75537553
;
75547554
;0x5104BB00,0,0,0x09803C00,1,0=0x5104BB00,0,0,0x5104BB09,0,0
7555-
;0x5104BB00,2,1,0x09803C00,3,1=0x5104BB00,2,1,0x5104BB09,2,1
7555+
;0x5104BB00,2,1,0x49803C00,3,1=0x5104BB00,2,1,0x5104BB09,2,1
75567556
;0x51016400,3,0,0x09803C00,1,0=0x5104BB00,0,0,0x5104BB09,0,0
7557-
;0x51016400,1,1,0x09803C00,3,1=0x5104BB00,2,1,0x5104BB09,2,1
7557+
;0x51016400,1,1,0x49803C00,3,1=0x5104BB00,2,1,0x5104BB09,2,1
75587558
;0x5104BB00,0,0,0x09000A00,2,0=0x5104BB00,0,0,0x5104BB09,0,0
75597559
;0x5104BB00,2,1,0x09000A00,1,0=0x5104BB00,2,1,0x5104BB09,2,1
75607560
;0x5104BB00,0,0,0x51040200,2,0=0x5104BB00,0,0,0x5104BB09,0,0
@@ -7607,9 +7607,9 @@
76077607
0x5104B180,2,1,0x5102A789,3,1=0x5104BC80,2,1,0x5104BC89,2,1
76087608
;
76097609
;0x5104BC00,0,0,0x09803C00,1,0=0x5104BC00,0,0,0x5104BC09,0,0
7610-
;0x5104BC00,2,1,0x09803C00,3,1=0x5104BC00,2,1,0x5104BC09,2,1
7610+
;0x5104BC00,2,1,0x49803C00,3,1=0x5104BC00,2,1,0x5104BC09,2,1
76117611
;0x51026400,3,0,0x09803C00,1,0=0x5104BC00,0,0,0x5104BC09,0,0
7612-
;0x51026400,1,1,0x09803C00,3,1=0x5104BC00,2,1,0x5104BC09,2,1
7612+
;0x51026400,1,1,0x49803C00,3,1=0x5104BC00,2,1,0x5104BC09,2,1
76137613
;0x5104BC00,0,0,0x09000A00,2,0=0x5104BC00,0,0,0x5104BC09,0,0
76147614
;0x5104BC00,2,1,0x09000A00,1,0=0x5104BC00,2,1,0x5104BC09,2,1
76157615
;0x5104BC00,0,0,0x51040200,2,0=0x5104BC00,0,0,0x5104BC09,0,0
@@ -7620,9 +7620,9 @@
76207620
;0x51026400,1,1,0x51040200,1,0=0x5104BC00,2,1,0x5104BC09,2,1
76217621
;
76227622
;0x5104BC80,0,0,0x09803C00,1,0=0x5104BC80,0,0,0x5104BC89,0,0
7623-
;0x5104BC80,2,1,0x09803C00,3,1=0x5104BC80,2,1,0x5104BC89,2,1
7623+
;0x5104BC80,2,1,0x49803C00,3,1=0x5104BC80,2,1,0x5104BC89,2,1
76247624
;0x51026480,3,0,0x09803C00,1,0=0x5104BC80,0,0,0x5104BC89,0,0
7625-
;0x51026480,1,1,0x09803C00,3,1=0x5104BC80,2,1,0x5104BC89,2,1
7625+
;0x51026480,1,1,0x49803C00,3,1=0x5104BC80,2,1,0x5104BC89,2,1
76267626
;0x5104BC80,0,0,0x09000A00,2,0=0x5104BC80,0,0,0x5104BC89,0,0
76277627
;0x5104BC80,2,1,0x09000A00,1,0=0x5104BC80,2,1,0x5104BC89,2,1
76287628
;0x5104BC80,0,0,0x51040200,2,0=0x5104BC80,0,0,0x5104BC89,0,0
@@ -7768,9 +7768,9 @@
77687768
;0x5104B100,2,1,0x7105A709,3,1=0x5104BF00,2,1,0x7104BF09,2,1
77697769
;
77707770
;0x5104BF00,0,0,0x09803C00,1,0=0x5104BF00,0,0,0x5104BF09,0,0
7771-
;0x7104BF00,2,1,0x09803C00,3,1=0x7104BF00,2,1,0x7104BF09,2,1
7771+
;0x7104BF00,2,1,0x49803C00,3,1=0x7104BF00,2,1,0x7104BF09,2,1
77727772
;0x51056400,3,0,0x09803C00,1,0=0x5104BF00,0,0,0x5104BF09,0,0
7773-
;0x51056400,1,1,0x09803C00,3,1=0x7104BF00,2,1,0x7104BF09,2,1
7773+
;0x51056400,1,1,0x49803C00,3,1=0x7104BF00,2,1,0x7104BF09,2,1
77747774
;0x5104BF00,0,0,0x09000A00,2,0=0x5104BF00,0,0,0x5104BF09,0,0
77757775
;0x7104BF00,2,1,0x09000A00,1,0=0x7104BF00,2,1,0x7104BF09,2,1
77767776
;0x5104BF00,0,0,0x51040200,2,0=0x5104BF00,0,0,0x5104BF09,0,0

0 commit comments

Comments
 (0)