Add missing Hisuian sprites and cries (#2725)

This commit is contained in:
Eduardo Quezada D'Ottone 2023-03-13 14:50:42 -03:00 committed by GitHub
commit 26015be305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
96 changed files with 716 additions and 359 deletions

BIN
graphics/pokemon/arcanine/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 923 B

BIN
graphics/pokemon/arcanine/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

22
graphics/pokemon/arcanine/hisuian/normal.pal Normal file → Executable file
View File

@ -2,17 +2,17 @@ JASC-PAL
0100
16
152 208 160
48 40 32
0 0 0
136 136 128
96 96 80
232 72 56
176 48 32
216 216 208
248 248 240
72 64 56
40 40 40
208 88 64
32 44 40
128 140 128
16 16 16
80 100 96
96 12 0
248 120 96
232 72 48
168 40 32
184 180 176
248 248 248
0 0 0
0 0 0
0 0 0
0 0 0

22
graphics/pokemon/arcanine/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,17 +2,17 @@ JASC-PAL
0100
16
152 208 160
48 40 32
0 0 0
136 136 128
96 96 80
224 208 40
176 152 0
216 216 208
248 248 240
72 64 56
40 40 40
224 208 40
32 44 40
128 140 128
16 16 16
80 100 96
90 65 16
231 184 41
231 184 41
181 126 0
184 180 176
248 248 248
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/avalugg/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 654 B

BIN
graphics/pokemon/avalugg/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 947 B

26
graphics/pokemon/avalugg/hisuian/normal.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
88 168 208
80 112 144
184 240 248
104 80 64
128 208 240
248 248 248
80 40 24
8 8 8
80 96 104
176 224 240
136 176 192
16 16 16
104 84 64
232 244 248
80 60 48
72 44 32
144 120 96
144 64 32
200 200 216
144 152 168
248 192 0
88 56 56
112 112 112
184 188 184
232 232 232
144 68 32
240 184 72
0 0 0

28
graphics/pokemon/avalugg/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
112 152 208
80 96 168
184 232 248
200 160 144
128 192 240
248 248 248
112 80 72
8 8 8
232 192 176
248 176 24
248 176 120
248 136 88
248 176 24
160 128 120
80 96 104
176 224 240
136 176 192
16 16 16
104 84 64
232 244 248
80 60 48
72 44 32
144 120 96
112 112 112
184 188 184
249 131 79
164 100 16
240 184 72
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 939 B

View File

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 474 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
98 98 98
16 16 16
46 92 120
171 222 224
230 230 230
227 242 239
164 164 164
122 168 175
32 49 57
65 82 82
55 140 89
21 64 34
34 96 61
16 16 18
99 62 41

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
98 98 98
16 16 16
112 96 64
216 208 112
230 230 230
248 236 160
164 164 164
160 152 72
32 49 57
64 80 80
96 144 48
21 64 34
72 108 56
16 16 18
99 62 41

Binary file not shown.

After

Width:  |  Height:  |  Size: 960 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
48 140 88
192 52 80
160 164 160
16 64 32
16 16 16
120 24 24
248 164 200
96 60 40
224 228 224
64 80 80
32 48 56
32 96 56
248 80 120
96 96 96
56 84 72

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
96 144 48
144 72 176
160 164 160
16 64 32
16 16 16
88 36 112
224 176 240
96 60 40
224 228 224
60 82 76
32 48 56
72 108 56
184 84 232
96 96 96
56 84 72

BIN
graphics/pokemon/braviary/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 786 B

After

Width:  |  Height:  |  Size: 11 KiB

BIN
graphics/pokemon/braviary/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 978 B

After

Width:  |  Height:  |  Size: 15 KiB

0
graphics/pokemon/braviary/hisuian/icon.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 484 B

28
graphics/pokemon/braviary/hisuian/normal.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
104 88 80
8 8 8
232 232 224
184 176 168
56 56 64
80 88 88
152 64 168
168 96 184
32 40 40
184 156 16
80 188 160
96 80 32
16 16 16
144 60 160
160 48 48
232 212 88
144 152 184
80 184 160
168 24 24
240 248 248
224 192 72
184 128 56
228 230 224
168 100 184
48 52 64
104 92 80
184 176 168
88 84 104
240 240 240

30
graphics/pokemon/braviary/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
24 24 24
8 8 8
64 64 56
40 40 32
56 56 64
80 88 88
48 176 216
120 232 240
32 40 40
168 248 248
232 248 248
96 56 144
240 248 248
224 192 72
184 128 56
208 160 70
233 254 252
103 74 27
16 16 16
51 180 217
96 63 150
243 215 139
174 251 251
71 66 63
122 234 243
48 52 64
30 28 26
45 41 38
88 84 104
240 240 240

Binary file not shown.

After

Width:  |  Height:  |  Size: 850 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 966 B

0
graphics/pokemon/decidueye/hisuian/icon.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 164
115 106 106
16 16 16
238 238 238
189 189 189
238 156 57
65 41 32
106 24 41
189 106 41
205 49 41
148 32 41
41 41 49
213 148 98
74 74 90
172 106 74
115 65 57

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 164
115 106 106
16 16 16
238 238 238
189 189 189
238 82 57
65 41 32
16 57 41
172 41 41
32 131 98
24 90 65
41 41 49
172 139 106
74 74 90
131 106 90
90 65 57

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 896 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
74 74 74
180 180 189
252 252 252
16 16 16
118 50 58
147 33 30
224 116 156
243 46 46
174 74 87
199 46 41
243 84 143
187 62 94
255 197 60
239 228 176
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
74 74 74
180 180 189
255 255 255
0 0 0
131 57 82
164 24 24
230 131 164
255 90 0
189 82 106
222 74 41
255 139 238
205 98 189
255 197 32
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 710 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 821 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 164
131 41 49
213 106 156
16 16 16
213 65 57
74 74 74
255 255 255
180 180 189
255 197 57
123 164 131
98 115 98
148 197 156
230 246 230
49 57 49
213 106 156
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 164
131 41 49
213 106 156
16 16 16
213 65 57
74 74 74
255 255 255
180 180 189
255 197 57
123 164 131
98 115 98
148 197 156
230 246 230
49 57 49
238 131 230
0 0 0

BIN
graphics/pokemon/goodra/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 882 B

After

Width:  |  Height:  |  Size: 931 B

BIN
graphics/pokemon/goodra/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 924 B

After

Width:  |  Height:  |  Size: 995 B

30
graphics/pokemon/goodra/hisuian/normal.pal Normal file → Executable file
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
0 176 232
128 96 112
216 192 208
136 136 136
8 8 8
240 240 240
200 200 200
168 152 168
64 64 64
176 176 176
96 96 104
136 104 168
64 56 88
168 152 192
232 208 232
152 208 160
136 148 168
192 204 224
224 228 240
80 96 112
16 16 16
88 68 88
192 168 200
232 212 232
136 108 144
48 64 72
248 252 248
248 248 248
64 60 88
104 96 144
144 132 200

28
graphics/pokemon/goodra/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
128 96 112
216 192 208
120 104 56
8 8 8
240 240 240
200 176 88
168 152 168
56 40 32
160 136 72
80 64 40
136 104 168
64 56 88
168 152 192
232 208 232
141 107 50
184 139 71
215 166 100
101 80 35
16 16 16
88 68 88
192 168 200
232 212 232
136 108 144
68 54 21
248 252 248
248 248 248
64 60 88
110 99 147
144 132 200

BIN
graphics/pokemon/growlithe/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

After

Width:  |  Height:  |  Size: 799 B

BIN
graphics/pokemon/growlithe/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 775 B

28
graphics/pokemon/growlithe/hisuian/normal.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
88 72 88
200 192 184
88 72 64
240 232 224
208 208 200
168 156 144
16 16 16
120 104 128
104 16 8
248 80 48
184 32 32
160 144 160
112 96 32
208 128 112
184 152 120
224 200 160
72 72 72
0 0 0
16 0 0
184 176 168
184 64 56
120 48 8
208 104 64
112 84 56
48 60 64
192 160 120
248 252 240
232 208 176
216 220 208

28
graphics/pokemon/growlithe/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
112 104 96
232 232 232
88 72 64
240 232 224
208 208 200
168 156 144
16 16 16
160 152 144
88 72 40
232 184 128
168 136 48
208 200 192
112 96 32
208 128 112
184 152 120
224 200 160
72 72 72
0 0 0
16 0 0
184 176 168
189 110 57
120 48 8
226 163 52
112 84 56
48 60 64
192 160 120
248 252 240
232 208 176
216 220 208

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
128 164 160
168 44 64
72 72 72
248 252 248
104 28 48
16 16 16
40 44 96
88 112 112
32 88 152
208 80 96
24 20 48
192 196 200
28 56 96
20 32 72
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
128 164 160
206 173 155
72 72 72
248 252 248
169 117 97
16 16 16
226 222 226
88 112 112
33 90 156
121 104 121
24 20 48
192 196 200
33 58 99
170 159 170
0 0 0

BIN
graphics/pokemon/sliggoo/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 606 B

After

Width:  |  Height:  |  Size: 600 B

BIN
graphics/pokemon/sliggoo/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 659 B

After

Width:  |  Height:  |  Size: 667 B

30
graphics/pokemon/sliggoo/hisuian/normal.pal Normal file → Executable file
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
232 224 176
128 96 112
240 240 240
216 192 208
168 152 168
8 8 8
136 136 136
72 152 80
152 208 160
96 72 88
192 160 192
16 16 16
232 216 232
144 120 136
64 108 96
96 156 144
128 128 128
72 76 72
168 168 168
200 200 200
64 64 64
88 200 80
176 176 176
168 152 192
64 56 88
136 104 168
104 96 104
128 92 152
168 128 192
88 48 96
0 0 0

32
graphics/pokemon/sliggoo/hisuian/shiny.pal Normal file → Executable file
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
232 224 176
128 96 112
240 240 240
216 192 208
168 152 168
8 8 8
120 104 56
72 152 80
200 176 88
56 40 32
88 200 80
160 136 72
168 152 192
64 56 88
136 104 168
104 96 104
152 208 160
101 73 92
197 162 197
16 16 16
237 218 237
144 120 136
134 124 71
170 171 96
134 97 62
72 76 72
181 153 103
200 200 200
128 92 152
168 128 192
88 48 96
0 0 0

BIN
graphics/pokemon/sneasel/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 744 B

BIN
graphics/pokemon/sneasel/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 783 B

28
graphics/pokemon/sneasel/hisuian/normal.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
120 88 176
80 48 104
160 120 216
56 40 64
152 152 160
192 136 8
152 152 200
72 72 72
16 16 16
216 216 224
184 184 192
128 96 160
160 120 56
232 192 48
88 56 120
240 240 248
120 120 120
232 56 64
192 40 112
248 220 120
112 76 160
40 32 72
216 216 240
184 188 192
120 108 160
84 74 128
240 244 248
80 52 120
144 108 184

28
graphics/pokemon/sneasel/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
248 144 40
168 72 16
248 200 80
32 24 32
64 88 80
28 136 168
77 106 105
72 72 72
16 16 16
112 160 120
88 128 104
80 72 88
64 112 224
136 160 240
48 40 48
240 240 248
120 120 120
72 176 96
222 222 71
121 197 217
204 155 40
40 32 72
117 149 149
184 188 192
84 75 107
64 58 80
240 244 248
119 92 49
235 201 84

Binary file not shown.

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 164
49 41 49
74 74 98
74 57 82
123 139 180
16 16 16
164 189 222
164 123 57
123 98 189
238 197 49
255 255 255
255 32 65
90 65 131
255 41 41
189 41 41
139 24 24

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 164
49 41 49
106 90 41
74 57 82
156 148 82
16 16 16
238 213 131
74 148 156
106 74 98
123 213 230
255 255 255
90 172 32
74 49 74
246 189 8
213 148 24
213 148 24

BIN
graphics/pokemon/typhlosion/hisuian/back.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 888 B

BIN
graphics/pokemon/typhlosion/hisuian/front.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 872 B

After

Width:  |  Height:  |  Size: 995 B

28
graphics/pokemon/typhlosion/hisuian/normal.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
240 88 160
232 96 224
176 56 152
240 72 104
56 48 96
88 72 152
16 16 80
96 80 176
136 128 80
216 216 168
160 28 200
216 60 224
224 76 144
216 52 48
88 72 128
40 28 72
128 104 168
56 44 88
160 136 72
255 255 255
16 16 16
232 136 0
248 248 248
176 176 120
80 64 48
208 196 112
104 80 40
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
160 28 200
216 60 224
224 76 144
216 52 48
88 72 128
40 28 72
128 104 168
56 44 88
160 136 72
248 236 144
16 16 16
208 196 112
104 80 40
0 0 0
0 0 0

28
graphics/pokemon/typhlosion/hisuian/shiny.pal Normal file → Executable file
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
240 88 160
232 96 224
176 56 152
240 72 104
40 64 96
64 88 136
8 32 88
64 120 152
136 128 80
216 216 168
160 28 200
217 60 230
224 76 144
218 54 54
65 89 152
40 28 72
128 104 168
33 65 112
164 139 74
255 255 255
16 16 16
232 136 0
248 248 248
176 176 120
80 64 48
213 197 115
104 80 40
0 0 0
0 0 0

BIN
graphics/pokemon/wyrdeer/back.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 854 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
152 104 56
248 216 168
120 72 64
232 184 128
0 0 0
72 72 72
224 152 88
160 168 168
120 120 120
112 128 136
240 240 240
192 200 208
56 64 64
88 88 88
64 72 80

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
152 104 56
248 216 168
120 72 64
232 184 128
0 0 0
72 72 72
224 152 88
168 180 128
120 140 80
112 128 136
232 236 208
208 216 152
56 64 64
88 88 88
64 72 80

View File

@ -1368,8 +1368,11 @@
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328
// Basculegion
#define SPECIES_BASCULEGION_FEMALE FORMS_START + 329
#define FORMS_START SPECIES_ENAMORUS
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
#define SPECIES_EGG SPECIES_BASCULEGION_FEMALE + 1
#define NUM_SPECIES SPECIES_EGG

View File

@ -986,14 +986,13 @@ extern const u32 gMonFrontPic_Regidrago[];
extern const u32 gMonFrontPic_Glastrier[];
extern const u32 gMonFrontPic_Spectrier[];
extern const u32 gMonFrontPic_Calyrex[];
//extern const u32 gMonFrontPic_Wyrdeer[];
extern const u32 gMonFrontPic_Wyrdeer[];
extern const u32 gMonFrontPic_Kleavor[];
extern const u32 gMonFrontPic_Ursaluna[];
//extern const u32 gMonFrontPic_Basculegion[];
//extern const u32 gMonFrontPic_BasculegionF[];
//extern const u32 gMonFrontPic_Sneasler[];
extern const u32 gMonFrontPic_Basculegion[];
extern const u32 gMonFrontPic_Sneasler[];
extern const u32 gMonFrontPic_Overqwil[];
//extern const u32 gMonFrontPic_Enamorus[];
extern const u32 gMonFrontPic_Enamorus[];
#endif
extern const u32 gMonFrontPic_VenusaurMega[];
extern const u32 gMonFrontPic_CharizardMegaX[];
@ -1098,7 +1097,7 @@ extern const u32 gMonFrontPic_TyphlosionHisuian[];
extern const u32 gMonFrontPic_QwilfishHisuian[];
extern const u32 gMonFrontPic_SneaselHisuian[];
#if P_GEN_5_POKEMON == TRUE
//extern const u32 gMonFrontPic_SamurottHisuian[];
extern const u32 gMonFrontPic_SamurottHisuian[];
extern const u32 gMonFrontPic_LilligantHisuian[];
extern const u32 gMonFrontPic_ZoruaHisuian[];
extern const u32 gMonFrontPic_ZoroarkHisuian[];
@ -1110,7 +1109,7 @@ extern const u32 gMonFrontPic_GoodraHisuian[];
extern const u32 gMonFrontPic_AvaluggHisuian[];
#endif
#if P_GEN_7_POKEMON == TRUE
//extern const u32 gMonFrontPic_DecidueyeHisuian[];
extern const u32 gMonFrontPic_DecidueyeHisuian[];
#endif
extern const u32 gMonFrontPic_PikachuCosplay[];
extern const u32 gMonFrontPic_PikachuRockStar[];
@ -1276,7 +1275,8 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonFrontPic_ZarudeDada[];
extern const u32 gMonFrontPic_CalyrexIceRider[];
extern const u32 gMonFrontPic_CalyrexShadowRider[];
//extern const u32 gMonFrontPic_EnamorusTherian[];
extern const u32 gMonFrontPic_EnamorusTherian[];
extern const u32 gMonFrontPic_BasculegionFemale[];
#endif
extern const u32 gMonFrontPic_Egg[];
@ -2200,14 +2200,13 @@ extern const u32 gMonBackPic_Regidrago[];
extern const u32 gMonBackPic_Glastrier[];
extern const u32 gMonBackPic_Spectrier[];
extern const u32 gMonBackPic_Calyrex[];
//extern const u32 gMonBackPic_Wyrdeer[];
extern const u32 gMonBackPic_Wyrdeer[];
extern const u32 gMonBackPic_Kleavor[];
extern const u32 gMonBackPic_Ursaluna[];
//extern const u32 gMonBackPic_Basculegion[];
//extern const u32 gMonBackPic_BasculegionF[];
//extern const u32 gMonBackPic_Sneasler[];
extern const u32 gMonBackPic_Basculegion[];
extern const u32 gMonBackPic_Sneasler[];
extern const u32 gMonBackPic_Overqwil[];
//extern const u32 gMonBackPic_Enamorus[];
extern const u32 gMonBackPic_Enamorus[];
#endif
extern const u32 gMonBackPic_VenusaurMega[];
extern const u32 gMonBackPic_CharizardMegaX[];
@ -2312,7 +2311,7 @@ extern const u32 gMonBackPic_TyphlosionHisuian[];
extern const u32 gMonBackPic_QwilfishHisuian[];
extern const u32 gMonBackPic_SneaselHisuian[];
#if P_GEN_5_POKEMON == TRUE
//extern const u32 gMonBackPic_SamurottHisuian[];
extern const u32 gMonBackPic_SamurottHisuian[];
extern const u32 gMonBackPic_LilligantHisuian[];
extern const u32 gMonBackPic_ZoruaHisuian[];
extern const u32 gMonBackPic_ZoroarkHisuian[];
@ -2324,7 +2323,7 @@ extern const u32 gMonBackPic_GoodraHisuian[];
extern const u32 gMonBackPic_AvaluggHisuian[];
#endif
#if P_GEN_7_POKEMON == TRUE
//extern const u32 gMonBackPic_DecidueyeHisuian[];
extern const u32 gMonBackPic_DecidueyeHisuian[];
#endif
extern const u32 gMonBackPic_PikachuCosplay[];
extern const u32 gMonBackPic_PikachuRockStar[];
@ -2488,7 +2487,8 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonBackPic_ZarudeDada[];
extern const u32 gMonBackPic_CalyrexIceRider[];
extern const u32 gMonBackPic_CalyrexShadowRider[];
//extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_BasculegionFemale[];
#endif
extern const u32 gMonPalette_CircledQuestionMark[];
@ -3406,14 +3406,13 @@ extern const u32 gMonPalette_Regidrago[];
extern const u32 gMonPalette_Glastrier[];
extern const u32 gMonPalette_Spectrier[];
extern const u32 gMonPalette_Calyrex[];
//extern const u32 gMonPalette_Wyrdeer[];
extern const u32 gMonPalette_Wyrdeer[];
extern const u32 gMonPalette_Kleavor[];
extern const u32 gMonPalette_Ursaluna[];
//extern const u32 gMonPalette_Basculegion[];
//extern const u32 gMonPalette_BasculegionF[];
//extern const u32 gMonPalette_Sneasler[];
extern const u32 gMonPalette_Basculegion[];
extern const u32 gMonPalette_Sneasler[];
extern const u32 gMonPalette_Overqwil[];
//extern const u32 gMonPalette_Enamorus[];
extern const u32 gMonPalette_Enamorus[];
#endif
extern const u32 gMonPalette_VenusaurMega[];
extern const u32 gMonPalette_CharizardMegaX[];
@ -3518,7 +3517,7 @@ extern const u32 gMonPalette_TyphlosionHisuian[];
extern const u32 gMonPalette_QwilfishHisuian[];
extern const u32 gMonPalette_SneaselHisuian[];
#if P_GEN_5_POKEMON == TRUE
//extern const u32 gMonPalette_SamurottHisuian[];
extern const u32 gMonPalette_SamurottHisuian[];
extern const u32 gMonPalette_LilligantHisuian[];
extern const u32 gMonPalette_ZoruaHisuian[];
extern const u32 gMonPalette_ZoroarkHisuian[];
@ -3530,7 +3529,7 @@ extern const u32 gMonPalette_GoodraHisuian[];
extern const u32 gMonPalette_AvaluggHisuian[];
#endif
#if P_GEN_7_POKEMON == TRUE
//extern const u32 gMonPalette_DecidueyeHisuian[];
extern const u32 gMonPalette_DecidueyeHisuian[];
#endif
extern const u32 gMonPalette_PikachuCosplay[];
extern const u32 gMonPalette_PikachuRockStar[];
@ -3720,7 +3719,8 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonPalette_ZarudeDada[];
extern const u32 gMonPalette_CalyrexIceRider[];
extern const u32 gMonPalette_CalyrexShadowRider[];
//extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_BasculegionFemale[];
#endif
extern const u32 gMonPalette_Egg[];
@ -4639,14 +4639,13 @@ extern const u32 gMonShinyPalette_Regidrago[];
extern const u32 gMonShinyPalette_Glastrier[];
extern const u32 gMonShinyPalette_Spectrier[];
extern const u32 gMonShinyPalette_Calyrex[];
//extern const u32 gMonShinyPalette_Wyrdeer[];
extern const u32 gMonShinyPalette_Wyrdeer[];
extern const u32 gMonShinyPalette_Kleavor[];
extern const u32 gMonShinyPalette_Ursaluna[];
//extern const u32 gMonShinyPalette_Basculegion[];
//extern const u32 gMonShinyPalette_BasculegionF[];
//extern const u32 gMonShinyPalette_Sneasler[];
extern const u32 gMonShinyPalette_Basculegion[];
extern const u32 gMonShinyPalette_Sneasler[];
extern const u32 gMonShinyPalette_Overqwil[];
//extern const u32 gMonShinyPalette_Enamorus[];
extern const u32 gMonShinyPalette_Enamorus[];
#endif
extern const u32 gMonShinyPalette_VenusaurMega[];
extern const u32 gMonShinyPalette_CharizardMegaX[];
@ -4751,7 +4750,7 @@ extern const u32 gMonShinyPalette_TyphlosionHisuian[];
extern const u32 gMonShinyPalette_QwilfishHisuian[];
extern const u32 gMonShinyPalette_SneaselHisuian[];
#if P_GEN_5_POKEMON == TRUE
//extern const u32 gMonShinyPalette_SamurottHisuian[];
extern const u32 gMonShinyPalette_SamurottHisuian[];
extern const u32 gMonShinyPalette_LilligantHisuian[];
extern const u32 gMonShinyPalette_ZoruaHisuian[];
extern const u32 gMonShinyPalette_ZoroarkHisuian[];
@ -4763,7 +4762,7 @@ extern const u32 gMonShinyPalette_GoodraHisuian[];
extern const u32 gMonShinyPalette_AvaluggHisuian[];
#endif
#if P_GEN_7_POKEMON == TRUE
//extern const u32 gMonShinyPalette_DecidueyeHisuian[];
extern const u32 gMonShinyPalette_DecidueyeHisuian[];
#endif
extern const u32 gMonShinyPalette_PikachuCosplay[];
extern const u32 gMonShinyPalette_PikachuRockStar[];
@ -4947,7 +4946,8 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonShinyPalette_ZarudeDada[];
extern const u32 gMonShinyPalette_CalyrexIceRider[];
extern const u32 gMonShinyPalette_CalyrexShadowRider[];
//extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_BasculegionFemale[];
#endif
extern const u8 gMonIcon_QuestionMark[];
@ -5870,7 +5870,6 @@ extern const u8 gMonIcon_Wyrdeer[];
extern const u8 gMonIcon_Kleavor[];
extern const u8 gMonIcon_Ursaluna[];
extern const u8 gMonIcon_Basculegion[];
extern const u8 gMonIcon_BasculegionF[];
extern const u8 gMonIcon_Sneasler[];
extern const u8 gMonIcon_Overqwil[];
extern const u8 gMonIcon_Enamorus[];
@ -6168,6 +6167,7 @@ extern const u8 gMonIcon_ZarudeDada[];
extern const u8 gMonIcon_CalyrexIceRider[];
extern const u8 gMonIcon_CalyrexShadowRider[];
extern const u8 gMonIcon_EnamorusTherian[];
extern const u8 gMonIcon_BasculegionFemale[];
#endif
extern const u8 gMonIcon_Egg[];

View File

@ -1334,13 +1334,13 @@ gCryTable::
cry Cry_Glastrier
cry Cry_Spectrier
cry Cry_Calyrex
cry Cry_Unown //Cry_Wyrdeer
cry Cry_Unown //Cry_Kleavor
cry Cry_Unown //Cry_Ursaluna
cry Cry_Unown //Cry_Basculegion
cry Cry_Unown //Cry_Sneasler
cry Cry_Unown //Cry_Overqwil
cry Cry_Unown //Cry_Enamorus
cry Cry_Wyrdeer
cry Cry_Kleavor
cry Cry_Ursaluna
cry Cry_Basculegion
cry Cry_Sneasler
cry Cry_Overqwil
cry Cry_Enamorus
.else
cry Cry_Unown
cry Cry_Unown
@ -1749,7 +1749,7 @@ gCryTable::
cry Cry_TornadusTherian
cry Cry_ThundurusTherian
cry Cry_LandorusTherian
cry Cry_Bulbasaur //Cry_EnamorusTherian
cry Cry_EnamorusTherian
@ Kyurem
cry Cry_KyuremWhite
cry Cry_KyuremBlack
@ -3456,13 +3456,13 @@ gCryTable_Reverse::
cry_reverse Cry_Glastrier
cry_reverse Cry_Spectrier
cry_reverse Cry_Calyrex
cry_reverse Cry_Unown //Cry_Wyrdeer
cry_reverse Cry_Unown //Cry_Kleavor
cry_reverse Cry_Unown //Cry_Ursaluna
cry_reverse Cry_Unown //Cry_Basculegion
cry_reverse Cry_Unown //Cry_Sneasler
cry_reverse Cry_Unown //Cry_Overqwil
cry_reverse Cry_Unown //Cry_Enamorus
cry_reverse Cry_Wyrdeer
cry_reverse Cry_Kleavor
cry_reverse Cry_Ursaluna
cry_reverse Cry_Basculegion
cry_reverse Cry_Sneasler
cry_reverse Cry_Overqwil
cry_reverse Cry_Enamorus
.else
cry_reverse Cry_Unown
cry_reverse Cry_Unown
@ -3862,7 +3862,7 @@ gCryTable_Reverse::
cry_reverse Cry_TornadusTherian
cry_reverse Cry_ThundurusTherian
cry_reverse Cry_LandorusTherian
cry_reverse Cry_Bulbasaur //Cry_EnamorusTherian
cry_reverse Cry_EnamorusTherian
@ Kyurem
cry_reverse Cry_KyuremWhite
cry_reverse Cry_KyuremBlack

View File

@ -3986,7 +3986,7 @@ Cry_Spectrier::
.align 2
Cry_Calyrex::
.incbin "sound/direct_sound_samples/cries/calyrex.bin"
/*
.align 2
Cry_Wyrdeer::
.incbin "sound/direct_sound_samples/cries/wyrdeer.bin"
@ -4014,7 +4014,7 @@ Cry_Overqwil::
.align 2
Cry_Enamorus::
.incbin "sound/direct_sound_samples/cries/enamorus.bin"
*/
.endif
.align 2
@ -4360,11 +4360,10 @@ Cry_CalyrexIceRider::
Cry_CalyrexShadowRider::
.incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin"
/*
.align 2
Cry_EnamorusTherian::
.incbin "sound/direct_sound_samples/cries/enamorus_therian.bin"
*/
.endif
.align 2

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -919,14 +919,13 @@ const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/fron
const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz");
const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz");
const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz");
//const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz");
const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz");
const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz");
//const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
//const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz");
//const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz");
//const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
#endif
const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz");
const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz");
@ -1031,7 +1030,7 @@ const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlo
const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz");
#if P_GEN_5_POKEMON == TRUE
//const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz");
@ -1043,7 +1042,7 @@ const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/his
const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz");
#endif
#if P_GEN_7_POKEMON == TRUE
//const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz");
#endif
const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz");
const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz");
@ -1207,7 +1206,8 @@ const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/
const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz");
const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz");
const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz");
//const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz");
const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz");
const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz");
#endif
const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
@ -2131,14 +2131,13 @@ const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.
const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz");
const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz");
const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz");
//const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz");
const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz");
const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz");
//const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
//const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz");
//const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz");
//const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
#endif
const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz");
const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz");
@ -2243,7 +2242,7 @@ const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlos
const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz");
const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz");
#if P_GEN_5_POKEMON == TRUE
//const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz");
const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz");
const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz");
const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz");
const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz");
@ -2255,7 +2254,7 @@ const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisu
const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz");
#endif
#if P_GEN_7_POKEMON == TRUE
//const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz");
const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz");
#endif
const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz");
const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz");
@ -2419,7 +2418,8 @@ const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u
const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz");
const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz");
const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz");
//const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz");
const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz");
const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz");
#endif
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
@ -3337,14 +3337,13 @@ const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/norma
const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz");
const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz");
const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz");
//const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz");
const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz");
const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz");
//const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
//const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz");
//const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz");
//const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
#endif
const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz");
const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz");
@ -3449,7 +3448,7 @@ const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlos
const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz");
const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz");
#if P_GEN_5_POKEMON == TRUE
//const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz");
const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz");
const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz");
const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz");
const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz");
@ -3461,7 +3460,7 @@ const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisu
const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz");
#endif
#if P_GEN_7_POKEMON == TRUE
//const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz");
const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz");
#endif
const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz");
const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz");
@ -3651,7 +3650,8 @@ const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u
const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz");
const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz");
const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz");
//const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz");
const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz");
const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz");
#endif
const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
@ -4570,14 +4570,13 @@ const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/
const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz");
const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz");
const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz");
const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz");
const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
//const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz");
//const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz");
const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz");
#endif
const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz");
const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz");
@ -4682,7 +4681,7 @@ const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/ty
const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz");
#if P_GEN_5_POKEMON == TRUE
//const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz");
@ -4694,7 +4693,7 @@ const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra
const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz");
#endif
#if P_GEN_7_POKEMON == TRUE
//const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz");
#endif
const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz");
const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz");
@ -4878,7 +4877,8 @@ const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/poke
const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz");
//const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz");
#endif
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
@ -5801,7 +5801,6 @@ const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp");
const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp");
const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp");
const u8 gMonIcon_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp");
const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/iconf.4bpp");
const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp");
const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp");
const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp");
@ -6099,6 +6098,7 @@ const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4b
const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp");
const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp");
const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp");
#endif
const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");

View File

@ -171,6 +171,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable,
[SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable,
[SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable,
[SPECIES_BASCULEGION] = sBasculegionFormSpeciesIdTable,
#endif
// Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable,
@ -590,5 +591,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable,
// Basculegion
[SPECIES_BASCULEGION_FEMALE] = sBasculegionFormSpeciesIdTable,
#endif
};

View File

@ -1145,4 +1145,10 @@ static const u16 sEnamorusFormSpeciesIdTable[] = {
FORM_SPECIES_END,
};
static const u16 sBasculegionFormSpeciesIdTable[] = {
SPECIES_BASCULEGION,
SPECIES_BASCULEGION_FEMALE,
FORM_SPECIES_END,
};
#endif

View File

@ -1334,5 +1334,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset,
[SPECIES_BASCULEGION_FEMALE] = sBasculegionLevelUpLearnset,
#endif
};

View File

@ -20946,7 +20946,29 @@ const struct SpeciesInfo gSpeciesInfo[] =
.catchRate = 25,
.expYield = 186,
.evYield_HP = 2,
.genderRatio = PERCENT_FEMALE(50),
.genderRatio = MON_MALE,
.eggCycles = 40,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_WATER_2, EGG_GROUP_WATER_2},
.abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
},
[SPECIES_BASCULEGION_FEMALE] =
{
.baseHP = 120,
.baseAttack = 92,
.baseDefense = 65,
.baseSpeed = 78,
.baseSpAttack = 100,
.baseSpDefense = 75,
.types = { TYPE_WATER, TYPE_GHOST},
.catchRate = 25,
.expYield = 186,
.evYield_HP = 2,
.genderRatio = MON_FEMALE,
.eggCycles = 40,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
@ -20954,7 +20976,6 @@ const struct SpeciesInfo gSpeciesInfo[] =
.abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
.flags = SPECIES_FLAG_GENDER_DIFFERENCE,
},
[SPECIES_SNEASLER] =

