ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

missing pla sprites

Browse Source
This commit is contained in:
Alex 2023-02-22 20:41:01 +01:00
parent 403a6f4544
commit 1f694ae7ed
38 changed files with 341 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/basculegion/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 625 B

BIN
graphics/pokemon/basculegion/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 960 B

19
graphics/pokemon/basculegion/normal.pal Executable file
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

19
graphics/pokemon/basculegion/shiny.pal Executable file
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/decidueye/hisuian/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 850 B

BIN
graphics/pokemon/decidueye/hisuian/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 966 B

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

19
graphics/pokemon/decidueye/hisuian/normal.pal Executable file
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

19
graphics/pokemon/decidueye/hisuian/shiny.pal Executable file
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

BIN
graphics/pokemon/enamorus/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 841 B

BIN
graphics/pokemon/enamorus/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 896 B

19
graphics/pokemon/enamorus/normal.pal Executable file
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

19
graphics/pokemon/enamorus/shiny.pal Normal file
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

BIN
graphics/pokemon/enamorus/therian/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 844 B

BIN
graphics/pokemon/enamorus/therian/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 999 B

19
graphics/pokemon/enamorus/therian/normal.pal Executable file
View File

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

19
graphics/pokemon/enamorus/therian/shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
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/samurott/hisuian/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 912 B

BIN
graphics/pokemon/samurott/hisuian/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 930 B

19
graphics/pokemon/samurott/hisuian/normal.pal Executable file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
112 96 64
208 192 120
240 224 168
160 144 96
72 64 80
248 248 248
128 168 176
32 64 104
40 96 168
190 54 54
192 184 200
96 120 120
32 48 72
0 0 0

19
graphics/pokemon/samurott/hisuian/shiny.pal Executable file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
112 96 64
208 192 120
240 224 168
213 82 98
222 218 220
248 248 248
128 168 176
36 49 94
32 69 155
162 145 134
192 184 200
96 120 120
32 48 72
0 0 0

0
graphics/pokemon/samurott/shiny.pal Normal file → Executable file
View File

BIN
graphics/pokemon/sneasler/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 821 B

BIN
graphics/pokemon/sneasler/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 913 B

19
graphics/pokemon/sneasler/normal.pal Executable file
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

19
graphics/pokemon/sneasler/shiny.pal Executable file
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/wyrdeer/back.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 854 B

BIN
graphics/pokemon/wyrdeer/front.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

19
graphics/pokemon/wyrdeer/normal.pal Executable file
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

19
graphics/pokemon/wyrdeer/shiny.pal Executable file
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

48
include/graphics.h
View File

@ -986,14 +986,14 @@ 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_Basculegion[];
//extern const u32 gMonFrontPic_BasculegionF[];
//extern const u32 gMonFrontPic_Sneasler[];
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 +1098,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 +1110,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[];
@ -2200,14 +2200,14 @@ 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_Basculegion[];
//extern const u32 gMonBackPic_BasculegionF[];
//extern const u32 gMonBackPic_Sneasler[];
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 +2312,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 +2324,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[];
@ -3406,14 +3406,14 @@ 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_Basculegion[];
//extern const u32 gMonPalette_BasculegionF[];
//extern const u32 gMonPalette_Sneasler[];
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 +3518,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 +3530,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[];
@ -4639,14 +4639,14 @@ 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_Basculegion[];
//extern const u32 gMonShinyPalette_BasculegionF[];
//extern const u32 gMonShinyPalette_Sneasler[];
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 +4751,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 +4763,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[];

2
src/battle_ai_util.c
View File

@ -1166,7 +1166,7 @@ s32 AI_GetAbility(u32 battlerId)
// We've had ability overwritten by e.g. Worry Seed. It is not part of AI_PARTY in case of switching
if (gBattleStruct->overwrittenAbilities[battlerId])
return gBattleStruct->overwrittenAbilities[battlerId];
// The AI knows its own ability.
if (IsBattlerAIControlled(battlerId))
return knownAbility;

48
src/data/graphics/pokemon.h
View File

@ -919,14 +919,14 @@ 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_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_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 +1031,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 +1043,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");
@ -2131,14 +2131,14 @@ 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_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_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 +2243,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 +2255,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");
@ -3337,14 +3337,14 @@ 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_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_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 +3449,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 +3461,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");
@ -4570,14 +4570,14 @@ 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_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_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 +4682,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 +4694,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");

12
src/data/pokemon_graphics/back_pic_table.h
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),

12
src/data/pokemon_graphics/front_pic_table.h
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),

12
src/data/pokemon_graphics/palette_table.h
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),

14
src/data/pokemon_graphics/shiny_palette_table.h
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),
@ -1328,7 +1328,7 @@ 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),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),

2
src/data/trainer_parties.h
View File

@ -6873,7 +6873,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[]
{
.iv = 0,
.lvl = 5,
.species = SPECIES_MUDKIP,
.species = SPECIES_WYRDEER,
}
};