Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing Alcremie forms (#3469)

Browse Source 
* Alcremie form sprites

Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>

# Conflicts:
#	graphics/pokemon/alcremie/lemon_cream/front.png
#	graphics/pokemon/alcremie/matcha_cream/back.png
#	graphics/pokemon/alcremie/matcha_cream/front.png
#	graphics/pokemon/alcremie/mint_cream/front.png
#	graphics/pokemon/alcremie/ruby_cream/front.png
#	graphics/pokemon/alcremie/salted_cream/front.png
#	include/graphics.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/footprint_table.h
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon.c

* Fixed cries

* Removed Todos

* Temp: all forms use the same icon

* Grouped form data + Fixed missing Level up and Teachable learnsets

* Added missing data for form changes and back animations

* Grouped defines together

* Fixed compile

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
This commit is contained in:
Eduardo Quezada D'Ottone 2023-10-29 16:30:56 -03:00 committed by GitHub
parent 9d9b43f4de
commit 1467ffa3d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
121 changed files with 3084 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/pokemon/alcremie/berry/Berry_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Rainbow_Swirl.pal Normal file
View File

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

19
graphics/pokemon/alcremie/berry/Berry_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
0 120 200
0 80 144
0 40 104
0 0 0

24
graphics/pokemon/alcremie/mint_cream/shiny.pal → graphics/pokemon/alcremie/berry/Berry_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
88 88 96
128 128 128
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
16 16 16
152 152 152
136 32 56
248 88 112
192 48 72
168 176 176
168 176 176
216 216 216
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/alcremie/berry/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
graphics/pokemon/alcremie/berry/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 717 B

19
graphics/pokemon/alcremie/clover/Clover_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
136 216 64
24 144 36
24 80 36
0 0 0

22
graphics/pokemon/alcremie/matcha_cream/shiny.pal → graphics/pokemon/alcremie/clover/Clover_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
152 152 152
216 216 216
136 32 56
248 88 112
192 48 72
168 176 176
248 248 248
168 176 176
0 0 0
0 0 0
0 0 0
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
16 16 16

BIN
graphics/pokemon/alcremie/clover/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

BIN
graphics/pokemon/alcremie/clover/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

19
graphics/pokemon/alcremie/flower/Flower_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Rainbow_Swirl.pal Normal file
View File

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

19
graphics/pokemon/alcremie/flower/Flower_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 248 0
248 104 40
152 56 24
0 0 0

22
graphics/pokemon/alcremie/ruby_swirl/shiny.pal → graphics/pokemon/alcremie/flower/Flower_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
152 152 152
216 216 216
136 32 56
248 88 112
192 48 72
168 176 176
248 248 248
168 176 176
0 0 0
0 0 0
0 0 0
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
16 16 16

BIN
graphics/pokemon/alcremie/flower/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 652 B

BIN
graphics/pokemon/alcremie/flower/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

BIN
graphics/pokemon/alcremie/lemon_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
graphics/pokemon/alcremie/lemon_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 738 B

19
graphics/pokemon/alcremie/lemon_cream/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
152 208 160
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
152 152 152
136 32 56
248 88 112
192 48 72
168 176 176
216 216 216
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/alcremie/love/Love_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Default.pal Normal file
View File

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

19
graphics/pokemon/alcremie/love/Love_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Rainbow_Swirl.pal Normal file
View File

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

19
graphics/pokemon/alcremie/love/Love_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
16 16 16

BIN
graphics/pokemon/alcremie/love/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
graphics/pokemon/alcremie/love/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 723 B

BIN
graphics/pokemon/alcremie/matcha_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 679 B

BIN
graphics/pokemon/alcremie/matcha_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 738 B

BIN
graphics/pokemon/alcremie/mint_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
graphics/pokemon/alcremie/mint_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 739 B

19
graphics/pokemon/alcremie/ribbon/Ribbon_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
16 16 16

BIN
graphics/pokemon/alcremie/ribbon/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
graphics/pokemon/alcremie/ribbon/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

BIN
graphics/pokemon/alcremie/ruby_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 693 B

BIN
graphics/pokemon/alcremie/ruby_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 742 B

BIN
graphics/pokemon/alcremie/ruby_swirl/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 691 B

BIN
graphics/pokemon/alcremie/ruby_swirl/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 753 B

BIN
graphics/pokemon/alcremie/salted_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
graphics/pokemon/alcremie/salted_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 737 B

19
graphics/pokemon/alcremie/salted_cream/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
152 208 160
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
136 32 56
248 88 112
192 48 72
168 176 176
152 152 152
216 216 216
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/alcremie/star/Star_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
16 16 16

BIN
graphics/pokemon/alcremie/star/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
graphics/pokemon/alcremie/star/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 732 B

20
graphics/pokemon/alcremie/salted_cream/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Caramel_Swirl.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
88 88 88
248 248 248
112 208 200
176 176 176
16 16 16
136 32 56
248 88 112
192 48 72
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
0 0 0
0 0 0
0 0 0
168 176 176
248 88 112
192 48 72
136 32 56
0 0 0

19
graphics/pokemon/alcremie/strawberry/Strawberry_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
248 88 112
192 48 72
136 32 56
0 0 0

20
graphics/pokemon/alcremie/lemon_cream/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Lemon_Cream.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
232 224 0
208 184 72
16 16 16
248 248 152
136 32 56
248 88 112
192 48 72
168 176 176
248 248 248
0 0 0
0 0 0
0 0 0
168 176 176
248 248 248
168 176 176
248 88 112
192 48 72
136 32 56
0 0 0

18
graphics/pokemon/alcremie/matcha_cream/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Matcha_Cream.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
192 224 96
176 208 152
16 16 16
232 248 208
248 248 248
136 32 56
232 248 200
176 208 152
232 248 200
176 208 152
248 88 112
192 48 72
224 248 200
176 208 152
0 0 0
0 0 0
136 32 56
0 0 0

20
graphics/pokemon/alcremie/mint_cream/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Mint_Cream.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
112 208 200
152 168 176
16 16 16
208 240 232
136 32 56
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 88 112
192 48 72
168 176 176
176 176 176
248 248 248
0 0 0
0 0 0
136 32 56
0 0 0

19
graphics/pokemon/alcremie/strawberry/Strawberry_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
248 88 112
192 48 72
136 32 56
0 0 0

22
graphics/pokemon/alcremie/ruby_cream/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Ruby_Cream.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
128 80 112
240 200 208
232 112 192
200 152 184
16 16 16
248 248 248
136 32 56
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 88 112
192 48 72
240 200 200
200 144 184
200 152 192
240 200 208
0 0 0
136 32 56
0 0 0

20
graphics/pokemon/alcremie/ruby_swirl/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Ruby_Swirl.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
240 192 128
208 184 160
16 16 16
248 240 208
248 248 248
136 32 56
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 88 112
192 48 72
248 176 184
224 120 128
0 0 0
0 0 0
136 32 56
0 0 0

19
graphics/pokemon/alcremie/strawberry/Strawberry_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 88 112
192 48 72
136 32 56
0 0 0

20
graphics/pokemon/alcremie/ruby_cream/shiny.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
216 216 216
136 32 56
248 88 112
192 48 72
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
152 152 152
0 0 0
0 0 0
248 88 112
192 48 72
136 32 56
16 16 16

BIN
graphics/pokemon/alcremie/strawberry/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
graphics/pokemon/alcremie/strawberry/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 723 B

207
include/constants/species.h
View File

@ -1388,20 +1388,20 @@
// Alcremie
#define SPECIES_ALCREMIE_RUBY_CREAM SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM
#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM FORMS_START + 311
#define SPECIES_ALCREMIE_MATCHA_CREAM SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM
#define SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM FORMS_START + 312
#define SPECIES_ALCREMIE_MINT_CREAM SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM
#define SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM FORMS_START + 313
#define SPECIES_ALCREMIE_LEMON_CREAM SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM
#define SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM FORMS_START + 314
#define SPECIES_ALCREMIE_SALTED_CREAM SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM
#define SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM FORMS_START + 315
#define SPECIES_ALCREMIE_RUBY_SWIRL SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL
#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL FORMS_START + 316
#define SPECIES_ALCREMIE_CARAMEL_SWIRL SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL
#define SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL FORMS_START + 317
#define SPECIES_ALCREMIE_RAINBOW_SWIRL SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL
#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM FORMS_START + 311
#define SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM FORMS_START + 312
#define SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM FORMS_START + 313
#define SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM FORMS_START + 314
#define SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM FORMS_START + 315
#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL FORMS_START + 316
#define SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL FORMS_START + 317
#define SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL FORMS_START + 318
// Eiscue
@ -1435,104 +1435,103 @@
// Basculegion
#define SPECIES_BASCULEGION_FEMALE FORMS_START + 329
// Gigantamax Forms
#define SPECIES_VENUSAUR_GIGANTAMAX FORMS_START + 330
#define SPECIES_BLASTOISE_GIGANTAMAX FORMS_START + 331
#define SPECIES_CHARIZARD_GIGANTAMAX FORMS_START + 332
#define SPECIES_BUTTERFREE_GIGANTAMAX FORMS_START + 333
#define SPECIES_PIKACHU_GIGANTAMAX FORMS_START + 334
#define SPECIES_MEOWTH_GIGANTAMAX FORMS_START + 335
#define SPECIES_MACHAMP_GIGANTAMAX FORMS_START + 336
#define SPECIES_GENGAR_GIGANTAMAX FORMS_START + 337
#define SPECIES_KINGLER_GIGANTAMAX FORMS_START + 338
#define SPECIES_LAPRAS_GIGANTAMAX FORMS_START + 339
#define SPECIES_EEVEE_GIGANTAMAX FORMS_START + 340
#define SPECIES_SNORLAX_GIGANTAMAX FORMS_START + 341
#define SPECIES_GARBODOR_GIGANTAMAX FORMS_START + 342
#define SPECIES_MELMETAL_GIGANTAMAX FORMS_START + 343
#define SPECIES_RILLABOOM_GIGANTAMAX FORMS_START + 344
#define SPECIES_CINDERACE_GIGANTAMAX FORMS_START + 345
#define SPECIES_INTELEON_GIGANTAMAX FORMS_START + 346
#define SPECIES_CORVIKNIGHT_GIGANTAMAX FORMS_START + 347
#define SPECIES_ORBEETLE_GIGANTAMAX FORMS_START + 348
#define SPECIES_DREDNAW_GIGANTAMAX FORMS_START + 349
#define SPECIES_COALOSSAL_GIGANTAMAX FORMS_START + 350
#define SPECIES_FLAPPLE_GIGANTAMAX FORMS_START + 351
#define SPECIES_APPLETUN_GIGANTAMAX FORMS_START + 352
#define SPECIES_SANDACONDA_GIGANTAMAX FORMS_START + 353
#define SPECIES_TOXTRICITY_AMPED_GIGANTAMAX FORMS_START + 354
#define SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX FORMS_START + 355
#define SPECIES_CENTISKORCH_GIGANTAMAX FORMS_START + 356
#define SPECIES_HATTERENE_GIGANTAMAX FORMS_START + 357
#define SPECIES_GRIMMSNARL_GIGANTAMAX FORMS_START + 358
#define SPECIES_ALCREMIE_GIGANTAMAX FORMS_START + 359
#define SPECIES_COPPERAJAH_GIGANTAMAX FORMS_START + 360
#define SPECIES_DURALUDON_GIGANTAMAX FORMS_START + 361
#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX FORMS_START + 362
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX FORMS_START + 363
// More Alcremie
#define SPECIES_ALCREMIE_BERRY SPECIES_ALCREMIE_BERRY_VANILLA_CREAM
#define SPECIES_ALCREMIE_BERRY_VANILLA_CREAM FORMS_START + 330
#define SPECIES_ALCREMIE_BERRY_RUBY_CREAM FORMS_START + 331
#define SPECIES_ALCREMIE_BERRY_MATCHA_CREAM FORMS_START + 332
#define SPECIES_ALCREMIE_BERRY_MINT_CREAM FORMS_START + 333
#define SPECIES_ALCREMIE_BERRY_LEMON_CREAM FORMS_START + 334
#define SPECIES_ALCREMIE_BERRY_SALTED_CREAM FORMS_START + 335
#define SPECIES_ALCREMIE_BERRY_RUBY_SWIRL FORMS_START + 336
#define SPECIES_ALCREMIE_BERRY_CARAMEL_SWIRL FORMS_START + 337
#define SPECIES_ALCREMIE_BERRY_RAINBOW_SWIRL FORMS_START + 338
#define SPECIES_ALCREMIE_LOVE SPECIES_ALCREMIE_LOVE_VANILLA_CREAM
#define SPECIES_ALCREMIE_LOVE_VANILLA_CREAM FORMS_START + 339
#define SPECIES_ALCREMIE_LOVE_RUBY_CREAM FORMS_START + 340
#define SPECIES_ALCREMIE_LOVE_MATCHA_CREAM FORMS_START + 341
#define SPECIES_ALCREMIE_LOVE_MINT_CREAM FORMS_START + 342
#define SPECIES_ALCREMIE_LOVE_LEMON_CREAM FORMS_START + 343
#define SPECIES_ALCREMIE_LOVE_SALTED_CREAM FORMS_START + 344
#define SPECIES_ALCREMIE_LOVE_RUBY_SWIRL FORMS_START + 345
#define SPECIES_ALCREMIE_LOVE_CARAMEL_SWIRL FORMS_START + 346
#define SPECIES_ALCREMIE_LOVE_RAINBOW_SWIRL FORMS_START + 347
#define SPECIES_ALCREMIE_STAR SPECIES_ALCREMIE_STAR_VANILLA_CREAM
#define SPECIES_ALCREMIE_STAR_VANILLA_CREAM FORMS_START + 348
#define SPECIES_ALCREMIE_STAR_RUBY_CREAM FORMS_START + 349
#define SPECIES_ALCREMIE_STAR_MATCHA_CREAM FORMS_START + 350
#define SPECIES_ALCREMIE_STAR_MINT_CREAM FORMS_START + 351
#define SPECIES_ALCREMIE_STAR_LEMON_CREAM FORMS_START + 352
#define SPECIES_ALCREMIE_STAR_SALTED_CREAM FORMS_START + 353
#define SPECIES_ALCREMIE_STAR_RUBY_SWIRL FORMS_START + 354
#define SPECIES_ALCREMIE_STAR_CARAMEL_SWIRL FORMS_START + 355
#define SPECIES_ALCREMIE_STAR_RAINBOW_SWIRL FORMS_START + 356
#define SPECIES_ALCREMIE_CLOVER SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM
#define SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM FORMS_START + 357
#define SPECIES_ALCREMIE_CLOVER_RUBY_CREAM FORMS_START + 358
#define SPECIES_ALCREMIE_CLOVER_MATCHA_CREAM FORMS_START + 359
#define SPECIES_ALCREMIE_CLOVER_MINT_CREAM FORMS_START + 360
#define SPECIES_ALCREMIE_CLOVER_LEMON_CREAM FORMS_START + 361
#define SPECIES_ALCREMIE_CLOVER_SALTED_CREAM FORMS_START + 362
#define SPECIES_ALCREMIE_CLOVER_RUBY_SWIRL FORMS_START + 363
#define SPECIES_ALCREMIE_CLOVER_CARAMEL_SWIRL FORMS_START + 364
#define SPECIES_ALCREMIE_CLOVER_RAINBOW_SWIRL FORMS_START + 365
#define SPECIES_ALCREMIE_FLOWER SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM
#define SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM FORMS_START + 366
#define SPECIES_ALCREMIE_FLOWER_RUBY_CREAM FORMS_START + 367
#define SPECIES_ALCREMIE_FLOWER_MATCHA_CREAM FORMS_START + 368
#define SPECIES_ALCREMIE_FLOWER_MINT_CREAM FORMS_START + 369
#define SPECIES_ALCREMIE_FLOWER_LEMON_CREAM FORMS_START + 370
#define SPECIES_ALCREMIE_FLOWER_SALTED_CREAM FORMS_START + 371
#define SPECIES_ALCREMIE_FLOWER_RUBY_SWIRL FORMS_START + 372
#define SPECIES_ALCREMIE_FLOWER_CARAMEL_SWIRL FORMS_START + 373
#define SPECIES_ALCREMIE_FLOWER_RAINBOW_SWIRL FORMS_START + 374
#define SPECIES_ALCREMIE_RIBBON SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM
#define SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM FORMS_START + 375
#define SPECIES_ALCREMIE_RIBBON_RUBY_CREAM FORMS_START + 376
#define SPECIES_ALCREMIE_RIBBON_MATCHA_CREAM FORMS_START + 377
#define SPECIES_ALCREMIE_RIBBON_MINT_CREAM FORMS_START + 378
#define SPECIES_ALCREMIE_RIBBON_LEMON_CREAM FORMS_START + 379
#define SPECIES_ALCREMIE_RIBBON_SALTED_CREAM FORMS_START + 380
#define SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL FORMS_START + 381
#define SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL FORMS_START + 382
#define SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL FORMS_START + 383
/*
#define SPECIES_ALCREMIE_BERRY SPECIES_ALCREMIE_BERRY_VANILLA_CREAM
#define SPECIES_ALCREMIE_BERRY_VANILLA_CREAM FORMS_START + 363 // Todo
#define SPECIES_ALCREMIE_BERRY_RUBY_CREAM FORMS_START + 364 // Todo
#define SPECIES_ALCREMIE_BERRY_MATCHA_CREAM FORMS_START + 365 // Todo
#define SPECIES_ALCREMIE_BERRY_MINT_CREAM FORMS_START + 366 // Todo
#define SPECIES_ALCREMIE_BERRY_LEMON_CREAM FORMS_START + 367 // Todo
#define SPECIES_ALCREMIE_BERRY_SALTED_CREAM FORMS_START + 368 // Todo
#define SPECIES_ALCREMIE_BERRY_RUBY_SWIRL FORMS_START + 369 // Todo
#define SPECIES_ALCREMIE_BERRY_CARAMEL_SWIRL FORMS_START + 370 // Todo
#define SPECIES_ALCREMIE_BERRY_RAINBOW_SWIRL FORMS_START + 371 // Todo
#define SPECIES_ALCREMIE_LOVE SPECIES_ALCREMIE_LOVE_VANILLA_CREAM
#define SPECIES_ALCREMIE_LOVE_VANILLA_CREAM FORMS_START + 372 // Todo
#define SPECIES_ALCREMIE_LOVE_RUBY_CREAM FORMS_START + 373 // Todo
#define SPECIES_ALCREMIE_LOVE_MATCHA_CREAM FORMS_START + 374 // Todo
#define SPECIES_ALCREMIE_LOVE_MINT_CREAM FORMS_START + 375 // Todo
#define SPECIES_ALCREMIE_LOVE_LEMON_CREAM FORMS_START + 376 // Todo
#define SPECIES_ALCREMIE_LOVE_SALTED_CREAM FORMS_START + 377 // Todo
#define SPECIES_ALCREMIE_LOVE_RUBY_SWIRL FORMS_START + 378 // Todo
#define SPECIES_ALCREMIE_LOVE_CARAMEL_SWIRL FORMS_START + 379 // Todo
#define SPECIES_ALCREMIE_LOVE_RAINBOW_SWIRL FORMS_START + 380 // Todo
#define SPECIES_ALCREMIE_STAR SPECIES_ALCREMIE_STAR_VANILLA_CREAM
#define SPECIES_ALCREMIE_STAR_VANILLA_CREAM FORMS_START + 381 // Todo
#define SPECIES_ALCREMIE_STAR_RUBY_CREAM FORMS_START + 382 // Todo
#define SPECIES_ALCREMIE_STAR_MATCHA_CREAM FORMS_START + 383 // Todo
#define SPECIES_ALCREMIE_STAR_MINT_CREAM FORMS_START + 384 // Todo
#define SPECIES_ALCREMIE_STAR_LEMON_CREAM FORMS_START + 385 // Todo
#define SPECIES_ALCREMIE_STAR_SALTED_CREAM FORMS_START + 386 // Todo
#define SPECIES_ALCREMIE_STAR_RUBY_SWIRL FORMS_START + 387 // Todo
#define SPECIES_ALCREMIE_STAR_CARAMEL_SWIRL FORMS_START + 388 // Todo
#define SPECIES_ALCREMIE_STAR_RAINBOW_SWIRL FORMS_START + 389 // Todo
#define SPECIES_ALCREMIE_CLOVER SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM
#define SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM FORMS_START + 390 // Todo
#define SPECIES_ALCREMIE_CLOVER_RUBY_CREAM FORMS_START + 391 // Todo
#define SPECIES_ALCREMIE_CLOVER_MATCHA_CREAM FORMS_START + 392 // Todo
#define SPECIES_ALCREMIE_CLOVER_MINT_CREAM FORMS_START + 393 // Todo
#define SPECIES_ALCREMIE_CLOVER_LEMON_CREAM FORMS_START + 394 // Todo
#define SPECIES_ALCREMIE_CLOVER_SALTED_CREAM FORMS_START + 395 // Todo
#define SPECIES_ALCREMIE_CLOVER_RUBY_SWIRL FORMS_START + 396 // Todo
#define SPECIES_ALCREMIE_CLOVER_CARAMEL_SWIRL FORMS_START + 397 // Todo
#define SPECIES_ALCREMIE_CLOVER_RAINBOW_SWIRL FORMS_START + 398 // Todo
#define SPECIES_ALCREMIE_FLOWER SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM
#define SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM FORMS_START + 399 // Todo
#define SPECIES_ALCREMIE_FLOWER_RUBY_CREAM FORMS_START + 400 // Todo
#define SPECIES_ALCREMIE_FLOWER_MATCHA_CREAM FORMS_START + 401 // Todo
#define SPECIES_ALCREMIE_FLOWER_MINT_CREAM FORMS_START + 402 // Todo
#define SPECIES_ALCREMIE_FLOWER_LEMON_CREAM FORMS_START + 403 // Todo
#define SPECIES_ALCREMIE_FLOWER_SALTED_CREAM FORMS_START + 404 // Todo
#define SPECIES_ALCREMIE_FLOWER_RUBY_SWIRL FORMS_START + 405 // Todo
#define SPECIES_ALCREMIE_FLOWER_CARAMEL_SWIRL FORMS_START + 406 // Todo
#define SPECIES_ALCREMIE_FLOWER_RAINBOW_SWIRL FORMS_START + 407 // Todo
#define SPECIES_ALCREMIE_RIBBON SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM
#define SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM FORMS_START + 408 // Todo
#define SPECIES_ALCREMIE_RIBBON_RUBY_CREAM FORMS_START + 409 // Todo
#define SPECIES_ALCREMIE_RIBBON_MATCHA_CREAM FORMS_START + 410 // Todo
#define SPECIES_ALCREMIE_RIBBON_MINT_CREAM FORMS_START + 411 // Todo
#define SPECIES_ALCREMIE_RIBBON_LEMON_CREAM FORMS_START + 412 // Todo
#define SPECIES_ALCREMIE_RIBBON_SALTED_CREAM FORMS_START + 413 // Todo
#define SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL FORMS_START + 414 // Todo
#define SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL FORMS_START + 415 // Todo
#define SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL FORMS_START + 416 // Todo
*/
// Gigantamax Forms
#define SPECIES_VENUSAUR_GIGANTAMAX FORMS_START + 384
#define SPECIES_BLASTOISE_GIGANTAMAX FORMS_START + 385
#define SPECIES_CHARIZARD_GIGANTAMAX FORMS_START + 386
#define SPECIES_BUTTERFREE_GIGANTAMAX FORMS_START + 387
#define SPECIES_PIKACHU_GIGANTAMAX FORMS_START + 388
#define SPECIES_MEOWTH_GIGANTAMAX FORMS_START + 389
#define SPECIES_MACHAMP_GIGANTAMAX FORMS_START + 390
#define SPECIES_GENGAR_GIGANTAMAX FORMS_START + 391
#define SPECIES_KINGLER_GIGANTAMAX FORMS_START + 392
#define SPECIES_LAPRAS_GIGANTAMAX FORMS_START + 393
#define SPECIES_EEVEE_GIGANTAMAX FORMS_START + 394
#define SPECIES_SNORLAX_GIGANTAMAX FORMS_START + 395
#define SPECIES_GARBODOR_GIGANTAMAX FORMS_START + 396
#define SPECIES_MELMETAL_GIGANTAMAX FORMS_START + 397
#define SPECIES_RILLABOOM_GIGANTAMAX FORMS_START + 398
#define SPECIES_CINDERACE_GIGANTAMAX FORMS_START + 399
#define SPECIES_INTELEON_GIGANTAMAX FORMS_START + 400
#define SPECIES_CORVIKNIGHT_GIGANTAMAX FORMS_START + 401
#define SPECIES_ORBEETLE_GIGANTAMAX FORMS_START + 402
#define SPECIES_DREDNAW_GIGANTAMAX FORMS_START + 403
#define SPECIES_COALOSSAL_GIGANTAMAX FORMS_START + 404
#define SPECIES_FLAPPLE_GIGANTAMAX FORMS_START + 405
#define SPECIES_APPLETUN_GIGANTAMAX FORMS_START + 406
#define SPECIES_SANDACONDA_GIGANTAMAX FORMS_START + 407
#define SPECIES_TOXTRICITY_AMPED_GIGANTAMAX FORMS_START + 408
#define SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX FORMS_START + 409
#define SPECIES_CENTISKORCH_GIGANTAMAX FORMS_START + 410
#define SPECIES_HATTERENE_GIGANTAMAX FORMS_START + 411
#define SPECIES_GRIMMSNARL_GIGANTAMAX FORMS_START + 412
#define SPECIES_ALCREMIE_GIGANTAMAX FORMS_START + 413
#define SPECIES_COPPERAJAH_GIGANTAMAX FORMS_START + 414
#define SPECIES_DURALUDON_GIGANTAMAX FORMS_START + 415
#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX FORMS_START + 416
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX FORMS_START + 417
#define FORMS_START SPECIES_ENAMORUS
#define SPECIES_EGG SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX + 1

140
include/graphics.h
View File

@ -1338,14 +1338,6 @@ extern const u32 gMonFrontPic_MagearnaOriginalColor[];
extern const u32 gMonFrontPic_CramorantGulping[];
extern const u32 gMonFrontPic_CramorantGorging[];
extern const u32 gMonFrontPic_ToxtricityLowKey[];
extern const u32 gMonFrontPic_AlcremieRubyCream[];
extern const u32 gMonFrontPic_AlcremieMatchaCream[];
extern const u32 gMonFrontPic_AlcremieMintCream[];
extern const u32 gMonFrontPic_AlcremieLemonCream[];
extern const u32 gMonFrontPic_AlcremieSaltedCream[];
extern const u32 gMonFrontPic_AlcremieRubySwirl[];
extern const u32 gMonFrontPic_AlcremieCaramelSwirl[];
extern const u32 gMonFrontPic_AlcremieRainbowSwirl[];
extern const u32 gMonFrontPic_EiscueNoiceFace[];
extern const u32 gMonFrontPic_IndeedeeFemale[];
extern const u32 gMonFrontPic_MorpekoHangry[];
@ -2623,14 +2615,6 @@ extern const u32 gMonBackPic_MagearnaOriginalColor[];
extern const u32 gMonBackPic_CramorantGulping[];
extern const u32 gMonBackPic_CramorantGorging[];
extern const u32 gMonBackPic_ToxtricityLowKey[];
extern const u32 gMonBackPic_AlcremieRubyCream[];
extern const u32 gMonBackPic_AlcremieMatchaCream[];
extern const u32 gMonBackPic_AlcremieMintCream[];
extern const u32 gMonBackPic_AlcremieLemonCream[];
extern const u32 gMonBackPic_AlcremieSaltedCream[];
extern const u32 gMonBackPic_AlcremieRubySwirl[];
extern const u32 gMonBackPic_AlcremieCaramelSwirl[];
extern const u32 gMonBackPic_AlcremieRainbowSwirl[];
extern const u32 gMonBackPic_EiscueNoiceFace[];
extern const u32 gMonBackPic_IndeedeeFemale[];
extern const u32 gMonBackPic_MorpekoHangry[];
@ -3888,14 +3872,6 @@ extern const u32 gMonPalette_MagearnaOriginalColor[];
extern const u32 gMonPalette_CramorantGulping[];
extern const u32 gMonPalette_CramorantGorging[];
extern const u32 gMonPalette_ToxtricityLowKey[];
extern const u32 gMonPalette_AlcremieRubyCream[];
extern const u32 gMonPalette_AlcremieMatchaCream[];
extern const u32 gMonPalette_AlcremieMintCream[];
extern const u32 gMonPalette_AlcremieLemonCream[];
extern const u32 gMonPalette_AlcremieSaltedCream[];
extern const u32 gMonPalette_AlcremieRubySwirl[];
extern const u32 gMonPalette_AlcremieCaramelSwirl[];
extern const u32 gMonPalette_AlcremieRainbowSwirl[];
extern const u32 gMonPalette_EiscueNoiceFace[];
extern const u32 gMonPalette_IndeedeeFemale[];
extern const u32 gMonPalette_MorpekoHangry[];
@ -5148,14 +5124,6 @@ extern const u32 gMonShinyPalette_MagearnaOriginalColor[];
extern const u32 gMonShinyPalette_CramorantGulping[];
extern const u32 gMonShinyPalette_CramorantGorging[];
extern const u32 gMonShinyPalette_ToxtricityLowKey[];
extern const u32 gMonShinyPalette_AlcremieRubyCream[];
extern const u32 gMonShinyPalette_AlcremieMatchaCream[];
extern const u32 gMonShinyPalette_AlcremieMintCream[];
extern const u32 gMonShinyPalette_AlcremieLemonCream[];
extern const u32 gMonShinyPalette_AlcremieSaltedCream[];
extern const u32 gMonShinyPalette_AlcremieRubySwirl[];
extern const u32 gMonShinyPalette_AlcremieCaramelSwirl[];
extern const u32 gMonShinyPalette_AlcremieRainbowSwirl[];
extern const u32 gMonShinyPalette_EiscueNoiceFace[];
extern const u32 gMonShinyPalette_IndeedeeFemale[];
extern const u32 gMonShinyPalette_MorpekoHangry[];
@ -6089,7 +6057,15 @@ extern const u8 gMonIcon_Sirfetchd[];
extern const u8 gMonIcon_MrRime[];
extern const u8 gMonIcon_Runerigus[];
extern const u8 gMonIcon_Milcery[];
extern const u8 gMonIcon_Alcremie[];
extern const u8 gMonIcon_AlcremieStrawberryVanillaCream[];
//extern const u8 gMonIcon_AlcremieStrawberryRubyCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMatchaCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMintCream[];
//extern const u8 gMonIcon_AlcremieStrawberryLemonCream[];
//extern const u8 gMonIcon_AlcremieStrawberrySaltedCream[];
//extern const u8 gMonIcon_AlcremieStrawberryRubySwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[];
extern const u8 gMonIcon_Falinks[];
extern const u8 gMonIcon_Pincurchin[];
extern const u8 gMonIcon_Snom[];
@ -6403,14 +6379,6 @@ extern const u8 gMonIcon_MagearnaOriginalColor[];
extern const u8 gMonIcon_CramorantGulping[];
extern const u8 gMonIcon_CramorantGorging[];
extern const u8 gMonIcon_ToxtricityLowKey[];
//extern const u8 gMonIcon_AlcremieStrawberryRubyCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMatchaCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMintCream[];
//extern const u8 gMonIcon_AlcremieStrawberryLemonCream[];
//extern const u8 gMonIcon_AlcremieStrawberrySaltedCream[];
//extern const u8 gMonIcon_AlcremieStrawberryRubySwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[];
extern const u8 gMonIcon_EiscueNoiceFace[];
extern const u8 gMonIcon_IndeedeeFemale[];
extern const u8 gMonIcon_MorpekoHangry[];
@ -7336,7 +7304,97 @@ extern const u8 gMonFootprint_Sirfetchd[];
extern const u8 gMonFootprint_Mr_Rime[];
extern const u8 gMonFootprint_Runerigus[];
extern const u8 gMonFootprint_Milcery[];
extern const u32 gMonFrontPic_AlcremieStrawberry[];
extern const u32 gMonPalette_AlcremieStrawberryVanillaCream[];
extern const u32 gMonPalette_AlcremieStrawberryRubyCream[];
extern const u32 gMonPalette_AlcremieStrawberryMatchaCream[];
extern const u32 gMonPalette_AlcremieStrawberryMintCream[];
extern const u32 gMonPalette_AlcremieStrawberryLemonCream[];
extern const u32 gMonPalette_AlcremieStrawberrySaltedCream[];
extern const u32 gMonPalette_AlcremieStrawberryRubySwirl[];
extern const u32 gMonPalette_AlcremieStrawberryCaramelSwirl[];
extern const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieStrawberry[];
extern const u32 gMonShinyPalette_AlcremieStrawberry[];
extern const u8 gMonFootprint_Alcremie[];
extern const u32 gMonFrontPic_AlcremieBerry[];
extern const u32 gMonPalette_AlcremieBerryVanillaCream[];
extern const u32 gMonPalette_AlcremieBerryRubyCream[];
extern const u32 gMonPalette_AlcremieBerryMatchaCream[];
extern const u32 gMonPalette_AlcremieBerryMintCream[];
extern const u32 gMonPalette_AlcremieBerryLemonCream[];
extern const u32 gMonPalette_AlcremieBerrySaltedCream[];
extern const u32 gMonPalette_AlcremieBerryRubySwirl[];
extern const u32 gMonPalette_AlcremieBerryCaramelSwirl[];
extern const u32 gMonPalette_AlcremieBerryRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieBerry[];
extern const u32 gMonShinyPalette_AlcremieBerry[];
//extern const u8 gMonIcon_AlcremieBerry[];
extern const u32 gMonFrontPic_AlcremieLove[];
extern const u32 gMonPalette_AlcremieLoveVanillaCream[];
extern const u32 gMonPalette_AlcremieLoveRubyCream[];
extern const u32 gMonPalette_AlcremieLoveMatchaCream[];
extern const u32 gMonPalette_AlcremieLoveMintCream[];
extern const u32 gMonPalette_AlcremieLoveLemonCream[];
extern const u32 gMonPalette_AlcremieLoveSaltedCream[];
extern const u32 gMonPalette_AlcremieLoveRubySwirl[];
extern const u32 gMonPalette_AlcremieLoveCaramelSwirl[];
extern const u32 gMonPalette_AlcremieLoveRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieLove[];
extern const u32 gMonShinyPalette_AlcremieLove[];
//extern const u8 gMonIcon_AlcremieLove[];
extern const u32 gMonFrontPic_AlcremieStar[];
extern const u32 gMonPalette_AlcremieStarVanillaCream[];
extern const u32 gMonPalette_AlcremieStarRubyCream[];
extern const u32 gMonPalette_AlcremieStarMatchaCream[];
extern const u32 gMonPalette_AlcremieStarMintCream[];
extern const u32 gMonPalette_AlcremieStarLemonCream[];
extern const u32 gMonPalette_AlcremieStarSaltedCream[];
extern const u32 gMonPalette_AlcremieStarRubySwirl[];
extern const u32 gMonPalette_AlcremieStarCaramelSwirl[];
extern const u32 gMonPalette_AlcremieStarRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieStar[];
extern const u32 gMonShinyPalette_AlcremieStar[];
//extern const u8 gMonIcon_AlcremieStar[];
extern const u32 gMonFrontPic_AlcremieClover[];
extern const u32 gMonPalette_AlcremieCloverVanillaCream[];
extern const u32 gMonPalette_AlcremieCloverRubyCream[];
extern const u32 gMonPalette_AlcremieCloverMatchaCream[];
extern const u32 gMonPalette_AlcremieCloverMintCream[];
extern const u32 gMonPalette_AlcremieCloverLemonCream[];
extern const u32 gMonPalette_AlcremieCloverSaltedCream[];
extern const u32 gMonPalette_AlcremieCloverRubySwirl[];
extern const u32 gMonPalette_AlcremieCloverCaramelSwirl[];
extern const u32 gMonPalette_AlcremieCloverRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieClover[];
extern const u32 gMonShinyPalette_AlcremieClover[];
//extern const u8 gMonIcon_AlcremieClover[];
extern const u32 gMonFrontPic_AlcremieFlower[];
extern const u32 gMonPalette_AlcremieFlowerVanillaCream[];
extern const u32 gMonPalette_AlcremieFlowerRubyCream[];
extern const u32 gMonPalette_AlcremieFlowerMatchaCream[];
extern const u32 gMonPalette_AlcremieFlowerMintCream[];
extern const u32 gMonPalette_AlcremieFlowerLemonCream[];
extern const u32 gMonPalette_AlcremieFlowerSaltedCream[];
extern const u32 gMonPalette_AlcremieFlowerRubySwirl[];
extern const u32 gMonPalette_AlcremieFlowerCaramelSwirl[];
extern const u32 gMonPalette_AlcremieFlowerRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieFlower[];
extern const u32 gMonShinyPalette_AlcremieFlower[];
//extern const u8 gMonIcon_AlcremieFlower[];
extern const u32 gMonFrontPic_AlcremieRibbon[];
extern const u32 gMonPalette_AlcremieRibbonVanillaCream[];
extern const u32 gMonPalette_AlcremieRibbonRubyCream[];
extern const u32 gMonPalette_AlcremieRibbonMatchaCream[];
extern const u32 gMonPalette_AlcremieRibbonMintCream[];
extern const u32 gMonPalette_AlcremieRibbonLemonCream[];
extern const u32 gMonPalette_AlcremieRibbonSaltedCream[];
extern const u32 gMonPalette_AlcremieRibbonRubySwirl[];
extern const u32 gMonPalette_AlcremieRibbonCaramelSwirl[];
extern const u32 gMonPalette_AlcremieRibbonRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieRibbon[];
extern const u32 gMonShinyPalette_AlcremieRibbon[];
//extern const u8 gMonIcon_AlcremieRibbon[];
extern const u8 gMonFootprint_Falinks[];
extern const u8 gMonFootprint_Pincurchin[];
extern const u8 gMonFootprint_Snom[];

Some files were not shown because too many files have changed in this diff Show More