View File

@ -1334,5 +1334,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset,
[SPECIES_BASCULEGION_FEMALE] = sBasculegionTeachableLearnset,
#endif
};

View File

@ -1042,20 +1042,20 @@ const struct MonCoords gMonBackPicCoords[] =
[SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
[SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 10 },
[SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 7 },
[SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 },
[SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 2 },
[SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 },
[SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 },
#if P_GEN_5_POKEMON == TRUE
[SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 },
[SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 },
[SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 },
[SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 0 },
[SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
#endif
#if P_GEN_6_POKEMON == TRUE
[SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 17 },
[SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 },
#endif
#if P_GEN_7_POKEMON == TRUE
[SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -1355,7 +1355,9 @@ const struct MonCoords gMonBackPicCoords[] =
[SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 },
[SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
// Basculegion
[SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
[SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 },
};

View File

@ -908,13 +908,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(GLASTRIER, gMonBackPic_Glastrier),
SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier),
SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex),
SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer),
SPECIES_SPRITE(WYRDEER, gMonBackPic_Wyrdeer),
SPECIES_SPRITE(KLEAVOR, gMonBackPic_Kleavor),
SPECIES_SPRITE(URSALUNA, gMonBackPic_Ursaluna),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonBackPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus),
SPECIES_SPRITE(ENAMORUS, gMonBackPic_Enamorus),
#endif
SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega),
@ -1024,7 +1024,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_QwilfishHisuian),
SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_SneaselHisuian),
#if P_GEN_5_POKEMON == TRUE
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_SamurottHisuian),
SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_LilligantHisuian),
SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_ZoruaHisuian),
SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_ZoroarkHisuian),
@ -1036,7 +1036,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_AvaluggHisuian),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_DecidueyeHisuian),
#endif
SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay),
@ -1331,7 +1331,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(BASCULEGION_FEMALE, gMonBackPic_BasculegionFemale),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
@ -1359,7 +1361,4 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF),
#endif
};

