Skip to content

Commit 93ef9f0

Browse files
clarencechenmemo33
clarencechen
authored and
memo33
committed
Fix override continuation rules for Sam-thru T ints
1 parent e2ae693 commit 93ef9f0

2 files changed

Lines changed: 82 additions & 82 deletions

File tree

‎Controller/RUL2/09_SAM/Sec9_SAM_MetaGenerated.txt‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,10 +1983,10 @@
19831983
0x5E584200,0,0,0x5E572200,0,1=0x5E585200,0,0,0x5E585280,0,0
19841984
0x5E584200,0,0,0x5E572200,1,0=0x5E585200,0,0,0x5E585280,0,0
19851985
0x5E584200,0,0,0x5E585280,0,0=0x5E585200,0,0,0x5E585280,0,0
1986-
0x5E585200,3,0,0x5F500200,0,0=0x5E585200,3,0,0x5E572200,0,0
1987-
0x5E585200,3,0,0x5F500200,1,1=0x5E585200,3,0,0x5E572200,1,1
1988-
0x5E585280,1,0,0x5F500200,0,0=0x5E585280,1,0,0x5E572200,0,0
1989-
0x5E585280,1,0,0x5F500200,1,1=0x5E585280,1,0,0x5E572200,1,1
1986+
0x5E585200,1,0,0x5F500200,2,0=0x5E585200,1,0,0x5E572200,2,0
1987+
0x5E585200,1,0,0x5F500200,3,1=0x5E585200,1,0,0x5E572200,3,1
1988+
0x5E585280,3,0,0x5F500200,2,0=0x5E585280,3,0,0x5E572200,2,0
1989+
0x5E585280,3,0,0x5F500200,3,1=0x5E585280,3,0,0x5E572200,3,1
19901990
0x5E54B200,1,0,0x09AA0400,3,0=0x5E54B200,1,0,0x5E55A200,3,0
19911991
0x5E54B200,3,0,0x09AA0400,3,0=0x5E54B200,3,0,0x5E55A200,3,0
19921992
0x5E54B200,3,0,0x09AA0400,1,0=0x5E54B200,3,0,0x5E55A200,1,0
@@ -2021,10 +2021,10 @@
20212021
0x5E58E200,0,0,0x5E572200,0,1=0x5E58F200,0,0,0x5E58F280,0,0
20222022
0x5E58E200,0,0,0x5E572200,1,0=0x5E58F200,0,0,0x5E58F280,0,0
20232023
0x5E58E200,0,0,0x5E58F280,0,0=0x5E58F200,0,0,0x5E58F280,0,0
2024-
0x5E58F200,3,0,0x5F500200,0,0=0x5E58F200,3,0,0x5E572200,0,0
2025-
0x5E58F200,3,0,0x5F500200,1,1=0x5E58F200,3,0,0x5E572200,1,1
2026-
0x5E58F280,1,0,0x5F500200,0,0=0x5E58F280,1,0,0x5E572200,0,0
2027-
0x5E58F280,1,0,0x5F500200,1,1=0x5E58F280,1,0,0x5E572200,1,1
2024+
0x5E58F200,1,0,0x5F500200,2,0=0x5E58F200,1,0,0x5E572200,2,0
2025+
0x5E58F200,1,0,0x5F500200,3,1=0x5E58F200,1,0,0x5E572200,3,1
2026+
0x5E58F280,3,0,0x5F500200,2,0=0x5E58F280,3,0,0x5E572200,2,0
2027+
0x5E58F280,3,0,0x5F500200,3,1=0x5E58F280,3,0,0x5E572200,3,1
20282028
0x5E54B200,1,0,0x51004000,3,0=0x5E54B200,1,0,0x5E660200,3,0
20292029
0x5E54B200,3,0,0x51004000,3,0=0x5E54B200,3,0,0x5E660200,3,0
20302030
0x5E54B200,3,0,0x51004000,1,0=0x5E54B200,3,0,0x5E660200,1,0
@@ -3441,10 +3441,10 @@
34413441
0x5E584300,0,0,0x5E572300,0,1=0x5E585300,0,0,0x5E585380,0,0
34423442
0x5E584300,0,0,0x5E572300,1,0=0x5E585300,0,0,0x5E585380,0,0
34433443
0x5E584300,0,0,0x5E585380,0,0=0x5E585300,0,0,0x5E585380,0,0
3444-
0x5E585300,3,0,0x5F500200,0,0=0x5E585300,3,0,0x5E572300,0,0
3445-
0x5E585300,3,0,0x5F500200,1,1=0x5E585300,3,0,0x5E572300,1,1
3446-
0x5E585380,1,0,0x5F500200,0,0=0x5E585380,1,0,0x5E572300,0,0
3447-
0x5E585380,1,0,0x5F500200,1,1=0x5E585380,1,0,0x5E572300,1,1
3444+
0x5E585300,1,0,0x5F500200,2,0=0x5E585300,1,0,0x5E572300,2,0
3445+
0x5E585300,1,0,0x5F500200,3,1=0x5E585300,1,0,0x5E572300,3,1
3446+
0x5E585380,3,0,0x5F500200,2,0=0x5E585380,3,0,0x5E572300,2,0
3447+
0x5E585380,3,0,0x5F500200,3,1=0x5E585380,3,0,0x5E572300,3,1
34483448
0x5E54B300,1,0,0x09AA0400,3,0=0x5E54B300,1,0,0x5E55A300,3,0
34493449
0x5E54B300,3,0,0x09AA0400,3,0=0x5E54B300,3,0,0x5E55A300,3,0
34503450
0x5E54B300,3,0,0x09AA0400,1,0=0x5E54B300,3,0,0x5E55A300,1,0
@@ -3479,10 +3479,10 @@
34793479
0x5E58E300,0,0,0x5E572300,0,1=0x5E58F300,0,0,0x5E58F380,0,0
34803480
0x5E58E300,0,0,0x5E572300,1,0=0x5E58F300,0,0,0x5E58F380,0,0
34813481
0x5E58E300,0,0,0x5E58F380,0,0=0x5E58F300,0,0,0x5E58F380,0,0
3482-
0x5E58F300,3,0,0x5F500200,0,0=0x5E58F300,3,0,0x5E572300,0,0
3483-
0x5E58F300,3,0,0x5F500200,1,1=0x5E58F300,3,0,0x5E572300,1,1
3484-
0x5E58F380,1,0,0x5F500200,0,0=0x5E58F380,1,0,0x5E572300,0,0
3485-
0x5E58F380,1,0,0x5F500200,1,1=0x5E58F380,1,0,0x5E572300,1,1
3482+
0x5E58F300,1,0,0x5F500200,2,0=0x5E58F300,1,0,0x5E572300,2,0
3483+
0x5E58F300,1,0,0x5F500200,3,1=0x5E58F300,1,0,0x5E572300,3,1
3484+
0x5E58F380,3,0,0x5F500200,2,0=0x5E58F380,3,0,0x5E572300,2,0
3485+
0x5E58F380,3,0,0x5F500200,3,1=0x5E58F380,3,0,0x5E572300,3,1
34863486
0x5E54B300,1,0,0x51004000,3,0=0x5E54B300,1,0,0x5E660300,3,0
34873487
0x5E54B300,3,0,0x51004000,3,0=0x5E54B300,3,0,0x5E660300,3,0
34883488
0x5E54B300,3,0,0x51004000,1,0=0x5E54B300,3,0,0x5E660300,1,0
@@ -4899,10 +4899,10 @@
48994899
0x5E584400,0,0,0x5E572400,0,1=0x5E585400,0,0,0x5E585480,0,0
49004900
0x5E584400,0,0,0x5E572400,1,0=0x5E585400,0,0,0x5E585480,0,0
49014901
0x5E584400,0,0,0x5E585480,0,0=0x5E585400,0,0,0x5E585480,0,0
4902-
0x5E585400,3,0,0x5F500200,0,0=0x5E585400,3,0,0x5E572400,0,0
4903-
0x5E585400,3,0,0x5F500200,1,1=0x5E585400,3,0,0x5E572400,1,1
4904-
0x5E585480,1,0,0x5F500200,0,0=0x5E585480,1,0,0x5E572400,0,0
4905-
0x5E585480,1,0,0x5F500200,1,1=0x5E585480,1,0,0x5E572400,1,1
4902+
0x5E585400,1,0,0x5F500200,2,0=0x5E585400,1,0,0x5E572400,2,0
4903+
0x5E585400,1,0,0x5F500200,3,1=0x5E585400,1,0,0x5E572400,3,1
4904+
0x5E585480,3,0,0x5F500200,2,0=0x5E585480,3,0,0x5E572400,2,0
4905+
0x5E585480,3,0,0x5F500200,3,1=0x5E585480,3,0,0x5E572400,3,1
49064906
0x5E54B400,1,0,0x09AA0400,3,0=0x5E54B400,1,0,0x5E55A400,3,0
49074907
0x5E54B400,3,0,0x09AA0400,3,0=0x5E54B400,3,0,0x5E55A400,3,0
49084908
0x5E54B400,3,0,0x09AA0400,1,0=0x5E54B400,3,0,0x5E55A400,1,0
@@ -4937,10 +4937,10 @@
49374937
0x5E58E400,0,0,0x5E572400,0,1=0x5E58F400,0,0,0x5E58F480,0,0
49384938
0x5E58E400,0,0,0x5E572400,1,0=0x5E58F400,0,0,0x5E58F480,0,0
49394939
0x5E58E400,0,0,0x5E58F480,0,0=0x5E58F400,0,0,0x5E58F480,0,0
4940-
0x5E58F400,3,0,0x5F500200,0,0=0x5E58F400,3,0,0x5E572400,0,0
4941-
0x5E58F400,3,0,0x5F500200,1,1=0x5E58F400,3,0,0x5E572400,1,1
4942-
0x5E58F480,1,0,0x5F500200,0,0=0x5E58F480,1,0,0x5E572400,0,0
4943-
0x5E58F480,1,0,0x5F500200,1,1=0x5E58F480,1,0,0x5E572400,1,1
4940+
0x5E58F400,1,0,0x5F500200,2,0=0x5E58F400,1,0,0x5E572400,2,0
4941+
0x5E58F400,1,0,0x5F500200,3,1=0x5E58F400,1,0,0x5E572400,3,1
4942+
0x5E58F480,3,0,0x5F500200,2,0=0x5E58F480,3,0,0x5E572400,2,0
4943+
0x5E58F480,3,0,0x5F500200,3,1=0x5E58F480,3,0,0x5E572400,3,1
49444944
0x5E54B400,1,0,0x51004000,3,0=0x5E54B400,1,0,0x5E660400,3,0
49454945
0x5E54B400,3,0,0x51004000,3,0=0x5E54B400,3,0,0x5E660400,3,0
49464946
0x5E54B400,3,0,0x51004000,1,0=0x5E54B400,3,0,0x5E660400,1,0
@@ -6357,10 +6357,10 @@
63576357
0x5E584500,0,0,0x5E572500,0,1=0x5E585500,0,0,0x5E585580,0,0
63586358
0x5E584500,0,0,0x5E572500,1,0=0x5E585500,0,0,0x5E585580,0,0
63596359
0x5E584500,0,0,0x5E585580,0,0=0x5E585500,0,0,0x5E585580,0,0
6360-
0x5E585500,3,0,0x5F500200,0,0=0x5E585500,3,0,0x5E572500,0,0
6361-
0x5E585500,3,0,0x5F500200,1,1=0x5E585500,3,0,0x5E572500,1,1
6362-
0x5E585580,1,0,0x5F500200,0,0=0x5E585580,1,0,0x5E572500,0,0
6363-
0x5E585580,1,0,0x5F500200,1,1=0x5E585580,1,0,0x5E572500,1,1
6360+
0x5E585500,1,0,0x5F500200,2,0=0x5E585500,1,0,0x5E572500,2,0
6361+
0x5E585500,1,0,0x5F500200,3,1=0x5E585500,1,0,0x5E572500,3,1
6362+
0x5E585580,3,0,0x5F500200,2,0=0x5E585580,3,0,0x5E572500,2,0
6363+
0x5E585580,3,0,0x5F500200,3,1=0x5E585580,3,0,0x5E572500,3,1
63646364
0x5E54B500,1,0,0x09AA0400,3,0=0x5E54B500,1,0,0x5E55A500,3,0
63656365
0x5E54B500,3,0,0x09AA0400,3,0=0x5E54B500,3,0,0x5E55A500,3,0
63666366
0x5E54B500,3,0,0x09AA0400,1,0=0x5E54B500,3,0,0x5E55A500,1,0
@@ -6395,10 +6395,10 @@
63956395
0x5E58E500,0,0,0x5E572500,0,1=0x5E58F500,0,0,0x5E58F580,0,0
63966396
0x5E58E500,0,0,0x5E572500,1,0=0x5E58F500,0,0,0x5E58F580,0,0
63976397
0x5E58E500,0,0,0x5E58F580,0,0=0x5E58F500,0,0,0x5E58F580,0,0
6398-
0x5E58F500,3,0,0x5F500200,0,0=0x5E58F500,3,0,0x5E572500,0,0
6399-
0x5E58F500,3,0,0x5F500200,1,1=0x5E58F500,3,0,0x5E572500,1,1
6400-
0x5E58F580,1,0,0x5F500200,0,0=0x5E58F580,1,0,0x5E572500,0,0
6401-
0x5E58F580,1,0,0x5F500200,1,1=0x5E58F580,1,0,0x5E572500,1,1
6398+
0x5E58F500,1,0,0x5F500200,2,0=0x5E58F500,1,0,0x5E572500,2,0
6399+
0x5E58F500,1,0,0x5F500200,3,1=0x5E58F500,1,0,0x5E572500,3,1
6400+
0x5E58F580,3,0,0x5F500200,2,0=0x5E58F580,3,0,0x5E572500,2,0
6401+
0x5E58F580,3,0,0x5F500200,3,1=0x5E58F580,3,0,0x5E572500,3,1
64026402
0x5E54B500,1,0,0x51004000,3,0=0x5E54B500,1,0,0x5E660500,3,0
64036403
0x5E54B500,3,0,0x51004000,3,0=0x5E54B500,3,0,0x5E660500,3,0
64046404
0x5E54B500,3,0,0x51004000,1,0=0x5E54B500,3,0,0x5E660500,1,0
@@ -7815,10 +7815,10 @@
78157815
0x5E584600,0,0,0x5E572600,0,1=0x5E585600,0,0,0x5E585680,0,0
78167816
0x5E584600,0,0,0x5E572600,1,0=0x5E585600,0,0,0x5E585680,0,0
78177817
0x5E584600,0,0,0x5E585680,0,0=0x5E585600,0,0,0x5E585680,0,0
7818-
0x5E585600,3,0,0x5F500200,0,0=0x5E585600,3,0,0x5E572600,0,0
7819-
0x5E585600,3,0,0x5F500200,1,1=0x5E585600,3,0,0x5E572600,1,1
7820-
0x5E585680,1,0,0x5F500200,0,0=0x5E585680,1,0,0x5E572600,0,0
7821-
0x5E585680,1,0,0x5F500200,1,1=0x5E585680,1,0,0x5E572600,1,1
7818+
0x5E585600,1,0,0x5F500200,2,0=0x5E585600,1,0,0x5E572600,2,0
7819+
0x5E585600,1,0,0x5F500200,3,1=0x5E585600,1,0,0x5E572600,3,1
7820+
0x5E585680,3,0,0x5F500200,2,0=0x5E585680,3,0,0x5E572600,2,0
7821+
0x5E585680,3,0,0x5F500200,3,1=0x5E585680,3,0,0x5E572600,3,1
78227822
0x5E54B600,1,0,0x09AA0400,3,0=0x5E54B600,1,0,0x5E55A600,3,0
78237823
0x5E54B600,3,0,0x09AA0400,3,0=0x5E54B600,3,0,0x5E55A600,3,0
78247824
0x5E54B600,3,0,0x09AA0400,1,0=0x5E54B600,3,0,0x5E55A600,1,0
@@ -7853,10 +7853,10 @@
78537853
0x5E58E600,0,0,0x5E572600,0,1=0x5E58F600,0,0,0x5E58F680,0,0
78547854
0x5E58E600,0,0,0x5E572600,1,0=0x5E58F600,0,0,0x5E58F680,0,0
78557855
0x5E58E600,0,0,0x5E58F680,0,0=0x5E58F600,0,0,0x5E58F680,0,0
7856-
0x5E58F600,3,0,0x5F500200,0,0=0x5E58F600,3,0,0x5E572600,0,0
7857-
0x5E58F600,3,0,0x5F500200,1,1=0x5E58F600,3,0,0x5E572600,1,1
7858-
0x5E58F680,1,0,0x5F500200,0,0=0x5E58F680,1,0,0x5E572600,0,0
7859-
0x5E58F680,1,0,0x5F500200,1,1=0x5E58F680,1,0,0x5E572600,1,1
7856+
0x5E58F600,1,0,0x5F500200,2,0=0x5E58F600,1,0,0x5E572600,2,0
7857+
0x5E58F600,1,0,0x5F500200,3,1=0x5E58F600,1,0,0x5E572600,3,1
7858+
0x5E58F680,3,0,0x5F500200,2,0=0x5E58F680,3,0,0x5E572600,2,0
7859+
0x5E58F680,3,0,0x5F500200,3,1=0x5E58F680,3,0,0x5E572600,3,1
78607860
0x5E54B600,1,0,0x51004000,3,0=0x5E54B600,1,0,0x5E660600,3,0
78617861
0x5E54B600,3,0,0x51004000,3,0=0x5E54B600,3,0,0x5E660600,3,0
78627862
0x5E54B600,3,0,0x51004000,1,0=0x5E54B600,3,0,0x5E660600,1,0
@@ -9273,10 +9273,10 @@
92739273
0x5E584700,0,0,0x5E572700,0,1=0x5E585700,0,0,0x5E585780,0,0
92749274
0x5E584700,0,0,0x5E572700,1,0=0x5E585700,0,0,0x5E585780,0,0
92759275
0x5E584700,0,0,0x5E585780,0,0=0x5E585700,0,0,0x5E585780,0,0
9276-
0x5E585700,3,0,0x5F500200,0,0=0x5E585700,3,0,0x5E572700,0,0
9277-
0x5E585700,3,0,0x5F500200,1,1=0x5E585700,3,0,0x5E572700,1,1
9278-
0x5E585780,1,0,0x5F500200,0,0=0x5E585780,1,0,0x5E572700,0,0
9279-
0x5E585780,1,0,0x5F500200,1,1=0x5E585780,1,0,0x5E572700,1,1
9276+
0x5E585700,1,0,0x5F500200,2,0=0x5E585700,1,0,0x5E572700,2,0
9277+
0x5E585700,1,0,0x5F500200,3,1=0x5E585700,1,0,0x5E572700,3,1
9278+
0x5E585780,3,0,0x5F500200,2,0=0x5E585780,3,0,0x5E572700,2,0
9279+
0x5E585780,3,0,0x5F500200,3,1=0x5E585780,3,0,0x5E572700,3,1
92809280
0x5E54B700,1,0,0x09AA0400,3,0=0x5E54B700,1,0,0x5E55A700,3,0
92819281
0x5E54B700,3,0,0x09AA0400,3,0=0x5E54B700,3,0,0x5E55A700,3,0
92829282
0x5E54B700,3,0,0x09AA0400,1,0=0x5E54B700,3,0,0x5E55A700,1,0
@@ -9311,10 +9311,10 @@
93119311
0x5E58E700,0,0,0x5E572700,0,1=0x5E58F700,0,0,0x5E58F780,0,0
93129312
0x5E58E700,0,0,0x5E572700,1,0=0x5E58F700,0,0,0x5E58F780,0,0
93139313
0x5E58E700,0,0,0x5E58F780,0,0=0x5E58F700,0,0,0x5E58F780,0,0
9314-
0x5E58F700,3,0,0x5F500200,0,0=0x5E58F700,3,0,0x5E572700,0,0
9315-
0x5E58F700,3,0,0x5F500200,1,1=0x5E58F700,3,0,0x5E572700,1,1
9316-
0x5E58F780,1,0,0x5F500200,0,0=0x5E58F780,1,0,0x5E572700,0,0
9317-
0x5E58F780,1,0,0x5F500200,1,1=0x5E58F780,1,0,0x5E572700,1,1
9314+
0x5E58F700,1,0,0x5F500200,2,0=0x5E58F700,1,0,0x5E572700,2,0
9315+
0x5E58F700,1,0,0x5F500200,3,1=0x5E58F700,1,0,0x5E572700,3,1
9316+
0x5E58F780,3,0,0x5F500200,2,0=0x5E58F780,3,0,0x5E572700,2,0
9317+
0x5E58F780,3,0,0x5F500200,3,1=0x5E58F780,3,0,0x5E572700,3,1
93189318
0x5E54B700,1,0,0x51004000,3,0=0x5E54B700,1,0,0x5E660700,3,0
93199319
0x5E54B700,3,0,0x51004000,3,0=0x5E54B700,3,0,0x5E660700,3,0
93209320
0x5E54B700,3,0,0x51004000,1,0=0x5E54B700,3,0,0x5E660700,1,0
@@ -10731,10 +10731,10 @@
1073110731
0x5E584800,0,0,0x5E572800,0,1=0x5E585800,0,0,0x5E585880,0,0
1073210732
0x5E584800,0,0,0x5E572800,1,0=0x5E585800,0,0,0x5E585880,0,0
1073310733
0x5E584800,0,0,0x5E585880,0,0=0x5E585800,0,0,0x5E585880,0,0
10734-
0x5E585800,3,0,0x5F500200,0,0=0x5E585800,3,0,0x5E572800,0,0
10735-
0x5E585800,3,0,0x5F500200,1,1=0x5E585800,3,0,0x5E572800,1,1
10736-
0x5E585880,1,0,0x5F500200,0,0=0x5E585880,1,0,0x5E572800,0,0
10737-
0x5E585880,1,0,0x5F500200,1,1=0x5E585880,1,0,0x5E572800,1,1
10734+
0x5E585800,1,0,0x5F500200,2,0=0x5E585800,1,0,0x5E572800,2,0
10735+
0x5E585800,1,0,0x5F500200,3,1=0x5E585800,1,0,0x5E572800,3,1
10736+
0x5E585880,3,0,0x5F500200,2,0=0x5E585880,3,0,0x5E572800,2,0
10737+
0x5E585880,3,0,0x5F500200,3,1=0x5E585880,3,0,0x5E572800,3,1
1073810738
0x5E54B800,1,0,0x09AA0400,3,0=0x5E54B800,1,0,0x5E55A800,3,0
1073910739
0x5E54B800,3,0,0x09AA0400,3,0=0x5E54B800,3,0,0x5E55A800,3,0
1074010740
0x5E54B800,3,0,0x09AA0400,1,0=0x5E54B800,3,0,0x5E55A800,1,0
@@ -10769,10 +10769,10 @@
1076910769
0x5E58E800,0,0,0x5E572800,0,1=0x5E58F800,0,0,0x5E58F880,0,0
1077010770
0x5E58E800,0,0,0x5E572800,1,0=0x5E58F800,0,0,0x5E58F880,0,0
1077110771
0x5E58E800,0,0,0x5E58F880,0,0=0x5E58F800,0,0,0x5E58F880,0,0
10772-
0x5E58F800,3,0,0x5F500200,0,0=0x5E58F800,3,0,0x5E572800,0,0
10773-
0x5E58F800,3,0,0x5F500200,1,1=0x5E58F800,3,0,0x5E572800,1,1
10774-
0x5E58F880,1,0,0x5F500200,0,0=0x5E58F880,1,0,0x5E572800,0,0
10775-
0x5E58F880,1,0,0x5F500200,1,1=0x5E58F880,1,0,0x5E572800,1,1
10772+
0x5E58F800,1,0,0x5F500200,2,0=0x5E58F800,1,0,0x5E572800,2,0
10773+
0x5E58F800,1,0,0x5F500200,3,1=0x5E58F800,1,0,0x5E572800,3,1
10774+
0x5E58F880,3,0,0x5F500200,2,0=0x5E58F880,3,0,0x5E572800,2,0
10775+
0x5E58F880,3,0,0x5F500200,3,1=0x5E58F880,3,0,0x5E572800,3,1
1077610776
0x5E54B800,1,0,0x51004000,3,0=0x5E54B800,1,0,0x5E660800,3,0
1077710777
0x5E54B800,3,0,0x51004000,3,0=0x5E54B800,3,0,0x5E660800,3,0
1077810778
0x5E54B800,3,0,0x51004000,1,0=0x5E54B800,3,0,0x5E660800,1,0
@@ -12189,10 +12189,10 @@
1218912189
0x5E584900,0,0,0x5E572900,0,1=0x5E585900,0,0,0x5E585980,0,0
1219012190
0x5E584900,0,0,0x5E572900,1,0=0x5E585900,0,0,0x5E585980,0,0
1219112191
0x5E584900,0,0,0x5E585980,0,0=0x5E585900,0,0,0x5E585980,0,0
12192-
0x5E585900,3,0,0x5F500200,0,0=0x5E585900,3,0,0x5E572900,0,0
12193-
0x5E585900,3,0,0x5F500200,1,1=0x5E585900,3,0,0x5E572900,1,1
12194-
0x5E585980,1,0,0x5F500200,0,0=0x5E585980,1,0,0x5E572900,0,0
12195-
0x5E585980,1,0,0x5F500200,1,1=0x5E585980,1,0,0x5E572900,1,1
12192+
0x5E585900,1,0,0x5F500200,2,0=0x5E585900,1,0,0x5E572900,2,0
12193+
0x5E585900,1,0,0x5F500200,3,1=0x5E585900,1,0,0x5E572900,3,1
12194+
0x5E585980,3,0,0x5F500200,2,0=0x5E585980,3,0,0x5E572900,2,0
12195+
0x5E585980,3,0,0x5F500200,3,1=0x5E585980,3,0,0x5E572900,3,1
1219612196
0x5E54B900,1,0,0x09AA0400,3,0=0x5E54B900,1,0,0x5E55A900,3,0
1219712197
0x5E54B900,3,0,0x09AA0400,3,0=0x5E54B900,3,0,0x5E55A900,3,0
1219812198
0x5E54B900,3,0,0x09AA0400,1,0=0x5E54B900,3,0,0x5E55A900,1,0
@@ -12227,10 +12227,10 @@
1222712227
0x5E58E900,0,0,0x5E572900,0,1=0x5E58F900,0,0,0x5E58F980,0,0
1222812228
0x5E58E900,0,0,0x5E572900,1,0=0x5E58F900,0,0,0x5E58F980,0,0
1222912229
0x5E58E900,0,0,0x5E58F980,0,0=0x5E58F900,0,0,0x5E58F980,0,0
12230-
0x5E58F900,3,0,0x5F500200,0,0=0x5E58F900,3,0,0x5E572900,0,0
12231-
0x5E58F900,3,0,0x5F500200,1,1=0x5E58F900,3,0,0x5E572900,1,1
12232-
0x5E58F980,1,0,0x5F500200,0,0=0x5E58F980,1,0,0x5E572900,0,0
12233-
0x5E58F980,1,0,0x5F500200,1,1=0x5E58F980,1,0,0x5E572900,1,1
12230+
0x5E58F900,1,0,0x5F500200,2,0=0x5E58F900,1,0,0x5E572900,2,0
12231+
0x5E58F900,1,0,0x5F500200,3,1=0x5E58F900,1,0,0x5E572900,3,1
12232+
0x5E58F980,3,0,0x5F500200,2,0=0x5E58F980,3,0,0x5E572900,2,0
12233+
0x5E58F980,3,0,0x5F500200,3,1=0x5E58F980,3,0,0x5E572900,3,1
1223412234
0x5E54B900,1,0,0x51004000,3,0=0x5E54B900,1,0,0x5E660900,3,0
1223512235
0x5E54B900,3,0,0x51004000,3,0=0x5E54B900,3,0,0x5E660900,3,0
1223612236
0x5E54B900,3,0,0x51004000,1,0=0x5E54B900,3,0,0x5E660900,1,0
@@ -13647,10 +13647,10 @@
1364713647
0x5E584A00,0,0,0x5E572A00,0,1=0x5E585A00,0,0,0x5E585A80,0,0
1364813648
0x5E584A00,0,0,0x5E572A00,1,0=0x5E585A00,0,0,0x5E585A80,0,0
1364913649
0x5E584A00,0,0,0x5E585A80,0,0=0x5E585A00,0,0,0x5E585A80,0,0
13650-
0x5E585A00,3,0,0x5F500200,0,0=0x5E585A00,3,0,0x5E572A00,0,0
13651-
0x5E585A00,3,0,0x5F500200,1,1=0x5E585A00,3,0,0x5E572A00,1,1
13652-
0x5E585A80,1,0,0x5F500200,0,0=0x5E585A80,1,0,0x5E572A00,0,0
13653-
0x5E585A80,1,0,0x5F500200,1,1=0x5E585A80,1,0,0x5E572A00,1,1
13650+
0x5E585A00,1,0,0x5F500200,2,0=0x5E585A00,1,0,0x5E572A00,2,0
13651+
0x5E585A00,1,0,0x5F500200,3,1=0x5E585A00,1,0,0x5E572A00,3,1
13652+
0x5E585A80,3,0,0x5F500200,2,0=0x5E585A80,3,0,0x5E572A00,2,0
13653+
0x5E585A80,3,0,0x5F500200,3,1=0x5E585A80,3,0,0x5E572A00,3,1
1365413654
0x5E54BA00,1,0,0x09AA0400,3,0=0x5E54BA00,1,0,0x5E55AA00,3,0
1365513655
0x5E54BA00,3,0,0x09AA0400,3,0=0x5E54BA00,3,0,0x5E55AA00,3,0
1365613656
0x5E54BA00,3,0,0x09AA0400,1,0=0x5E54BA00,3,0,0x5E55AA00,1,0
@@ -13685,10 +13685,10 @@
1368513685
0x5E58EA00,0,0,0x5E572A00,0,1=0x5E58FA00,0,0,0x5E58FA80,0,0
1368613686
0x5E58EA00,0,0,0x5E572A00,1,0=0x5E58FA00,0,0,0x5E58FA80,0,0
1368713687
0x5E58EA00,0,0,0x5E58FA80,0,0=0x5E58FA00,0,0,0x5E58FA80,0,0
13688-
0x5E58FA00,3,0,0x5F500200,0,0=0x5E58FA00,3,0,0x5E572A00,0,0
13689-
0x5E58FA00,3,0,0x5F500200,1,1=0x5E58FA00,3,0,0x5E572A00,1,1
13690-
0x5E58FA80,1,0,0x5F500200,0,0=0x5E58FA80,1,0,0x5E572A00,0,0
13691-
0x5E58FA80,1,0,0x5F500200,1,1=0x5E58FA80,1,0,0x5E572A00,1,1
13688+
0x5E58FA00,1,0,0x5F500200,2,0=0x5E58FA00,1,0,0x5E572A00,2,0
13689+
0x5E58FA00,1,0,0x5F500200,3,1=0x5E58FA00,1,0,0x5E572A00,3,1
13690+
0x5E58FA80,3,0,0x5F500200,2,0=0x5E58FA80,3,0,0x5E572A00,2,0
13691+
0x5E58FA80,3,0,0x5F500200,3,1=0x5E58FA80,3,0,0x5E572A00,3,1
1369213692
0x5E54BA00,1,0,0x51004000,3,0=0x5E54BA00,1,0,0x5E660A00,3,0
1369313693
0x5E54BA00,3,0,0x51004000,3,0=0x5E54BA00,3,0,0x5E660A00,3,0
1369413694
0x5E54BA00,3,0,0x51004000,1,0=0x5E54BA00,3,0,0x5E660A00,1,0
@@ -15105,10 +15105,10 @@
1510515105
0x5E584B00,0,0,0x5E572B00,0,1=0x5E585B00,0,0,0x5E585B80,0,0
1510615106
0x5E584B00,0,0,0x5E572B00,1,0=0x5E585B00,0,0,0x5E585B80,0,0
1510715107
0x5E584B00,0,0,0x5E585B80,0,0=0x5E585B00,0,0,0x5E585B80,0,0
15108-
0x5E585B00,3,0,0x5F500200,0,0=0x5E585B00,3,0,0x5E572B00,0,0
15109-
0x5E585B00,3,0,0x5F500200,1,1=0x5E585B00,3,0,0x5E572B00,1,1
15110-
0x5E585B80,1,0,0x5F500200,0,0=0x5E585B80,1,0,0x5E572B00,0,0
15111-
0x5E585B80,1,0,0x5F500200,1,1=0x5E585B80,1,0,0x5E572B00,1,1
15108+
0x5E585B00,1,0,0x5F500200,2,0=0x5E585B00,1,0,0x5E572B00,2,0
15109+
0x5E585B00,1,0,0x5F500200,3,1=0x5E585B00,1,0,0x5E572B00,3,1
15110+
0x5E585B80,3,0,0x5F500200,2,0=0x5E585B80,3,0,0x5E572B00,2,0
15111+
0x5E585B80,3,0,0x5F500200,3,1=0x5E585B80,3,0,0x5E572B00,3,1
1511215112
0x5E54BB00,1,0,0x09AA0400,3,0=0x5E54BB00,1,0,0x5E55AB00,3,0
1511315113
0x5E54BB00,3,0,0x09AA0400,3,0=0x5E54BB00,3,0,0x5E55AB00,3,0
1511415114
0x5E54BB00,3,0,0x09AA0400,1,0=0x5E54BB00,3,0,0x5E55AB00,1,0
@@ -15143,10 +15143,10 @@
1514315143
0x5E58EB00,0,0,0x5E572B00,0,1=0x5E58FB00,0,0,0x5E58FB80,0,0
1514415144
0x5E58EB00,0,0,0x5E572B00,1,0=0x5E58FB00,0,0,0x5E58FB80,0,0
1514515145
0x5E58EB00,0,0,0x5E58FB80,0,0=0x5E58FB00,0,0,0x5E58FB80,0,0
15146-
0x5E58FB00,3,0,0x5F500200,0,0=0x5E58FB00,3,0,0x5E572B00,0,0
15147-
0x5E58FB00,3,0,0x5F500200,1,1=0x5E58FB00,3,0,0x5E572B00,1,1
15148-
0x5E58FB80,1,0,0x5F500200,0,0=0x5E58FB80,1,0,0x5E572B00,0,0
15149-
0x5E58FB80,1,0,0x5F500200,1,1=0x5E58FB80,1,0,0x5E572B00,1,1
15146+
0x5E58FB00,1,0,0x5F500200,2,0=0x5E58FB00,1,0,0x5E572B00,2,0
15147+
0x5E58FB00,1,0,0x5F500200,3,1=0x5E58FB00,1,0,0x5E572B00,3,1
15148+
0x5E58FB80,3,0,0x5F500200,2,0=0x5E58FB80,3,0,0x5E572B00,2,0
15149+
0x5E58FB80,3,0,0x5F500200,3,1=0x5E58FB80,3,0,0x5E572B00,3,1
1515015150
0x5E54BB00,1,0,0x51004000,3,0=0x5E54BB00,1,0,0x5E660B00,3,0
1515115151
0x5E54BB00,3,0,0x51004000,3,0=0x5E54BB00,3,0,0x5E660B00,3,0
1515215152
0x5E54BB00,3,0,0x51004000,1,0=0x5E54BB00,3,0,0x5E660B00,1,0

‎src/main/scala/module/SamRuleGenerator.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,8 @@ class SamRuleGenerator(var context: RuleTransducer.Context) extends RuleGenerato
817817
Rules += sam~ES & minor~EN | sam~NW & minor~CSW | sam~ES & minor~CEN | % // DxD T 2-1 Alt
818818

819819
// continue
820-
Rules += sam~NW & minor~CNE | (Street ~> sam)~ES // DxD Thru T 1
821-
Rules += sam~NW & minor~CEN | (Street ~> sam)~ES // DxD Thru T 2
820+
Rules += sam~ES & minor~CSW | (Street ~> sam)~NW // DxD Thru T 1
821+
Rules += sam~ES & minor~CWS | (Street ~> sam)~NW // DxD Thru T 2
822822
}
823823
}
824824

0 commit comments

Comments
 (0)