Skip to content

Commit 8799fa2

Browse files
Dalton-VDeveloper-Butters
authored andcommitted
More filters for Home Origin Marks (PokemonAutomation#1340)
1 parent 8fe9d41 commit 8799fa2

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

SerialPrograms/Source/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ const MarkIconMatcher& MarkIcon_Kalos(){
6161
"kalos",
6262
Color(0xff61645c), Color(0xff646664),
6363
10,
64-
40.0,
64+
60.0,
6565
{
6666
{0xff61645c, 0xff646664},
67+
{0xff49523f, 0xff898e7e}
6768
}
6869
);
6970
return ret;
@@ -78,6 +79,7 @@ const MarkIconMatcher& MarkIcon_Alola(){
7879
35.0,
7980
{
8081
{0xff5f6456, 0xff6d706b},
82+
{0xff3e4733, 0xffa5ae99}
8183
}
8284
);
8385
return ret;
@@ -89,9 +91,10 @@ const MarkIconMatcher& MarkIcon_GameBoy(){
8991
"gameboy",
9092
Color(0xff61645b), Color(0xff646664),
9193
10,
92-
30.0,
94+
60.0,
9395
{
9496
{0xff61645b, 0xff646664},
97+
{0xff424c3c, 0xffb7c6a9}
9598
}
9699
);
97100
return ret;
@@ -103,9 +106,10 @@ const MarkIconMatcher& MarkIcon_Go(){
103106
"go",
104107
Color(0xff5c644e), Color(0xff798073),
105108
10,
106-
45.0,
109+
110.0,
107110
{
108111
{0xff5c644e, 0xff798073},
112+
{0xff364029, 0xffc5d5b5}
109113
}
110114
);
111115
return ret;
@@ -117,9 +121,10 @@ const MarkIconMatcher& MarkIcon_Lgpe(){
117121
"lgpe",
118122
Color(0xff616459), Color(0xff676d64),
119123
10,
120-
20.0,
124+
45.0,
121125
{
122126
{0xff616459, 0xff676d64},
127+
{0xff3e4832, 0xff85907c}
123128
}
124129
);
125130
return ret;
@@ -134,6 +139,7 @@ const MarkIconMatcher& MarkIcon_Galar(){
134139
45.0,
135140
{
136141
{0xff5e6453, 0xff757870},
142+
{0xff47503d, 0xfffffff8}
137143
}
138144
);
139145
return ret;
@@ -145,9 +151,10 @@ const MarkIconMatcher& MarkIcon_Bdsp(){
145151
"bdsp",
146152
Color(0xff5f6457), Color(0xff767972),
147153
10,
148-
45.0,
154+
60.0,
149155
{
150156
{0xff5f6457, 0xff767972},
157+
{0xff3d4731, 0xffb6c6ad}
151158
}
152159
);
153160
return ret;
@@ -159,9 +166,10 @@ const MarkIconMatcher& MarkIcon_La(){
159166
"la",
160167
Color(0xff606459), Color(0xff686a65),
161168
10,
162-
30.0,
169+
90.0,
163170
{
164171
{0xff606459, 0xff686a65},
172+
{0xff3a462e, 0xffe4f4ce}
165173
}
166174
);
167175
return ret;
@@ -173,9 +181,10 @@ const MarkIconMatcher& MarkIcon_Sv(){
173181
"sv",
174182
Color(0xff5d6450), Color(0xff747771),
175183
10,
176-
50.0,
184+
90,
177185
{
178186
{0xff5d6450, 0xff747771},
187+
{0xff38422c, 0xfff7ffd7}
179188
}
180189
);
181190
return ret;
@@ -187,9 +196,10 @@ const MarkIconMatcher& MarkIcon_Lza(){
187196
"lza",
188197
Color(0xff61645b), Color(0xff646764),
189198
10,
190-
20.0,
199+
70.0,
191200
{
192201
{0xff61645b, 0xff646764},
202+
{0xff424c3c, 0xffb7c6a9}
193203
}
194204
);
195205
return ret;

0 commit comments

Comments
 (0)