View File

@ -12906,6 +12906,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
[SPECIES_CALYREX_ICE_RIDER] = sAnims_Calyrex,
[SPECIES_CALYREX_SHADOW_RIDER] = sAnims_Calyrex,
[SPECIES_ENAMORUS_THERIAN] = sAnims_EnamorusTherian,
[SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion,
#endif
[SPECIES_EGG] = sAnims_Egg,
};

View File

@ -1337,6 +1337,8 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
// Basculegion
[SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
// Egg
[SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 },

View File

@ -908,13 +908,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(GLASTRIER, gMonFrontPic_Glastrier),
SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier),
SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex),
SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer),
SPECIES_SPRITE(WYRDEER, gMonFrontPic_Wyrdeer),
SPECIES_SPRITE(KLEAVOR, gMonFrontPic_Kleavor),
SPECIES_SPRITE(URSALUNA, gMonFrontPic_Ursaluna),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonFrontPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus),
SPECIES_SPRITE(ENAMORUS, gMonFrontPic_Enamorus),
#endif
SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega),
SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX),
@ -1023,7 +1023,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_QwilfishHisuian),
SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_SneaselHisuian),
#if P_GEN_5_POKEMON == TRUE
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_SamurottHisuian),
SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_LilligantHisuian),
SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_ZoruaHisuian),
SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_ZoroarkHisuian),
@ -1035,7 +1035,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_AvaluggHisuian),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_DecidueyeHisuian),
#endif
SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay),
@ -1330,7 +1330,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(BASCULEGION_FEMALE, gMonFrontPic_BasculegionFemale),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
@ -1358,7 +1360,4 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF),
#endif
};

View File

@ -908,13 +908,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(GLASTRIER, gMonPalette_Glastrier),
SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier),
SPECIES_PAL(CALYREX, gMonPalette_Calyrex),
SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), // gMonPalette_Wyrdeer),
SPECIES_PAL(WYRDEER, gMonPalette_Wyrdeer),
SPECIES_PAL(KLEAVOR, gMonPalette_Kleavor),
SPECIES_PAL(URSALUNA, gMonPalette_Ursaluna),
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_Basculegion),
SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler),
SPECIES_PAL(BASCULEGION, gMonPalette_Basculegion),
SPECIES_PAL(SNEASLER, gMonPalette_Sneasler),
SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil),
SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus),
SPECIES_PAL(ENAMORUS, gMonPalette_Enamorus),
#endif
SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega),
SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX),
@ -1023,7 +1023,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_QwilfishHisuian),
#if P_GEN_5_POKEMON == TRUE
SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian),
SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian),
SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_SamurottHisuian),
SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian),
SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_ZoruaHisuian),
SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_ZoroarkHisuian),
@ -1035,7 +1035,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_AvaluggHisuian),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian),
SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_DecidueyeHisuian),
#endif
SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay),
@ -1330,7 +1330,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider),
SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_EnamorusTherian),
SPECIES_PAL(BASCULEGION_FEMALE, gMonPalette_BasculegionFemale),
#endif
SPECIES_PAL(EGG, gMonPalette_Egg),
};
@ -1358,7 +1359,4 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_PAL(PYROAR, gMonPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF),
#endif
};

View File

@ -908,13 +908,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(GLASTRIER, gMonShinyPalette_Glastrier),
SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier),
SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex),
SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Wyrdeer),
SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_Wyrdeer),
SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_Kleavor),
SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_Ursaluna),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Basculegion),
SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_Basculegion),
SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_Sneasler),
SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil),
SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus),
SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_Enamorus),
#endif
SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega),
@ -1024,7 +1024,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_QwilfishHisuian),
SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_SneaselHisuian),
#if P_GEN_5_POKEMON == TRUE
SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_SamurottHisuian),
SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_SamurottHisuian),
SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_LilligantHisuian),
SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_ZoruaHisuian),
SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_ZoroarkHisuian),
@ -1036,7 +1036,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_AvaluggHisuian),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian),
SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_DecidueyeHisuian),
#endif
SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay),
@ -1329,7 +1329,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider),
SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian),
SPECIES_SHINY_PAL(BASCULEGION_FEMALE, gMonShinyPalette_BasculegionFemale),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_EnamorusTherian),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};
@ -1357,7 +1358,4 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF),
#endif
};

View File

@ -1336,5 +1336,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
// Calyrex
[SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"),
[SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"),
[SPECIES_BASCULEGION_FEMALE] = _("Bsculegion"),
#endif
};

View File

@ -1670,6 +1670,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS,
[SPECIES_BASCULEGION_FEMALE - 1] = NATIONAL_DEX_BASCULEGION,
#endif
};

View File

@ -1293,6 +1293,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider,
[SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider,
[SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian,
[SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionFemale,
#endif
[SPECIES_EGG] = gMonIcon_Egg,
};
@ -1325,9 +1326,6 @@ const u8 *const gMonIconTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
[SPECIES_PYROAR] = gMonIcon_PyroarF,
#endif
#if P_GEN_8_POKEMON == TRUE
[SPECIES_BASCULEGION] = gMonIcon_BasculegionF,
#endif
};
const u8 gMonIconPaletteIndices[] =
@ -2542,6 +2540,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_CALYREX_ICE_RIDER] = 0,
[SPECIES_CALYREX_SHADOW_RIDER] = 0,
[SPECIES_ENAMORUS_THERIAN] = 1,
[SPECIES_BASCULEGION_FEMALE] = 0,
#endif
[SPECIES_EGG] = 1,
};