diff --git a/graphics/pokemon/appletun/icon.png b/graphics/pokemon/appletun/icon.png new file mode 100644 index 0000000000..66de1521a9 Binary files /dev/null and b/graphics/pokemon/appletun/icon.png differ diff --git a/graphics/pokemon/applin/icon.png b/graphics/pokemon/applin/icon.png new file mode 100644 index 0000000000..c518f91a04 Binary files /dev/null and b/graphics/pokemon/applin/icon.png differ diff --git a/graphics/pokemon/arceus/anim_front.png b/graphics/pokemon/arceus/anim_front.png index ac951c180d..8e1f8a5380 100644 Binary files a/graphics/pokemon/arceus/anim_front.png and b/graphics/pokemon/arceus/anim_front.png differ diff --git a/graphics/pokemon/arceus/back.png b/graphics/pokemon/arceus/back.png index b49ad9f157..5ab63eb079 100644 Binary files a/graphics/pokemon/arceus/back.png and b/graphics/pokemon/arceus/back.png differ diff --git a/graphics/pokemon/arceus/front.png b/graphics/pokemon/arceus/front.png index 275ed5bca2..72349052d9 100644 Binary files a/graphics/pokemon/arceus/front.png and b/graphics/pokemon/arceus/front.png differ diff --git a/graphics/pokemon/blipbug/icon.png b/graphics/pokemon/blipbug/icon.png new file mode 100644 index 0000000000..e4ce3a937b Binary files /dev/null and b/graphics/pokemon/blipbug/icon.png differ diff --git a/graphics/pokemon/boltund/icon.png b/graphics/pokemon/boltund/icon.png new file mode 100644 index 0000000000..344ab587e1 Binary files /dev/null and b/graphics/pokemon/boltund/icon.png differ diff --git a/graphics/pokemon/carkol/icon.png b/graphics/pokemon/carkol/icon.png new file mode 100644 index 0000000000..4469388d66 Binary files /dev/null and b/graphics/pokemon/carkol/icon.png differ diff --git a/graphics/pokemon/centiskorch/icon.png b/graphics/pokemon/centiskorch/icon.png new file mode 100644 index 0000000000..6c52063bf7 Binary files /dev/null and b/graphics/pokemon/centiskorch/icon.png differ diff --git a/graphics/pokemon/chewtle/icon.png b/graphics/pokemon/chewtle/icon.png new file mode 100644 index 0000000000..1bcbc97845 Binary files /dev/null and b/graphics/pokemon/chewtle/icon.png differ diff --git a/graphics/pokemon/cinderace/icon.png b/graphics/pokemon/cinderace/icon.png new file mode 100644 index 0000000000..f5112ef2cd Binary files /dev/null and b/graphics/pokemon/cinderace/icon.png differ diff --git a/graphics/pokemon/clobbopus/icon.png b/graphics/pokemon/clobbopus/icon.png new file mode 100644 index 0000000000..695c42cf74 Binary files /dev/null and b/graphics/pokemon/clobbopus/icon.png differ diff --git a/graphics/pokemon/coalossal/icon.png b/graphics/pokemon/coalossal/icon.png new file mode 100644 index 0000000000..781259a2ca Binary files /dev/null and b/graphics/pokemon/coalossal/icon.png differ diff --git a/graphics/pokemon/copperajah/icon.png b/graphics/pokemon/copperajah/icon.png new file mode 100644 index 0000000000..917f6173b3 Binary files /dev/null and b/graphics/pokemon/copperajah/icon.png differ diff --git a/graphics/pokemon/corsola/galarian/icon.png b/graphics/pokemon/corsola/galarian/icon.png new file mode 100644 index 0000000000..96ef4da046 Binary files /dev/null and b/graphics/pokemon/corsola/galarian/icon.png differ diff --git a/graphics/pokemon/corviknight/icon.png b/graphics/pokemon/corviknight/icon.png new file mode 100644 index 0000000000..dc865a0443 Binary files /dev/null and b/graphics/pokemon/corviknight/icon.png differ diff --git a/graphics/pokemon/corvisquire/icon.png b/graphics/pokemon/corvisquire/icon.png new file mode 100644 index 0000000000..408a46a85f Binary files /dev/null and b/graphics/pokemon/corvisquire/icon.png differ diff --git a/graphics/pokemon/cramorant/gorging/icon.png b/graphics/pokemon/cramorant/gorging/icon.png new file mode 100644 index 0000000000..8c9830913f Binary files /dev/null and b/graphics/pokemon/cramorant/gorging/icon.png differ diff --git a/graphics/pokemon/cramorant/gulping/icon.png b/graphics/pokemon/cramorant/gulping/icon.png new file mode 100644 index 0000000000..0d22d7f1d5 Binary files /dev/null and b/graphics/pokemon/cramorant/gulping/icon.png differ diff --git a/graphics/pokemon/cramorant/icon.png b/graphics/pokemon/cramorant/icon.png new file mode 100644 index 0000000000..e8c1ce511b Binary files /dev/null and b/graphics/pokemon/cramorant/icon.png differ diff --git a/graphics/pokemon/cufant/icon.png b/graphics/pokemon/cufant/icon.png new file mode 100644 index 0000000000..bcdcad88ea Binary files /dev/null and b/graphics/pokemon/cufant/icon.png differ diff --git a/graphics/pokemon/cursola/icon.png b/graphics/pokemon/cursola/icon.png new file mode 100644 index 0000000000..8bfc498178 Binary files /dev/null and b/graphics/pokemon/cursola/icon.png differ diff --git a/graphics/pokemon/darmanitan/galarian/icon.png b/graphics/pokemon/darmanitan/galarian/icon.png new file mode 100644 index 0000000000..f09c2ea4dc Binary files /dev/null and b/graphics/pokemon/darmanitan/galarian/icon.png differ diff --git a/graphics/pokemon/darumaka/galarian/icon.png b/graphics/pokemon/darumaka/galarian/icon.png new file mode 100644 index 0000000000..88db35713d Binary files /dev/null and b/graphics/pokemon/darumaka/galarian/icon.png differ diff --git a/graphics/pokemon/dottler/icon.png b/graphics/pokemon/dottler/icon.png new file mode 100644 index 0000000000..1274c130f3 Binary files /dev/null and b/graphics/pokemon/dottler/icon.png differ diff --git a/graphics/pokemon/dragapult/icon.png b/graphics/pokemon/dragapult/icon.png new file mode 100644 index 0000000000..7e49f9ada5 Binary files /dev/null and b/graphics/pokemon/dragapult/icon.png differ diff --git a/graphics/pokemon/drakloak/icon.png b/graphics/pokemon/drakloak/icon.png new file mode 100644 index 0000000000..4e06a768b6 Binary files /dev/null and b/graphics/pokemon/drakloak/icon.png differ diff --git a/graphics/pokemon/drednaw/icon.png b/graphics/pokemon/drednaw/icon.png new file mode 100644 index 0000000000..9d0e42c016 Binary files /dev/null and b/graphics/pokemon/drednaw/icon.png differ diff --git a/graphics/pokemon/dreepy/icon.png b/graphics/pokemon/dreepy/icon.png new file mode 100644 index 0000000000..27261fd31b Binary files /dev/null and b/graphics/pokemon/dreepy/icon.png differ diff --git a/graphics/pokemon/drizzile/icon.png b/graphics/pokemon/drizzile/icon.png new file mode 100644 index 0000000000..f02ce10e28 Binary files /dev/null and b/graphics/pokemon/drizzile/icon.png differ diff --git a/graphics/pokemon/dubwool/icon.png b/graphics/pokemon/dubwool/icon.png new file mode 100644 index 0000000000..d22fed2344 Binary files /dev/null and b/graphics/pokemon/dubwool/icon.png differ diff --git a/graphics/pokemon/duraludon/icon.png b/graphics/pokemon/duraludon/icon.png new file mode 100644 index 0000000000..6025a5c254 Binary files /dev/null and b/graphics/pokemon/duraludon/icon.png differ diff --git a/graphics/pokemon/eevee/icon.png b/graphics/pokemon/eevee/icon.png index ccc2ff7896..e7385ed6c5 100644 Binary files a/graphics/pokemon/eevee/icon.png and b/graphics/pokemon/eevee/icon.png differ diff --git a/graphics/pokemon/eiscue/icon.png b/graphics/pokemon/eiscue/icon.png new file mode 100644 index 0000000000..800e244f5a Binary files /dev/null and b/graphics/pokemon/eiscue/icon.png differ diff --git a/graphics/pokemon/eiscue/noice_face/icon.png b/graphics/pokemon/eiscue/noice_face/icon.png new file mode 100644 index 0000000000..b0822bc01c Binary files /dev/null and b/graphics/pokemon/eiscue/noice_face/icon.png differ diff --git a/graphics/pokemon/eldegoss/icon.png b/graphics/pokemon/eldegoss/icon.png new file mode 100644 index 0000000000..bb22f1b6c1 Binary files /dev/null and b/graphics/pokemon/eldegoss/icon.png differ diff --git a/graphics/pokemon/eternatus/eternamax/back.png b/graphics/pokemon/eternatus/eternamax/back.png new file mode 100644 index 0000000000..7d6f7f4842 Binary files /dev/null and b/graphics/pokemon/eternatus/eternamax/back.png differ diff --git a/graphics/pokemon/eternatus/eternamax/front.png b/graphics/pokemon/eternatus/eternamax/front.png new file mode 100644 index 0000000000..60d41e2584 Binary files /dev/null and b/graphics/pokemon/eternatus/eternamax/front.png differ diff --git a/graphics/pokemon/eternatus/eternamax/normal.pal b/graphics/pokemon/eternatus/eternamax/normal.pal new file mode 100644 index 0000000000..8cee5aab5e --- /dev/null +++ b/graphics/pokemon/eternatus/eternamax/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +56 40 112 +32 16 72 +16 16 16 +224 40 184 +240 136 208 +248 248 248 +168 40 72 +224 48 48 +56 16 184 +96 88 192 +248 136 136 +248 80 80 +248 176 176 +248 216 216 +0 0 0 diff --git a/graphics/pokemon/eternatus/eternamax/shiny.pal b/graphics/pokemon/eternatus/eternamax/shiny.pal new file mode 100644 index 0000000000..2d39e0b86a --- /dev/null +++ b/graphics/pokemon/eternatus/eternamax/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +104 32 104 +72 16 64 +16 16 16 +224 40 184 +240 136 208 +248 248 248 +168 40 72 +224 48 48 +168 24 168 +208 48 232 +248 136 136 +248 80 80 +248 176 176 +248 216 216 +0 0 0 diff --git a/graphics/pokemon/eternatus/icon.png b/graphics/pokemon/eternatus/icon.png new file mode 100644 index 0000000000..60797c604f Binary files /dev/null and b/graphics/pokemon/eternatus/icon.png differ diff --git a/graphics/pokemon/falinks/icon.png b/graphics/pokemon/falinks/icon.png new file mode 100644 index 0000000000..e8b750bd5b Binary files /dev/null and b/graphics/pokemon/falinks/icon.png differ diff --git a/graphics/pokemon/farfetchd/galarian/icon.png b/graphics/pokemon/farfetchd/galarian/icon.png new file mode 100644 index 0000000000..2dda2cd262 Binary files /dev/null and b/graphics/pokemon/farfetchd/galarian/icon.png differ diff --git a/graphics/pokemon/flapple/icon.png b/graphics/pokemon/flapple/icon.png new file mode 100644 index 0000000000..e8d8660fed Binary files /dev/null and b/graphics/pokemon/flapple/icon.png differ diff --git a/graphics/pokemon/flareon/icon.png b/graphics/pokemon/flareon/icon.png index 689df4a510..96092e7eef 100644 Binary files a/graphics/pokemon/flareon/icon.png and b/graphics/pokemon/flareon/icon.png differ diff --git a/graphics/pokemon/frosmoth/icon.png b/graphics/pokemon/frosmoth/icon.png new file mode 100644 index 0000000000..3e71a143ed Binary files /dev/null and b/graphics/pokemon/frosmoth/icon.png differ diff --git a/graphics/pokemon/gossifleur/icon.png b/graphics/pokemon/gossifleur/icon.png new file mode 100644 index 0000000000..74446ed5df Binary files /dev/null and b/graphics/pokemon/gossifleur/icon.png differ diff --git a/graphics/pokemon/grapploct/icon.png b/graphics/pokemon/grapploct/icon.png new file mode 100644 index 0000000000..dda18023ec Binary files /dev/null and b/graphics/pokemon/grapploct/icon.png differ diff --git a/graphics/pokemon/grimmsnarl/icon.png b/graphics/pokemon/grimmsnarl/icon.png new file mode 100644 index 0000000000..d6f921cf0f Binary files /dev/null and b/graphics/pokemon/grimmsnarl/icon.png differ diff --git a/graphics/pokemon/grookey/icon.png b/graphics/pokemon/grookey/icon.png new file mode 100644 index 0000000000..f25d1f115c Binary files /dev/null and b/graphics/pokemon/grookey/icon.png differ diff --git a/graphics/pokemon/hatenna/icon.png b/graphics/pokemon/hatenna/icon.png new file mode 100644 index 0000000000..6dde7e200a Binary files /dev/null and b/graphics/pokemon/hatenna/icon.png differ diff --git a/graphics/pokemon/hatterene/icon.png b/graphics/pokemon/hatterene/icon.png new file mode 100644 index 0000000000..aae700b18e Binary files /dev/null and b/graphics/pokemon/hatterene/icon.png differ diff --git a/graphics/pokemon/hattrem/icon.png b/graphics/pokemon/hattrem/icon.png new file mode 100644 index 0000000000..e498c4d77e Binary files /dev/null and b/graphics/pokemon/hattrem/icon.png differ diff --git a/graphics/pokemon/impidimp/icon.png b/graphics/pokemon/impidimp/icon.png new file mode 100644 index 0000000000..e889a80d44 Binary files /dev/null and b/graphics/pokemon/impidimp/icon.png differ diff --git a/graphics/pokemon/indeedee/female/icon.png b/graphics/pokemon/indeedee/female/icon.png new file mode 100644 index 0000000000..ca9aeda076 Binary files /dev/null and b/graphics/pokemon/indeedee/female/icon.png differ diff --git a/graphics/pokemon/indeedee/icon.png b/graphics/pokemon/indeedee/icon.png new file mode 100644 index 0000000000..ed83aad7cd Binary files /dev/null and b/graphics/pokemon/indeedee/icon.png differ diff --git a/graphics/pokemon/inteleon/back.png b/graphics/pokemon/inteleon/back.png new file mode 100644 index 0000000000..57f6c40c90 Binary files /dev/null and b/graphics/pokemon/inteleon/back.png differ diff --git a/graphics/pokemon/inteleon/front.png b/graphics/pokemon/inteleon/front.png new file mode 100644 index 0000000000..3ae0514565 Binary files /dev/null and b/graphics/pokemon/inteleon/front.png differ diff --git a/graphics/pokemon/inteleon/icon.png b/graphics/pokemon/inteleon/icon.png new file mode 100644 index 0000000000..37fbd4b597 Binary files /dev/null and b/graphics/pokemon/inteleon/icon.png differ diff --git a/graphics/pokemon/inteleon/normal.pal b/graphics/pokemon/inteleon/normal.pal new file mode 100644 index 0000000000..52a9710013 --- /dev/null +++ b/graphics/pokemon/inteleon/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +0 56 104 +136 96 40 +232 200 88 +240 248 136 +24 120 192 +0 88 152 +80 152 192 +152 208 224 +16 16 16 +224 160 40 +248 248 248 +48 48 40 +96 96 96 +72 72 72 +248 248 248 diff --git a/graphics/pokemon/inteleon/shiny.pal b/graphics/pokemon/inteleon/shiny.pal new file mode 100644 index 0000000000..50344c79a4 --- /dev/null +++ b/graphics/pokemon/inteleon/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +0 64 112 +136 40 56 +232 88 144 +248 136 176 +0 200 200 +8 160 168 +0 96 160 +16 120 192 +16 16 16 +224 160 40 +248 248 248 +152 152 168 +240 248 248 +192 200 208 +96 96 96 diff --git a/graphics/pokemon/kyurem/black/anim_front.png b/graphics/pokemon/kyurem/black/anim_front.png index 7a8d8b9d6c..71013f7a3f 100644 Binary files a/graphics/pokemon/kyurem/black/anim_front.png and b/graphics/pokemon/kyurem/black/anim_front.png differ diff --git a/graphics/pokemon/kyurem/black/back.png b/graphics/pokemon/kyurem/black/back.png index 6146678a6a..4e9c83539f 100644 Binary files a/graphics/pokemon/kyurem/black/back.png and b/graphics/pokemon/kyurem/black/back.png differ diff --git a/graphics/pokemon/kyurem/black/front.png b/graphics/pokemon/kyurem/black/front.png index 89609f659e..ccba4d35a3 100644 Binary files a/graphics/pokemon/kyurem/black/front.png and b/graphics/pokemon/kyurem/black/front.png differ diff --git a/graphics/pokemon/kyurem/black/normal.pal b/graphics/pokemon/kyurem/black/normal.pal index 670d803231..bdb3fe453b 100644 --- a/graphics/pokemon/kyurem/black/normal.pal +++ b/graphics/pokemon/kyurem/black/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +153 210 164 +36 39 43 +173 228 247 16 16 16 -56 56 64 -56 80 96 -168 224 240 -120 152 160 -32 32 40 -16 24 32 -128 96 0 -248 208 24 -152 160 168 -104 104 112 -224 224 216 -64 72 88 -48 48 56 -0 0 0 +123 157 160 +156 166 173 +57 62 66 +60 84 96 +104 111 119 +23 29 33 +0 197 255 +0 106 189 +255 212 25 +132 99 0 +71 78 89 +230 230 222 diff --git a/graphics/pokemon/kyurem/black/shiny.pal b/graphics/pokemon/kyurem/black/shiny.pal index bf8756aeaf..da69e67562 100644 --- a/graphics/pokemon/kyurem/black/shiny.pal +++ b/graphics/pokemon/kyurem/black/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +153 210 164 +36 39 43 +173 228 247 16 16 16 -56 56 48 -56 56 96 -192 200 240 -120 144 200 -40 40 32 -24 24 16 -128 32 104 -232 64 176 -88 120 104 -40 72 56 -224 224 216 -24 48 40 -48 48 56 -0 0 0 +122 147 201 +96 128 108 +57 62 66 +58 58 96 +48 80 56 +23 29 33 +64 248 64 +40 108 40 +240 64 180 +130 40 108 +32 56 40 +230 230 222 diff --git a/graphics/pokemon/kyurem/white/anim_front.png b/graphics/pokemon/kyurem/white/anim_front.png index 8728cb3adc..b55d6c89a7 100644 Binary files a/graphics/pokemon/kyurem/white/anim_front.png and b/graphics/pokemon/kyurem/white/anim_front.png differ diff --git a/graphics/pokemon/kyurem/white/back.png b/graphics/pokemon/kyurem/white/back.png index c3e89dca1d..0f76b5c459 100644 Binary files a/graphics/pokemon/kyurem/white/back.png and b/graphics/pokemon/kyurem/white/back.png differ diff --git a/graphics/pokemon/kyurem/white/front.png b/graphics/pokemon/kyurem/white/front.png index b1a53d59c0..7e7314e767 100644 Binary files a/graphics/pokemon/kyurem/white/front.png and b/graphics/pokemon/kyurem/white/front.png differ diff --git a/graphics/pokemon/kyurem/white/normal.pal b/graphics/pokemon/kyurem/white/normal.pal index 744df97ce5..cc136a09e6 100644 --- a/graphics/pokemon/kyurem/white/normal.pal +++ b/graphics/pokemon/kyurem/white/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 152 160 +153 210 164 +173 228 247 +123 157 160 +255 255 255 16 16 16 -120 104 96 -168 224 240 -248 248 248 -192 176 168 -64 72 88 -248 208 24 -56 80 96 -152 160 168 -104 104 112 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +156 166 173 +71 78 89 +104 111 119 +60 84 96 +230 74 66 +148 41 33 +198 181 169 +122 109 101 +255 173 99 +255 212 25 +255 222 58 diff --git a/graphics/pokemon/kyurem/white/shiny.pal b/graphics/pokemon/kyurem/white/shiny.pal index d761c49278..ba7f1f9e26 100644 --- a/graphics/pokemon/kyurem/white/shiny.pal +++ b/graphics/pokemon/kyurem/white/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 144 200 +153 210 164 +196 203 240 +122 147 200 +255 255 255 16 16 16 -96 96 112 -192 200 240 -248 248 248 -168 160 208 +90 115 128 32 48 56 -232 88 184 -56 56 96 -88 112 120 -48 72 80 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +48 75 81 +58 58 96 +230 74 66 +148 41 33 +198 181 169 +103 99 119 +255 173 99 +237 90 188 +255 222 58 diff --git a/graphics/pokemon/leafeon/icon.png b/graphics/pokemon/leafeon/icon.png index f3c269b37f..dd446932be 100644 Binary files a/graphics/pokemon/leafeon/icon.png and b/graphics/pokemon/leafeon/icon.png differ diff --git a/graphics/pokemon/linoone/galarian/icon.png b/graphics/pokemon/linoone/galarian/icon.png new file mode 100644 index 0000000000..12437ca3ef Binary files /dev/null and b/graphics/pokemon/linoone/galarian/icon.png differ diff --git a/graphics/pokemon/meowth/galarian/icon.png b/graphics/pokemon/meowth/galarian/icon.png new file mode 100644 index 0000000000..5292f0b549 Binary files /dev/null and b/graphics/pokemon/meowth/galarian/icon.png differ diff --git a/graphics/pokemon/milcery/icon.png b/graphics/pokemon/milcery/icon.png new file mode 100644 index 0000000000..0e0b54d6c0 Binary files /dev/null and b/graphics/pokemon/milcery/icon.png differ diff --git a/graphics/pokemon/morgrem/icon.png b/graphics/pokemon/morgrem/icon.png new file mode 100644 index 0000000000..54112d6b60 Binary files /dev/null and b/graphics/pokemon/morgrem/icon.png differ diff --git a/graphics/pokemon/morpeko/hangry/icon.png b/graphics/pokemon/morpeko/hangry/icon.png new file mode 100644 index 0000000000..94b69b3223 Binary files /dev/null and b/graphics/pokemon/morpeko/hangry/icon.png differ diff --git a/graphics/pokemon/morpeko/icon.png b/graphics/pokemon/morpeko/icon.png new file mode 100644 index 0000000000..b6503b42fd Binary files /dev/null and b/graphics/pokemon/morpeko/icon.png differ diff --git a/graphics/pokemon/mr_mime/galarian/icon.png b/graphics/pokemon/mr_mime/galarian/icon.png new file mode 100644 index 0000000000..c2c7c06ee4 Binary files /dev/null and b/graphics/pokemon/mr_mime/galarian/icon.png differ diff --git a/graphics/pokemon/mr_rime/icon.png b/graphics/pokemon/mr_rime/icon.png new file mode 100644 index 0000000000..f13b60b4da Binary files /dev/null and b/graphics/pokemon/mr_rime/icon.png differ diff --git a/graphics/pokemon/nickit/icon.png b/graphics/pokemon/nickit/icon.png new file mode 100644 index 0000000000..b7095d9c70 Binary files /dev/null and b/graphics/pokemon/nickit/icon.png differ diff --git a/graphics/pokemon/obstagoon/icon.png b/graphics/pokemon/obstagoon/icon.png new file mode 100644 index 0000000000..47edf20f27 Binary files /dev/null and b/graphics/pokemon/obstagoon/icon.png differ diff --git a/graphics/pokemon/orbeetle/icon.png b/graphics/pokemon/orbeetle/icon.png new file mode 100644 index 0000000000..9e8ddbed61 Binary files /dev/null and b/graphics/pokemon/orbeetle/icon.png differ diff --git a/graphics/pokemon/palkia/anim_front.png b/graphics/pokemon/palkia/anim_front.png index 273753b179..3b408c2a6f 100644 Binary files a/graphics/pokemon/palkia/anim_front.png and b/graphics/pokemon/palkia/anim_front.png differ diff --git a/graphics/pokemon/palkia/front.png b/graphics/pokemon/palkia/front.png index 3821537abd..16ae684d58 100644 Binary files a/graphics/pokemon/palkia/front.png and b/graphics/pokemon/palkia/front.png differ diff --git a/graphics/pokemon/perrserker/icon.png b/graphics/pokemon/perrserker/icon.png new file mode 100644 index 0000000000..fe93bd3172 Binary files /dev/null and b/graphics/pokemon/perrserker/icon.png differ diff --git a/graphics/pokemon/polteageist/icon.png b/graphics/pokemon/polteageist/icon.png new file mode 100644 index 0000000000..22fba612d4 Binary files /dev/null and b/graphics/pokemon/polteageist/icon.png differ diff --git a/graphics/pokemon/ponyta/galarian/icon.png b/graphics/pokemon/ponyta/galarian/icon.png new file mode 100644 index 0000000000..3db1d91a5b Binary files /dev/null and b/graphics/pokemon/ponyta/galarian/icon.png differ diff --git a/graphics/pokemon/raboot/icon.png b/graphics/pokemon/raboot/icon.png new file mode 100644 index 0000000000..80df666319 Binary files /dev/null and b/graphics/pokemon/raboot/icon.png differ diff --git a/graphics/pokemon/rapidash/galarian/icon.png b/graphics/pokemon/rapidash/galarian/icon.png new file mode 100644 index 0000000000..abd13ec131 Binary files /dev/null and b/graphics/pokemon/rapidash/galarian/icon.png differ diff --git a/graphics/pokemon/regieleki/back.png b/graphics/pokemon/regieleki/back.png new file mode 100644 index 0000000000..59d39eae45 Binary files /dev/null and b/graphics/pokemon/regieleki/back.png differ diff --git a/graphics/pokemon/regieleki/front.png b/graphics/pokemon/regieleki/front.png new file mode 100644 index 0000000000..d88744bcd7 Binary files /dev/null and b/graphics/pokemon/regieleki/front.png differ diff --git a/graphics/pokemon/regieleki/normal.pal b/graphics/pokemon/regieleki/normal.pal new file mode 100644 index 0000000000..220bd018d1 --- /dev/null +++ b/graphics/pokemon/regieleki/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 80 40 +224 232 24 +16 16 16 +208 168 8 +248 248 192 +248 152 192 +40 56 96 +48 80 144 +72 120 200 +136 168 216 +184 136 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/regieleki/shiny.pal b/graphics/pokemon/regieleki/shiny.pal new file mode 100644 index 0000000000..27ad1c6bb8 --- /dev/null +++ b/graphics/pokemon/regieleki/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 80 40 +224 232 24 +16 16 16 +208 168 8 +248 248 192 +248 152 192 +104 104 104 +168 160 200 +216 216 216 +248 248 248 +184 136 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/rillaboom/back.png b/graphics/pokemon/rillaboom/back.png new file mode 100644 index 0000000000..decc2fbaf0 Binary files /dev/null and b/graphics/pokemon/rillaboom/back.png differ diff --git a/graphics/pokemon/rillaboom/front.png b/graphics/pokemon/rillaboom/front.png new file mode 100644 index 0000000000..b3822a3b4f Binary files /dev/null and b/graphics/pokemon/rillaboom/front.png differ diff --git a/graphics/pokemon/rillaboom/icon.png b/graphics/pokemon/rillaboom/icon.png new file mode 100644 index 0000000000..1315d12141 Binary files /dev/null and b/graphics/pokemon/rillaboom/icon.png differ diff --git a/graphics/pokemon/rillaboom/normal.pal b/graphics/pokemon/rillaboom/normal.pal new file mode 100644 index 0000000000..2cdb5f9754 --- /dev/null +++ b/graphics/pokemon/rillaboom/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +0 40 24 +0 128 64 +0 88 40 +16 16 16 +104 64 64 +176 152 120 +48 24 32 +248 248 248 +64 40 40 +248 112 56 +176 64 56 +128 112 80 +240 224 160 +176 120 72 +144 104 64 diff --git a/graphics/pokemon/rillaboom/shiny.pal b/graphics/pokemon/rillaboom/shiny.pal new file mode 100644 index 0000000000..9bce7e6859 --- /dev/null +++ b/graphics/pokemon/rillaboom/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 64 0 +136 176 0 +88 112 0 +16 16 16 +88 40 48 +152 144 128 +40 16 32 +248 248 248 +56 24 40 +248 112 56 +176 64 56 +96 88 72 +240 224 160 +176 120 72 +144 104 64 diff --git a/graphics/pokemon/rolycoly/icon.png b/graphics/pokemon/rolycoly/icon.png new file mode 100644 index 0000000000..fb4108eaab Binary files /dev/null and b/graphics/pokemon/rolycoly/icon.png differ diff --git a/graphics/pokemon/rookidee/icon.png b/graphics/pokemon/rookidee/icon.png new file mode 100644 index 0000000000..b065237866 Binary files /dev/null and b/graphics/pokemon/rookidee/icon.png differ diff --git a/graphics/pokemon/runerigus/icon.png b/graphics/pokemon/runerigus/icon.png new file mode 100644 index 0000000000..9110ff9f9f Binary files /dev/null and b/graphics/pokemon/runerigus/icon.png differ diff --git a/graphics/pokemon/sandaconda/icon.png b/graphics/pokemon/sandaconda/icon.png new file mode 100644 index 0000000000..bfde35f579 Binary files /dev/null and b/graphics/pokemon/sandaconda/icon.png differ diff --git a/graphics/pokemon/scorbunny/icon.png b/graphics/pokemon/scorbunny/icon.png new file mode 100644 index 0000000000..84c83b3010 Binary files /dev/null and b/graphics/pokemon/scorbunny/icon.png differ diff --git a/graphics/pokemon/silicobra/icon.png b/graphics/pokemon/silicobra/icon.png new file mode 100644 index 0000000000..c48874a723 Binary files /dev/null and b/graphics/pokemon/silicobra/icon.png differ diff --git a/graphics/pokemon/sinistea/icon.png b/graphics/pokemon/sinistea/icon.png new file mode 100644 index 0000000000..0f51546855 Binary files /dev/null and b/graphics/pokemon/sinistea/icon.png differ diff --git a/graphics/pokemon/sirfetchd/icon.png b/graphics/pokemon/sirfetchd/icon.png new file mode 100644 index 0000000000..eefa9a738c Binary files /dev/null and b/graphics/pokemon/sirfetchd/icon.png differ diff --git a/graphics/pokemon/sizzlipede/icon.png b/graphics/pokemon/sizzlipede/icon.png new file mode 100644 index 0000000000..e3c83ae043 Binary files /dev/null and b/graphics/pokemon/sizzlipede/icon.png differ diff --git a/graphics/pokemon/snom/icon.png b/graphics/pokemon/snom/icon.png new file mode 100644 index 0000000000..d402de3f54 Binary files /dev/null and b/graphics/pokemon/snom/icon.png differ diff --git a/graphics/pokemon/sobble/icon.png b/graphics/pokemon/sobble/icon.png new file mode 100644 index 0000000000..69327e0184 Binary files /dev/null and b/graphics/pokemon/sobble/icon.png differ diff --git a/graphics/pokemon/stonjourner/icon.png b/graphics/pokemon/stonjourner/icon.png new file mode 100644 index 0000000000..8fadb85678 Binary files /dev/null and b/graphics/pokemon/stonjourner/icon.png differ diff --git a/graphics/pokemon/stunfisk/galarian/icon.png b/graphics/pokemon/stunfisk/galarian/icon.png new file mode 100644 index 0000000000..729a18bf15 Binary files /dev/null and b/graphics/pokemon/stunfisk/galarian/icon.png differ diff --git a/graphics/pokemon/thievul/icon.png b/graphics/pokemon/thievul/icon.png new file mode 100644 index 0000000000..b96aa74770 Binary files /dev/null and b/graphics/pokemon/thievul/icon.png differ diff --git a/graphics/pokemon/thwackey/icon.png b/graphics/pokemon/thwackey/icon.png new file mode 100644 index 0000000000..d093da09a3 Binary files /dev/null and b/graphics/pokemon/thwackey/icon.png differ diff --git a/graphics/pokemon/toxtricity/icon.png b/graphics/pokemon/toxtricity/icon.png new file mode 100644 index 0000000000..e3d8123b55 Binary files /dev/null and b/graphics/pokemon/toxtricity/icon.png differ diff --git a/graphics/pokemon/toxtricity/low_key/icon.png b/graphics/pokemon/toxtricity/low_key/icon.png new file mode 100644 index 0000000000..daf034d6a5 Binary files /dev/null and b/graphics/pokemon/toxtricity/low_key/icon.png differ diff --git a/graphics/pokemon/weezing/galarian/icon.png b/graphics/pokemon/weezing/galarian/icon.png new file mode 100644 index 0000000000..79c7dd6bfe Binary files /dev/null and b/graphics/pokemon/weezing/galarian/icon.png differ diff --git a/graphics/pokemon/wooloo/icon.png b/graphics/pokemon/wooloo/icon.png new file mode 100644 index 0000000000..205d154164 Binary files /dev/null and b/graphics/pokemon/wooloo/icon.png differ diff --git a/graphics/pokemon/yamask/galarian/icon.png b/graphics/pokemon/yamask/galarian/icon.png new file mode 100644 index 0000000000..9184733722 Binary files /dev/null and b/graphics/pokemon/yamask/galarian/icon.png differ diff --git a/graphics/pokemon/yamper/icon.png b/graphics/pokemon/yamper/icon.png new file mode 100644 index 0000000000..4c445402e2 Binary files /dev/null and b/graphics/pokemon/yamper/icon.png differ diff --git a/graphics/pokemon/zacian/crowned_sword/icon.png b/graphics/pokemon/zacian/crowned_sword/icon.png new file mode 100644 index 0000000000..7136f24cc7 Binary files /dev/null and b/graphics/pokemon/zacian/crowned_sword/icon.png differ diff --git a/graphics/pokemon/zacian/icon.png b/graphics/pokemon/zacian/icon.png new file mode 100644 index 0000000000..474e53ff9d Binary files /dev/null and b/graphics/pokemon/zacian/icon.png differ diff --git a/graphics/pokemon/zamazenta/crowned_shield/icon.png b/graphics/pokemon/zamazenta/crowned_shield/icon.png new file mode 100644 index 0000000000..52be47e349 Binary files /dev/null and b/graphics/pokemon/zamazenta/crowned_shield/icon.png differ diff --git a/graphics/pokemon/zamazenta/icon.png b/graphics/pokemon/zamazenta/icon.png new file mode 100644 index 0000000000..7d9d722e02 Binary files /dev/null and b/graphics/pokemon/zamazenta/icon.png differ diff --git a/graphics/pokemon/zigzagoon/galarian/icon.png b/graphics/pokemon/zigzagoon/galarian/icon.png new file mode 100644 index 0000000000..d83d717d0c Binary files /dev/null and b/graphics/pokemon/zigzagoon/galarian/icon.png differ diff --git a/include/constants/items.h b/include/constants/items.h index 94a7f06914..4b134bebfa 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -105,13 +105,13 @@ #define ITEM_MAX_REPEL 92 #define ITEM_ABILITY_CAPSULE 93 // Wings -#define ITEM_HEALTH_WING 94 -#define ITEM_MUSCLE_WING 95 -#define ITEM_RESIST_WING 96 -#define ITEM_GENIUS_WING 97 -#define ITEM_CLEVER_WING 98 -#define ITEM_SWIFT_WING 99 -#define ITEM_PRETTY_WING 100 +#define ITEM_HEALTH_FEATHER 94 +#define ITEM_MUSCLE_FEATHER 95 +#define ITEM_RESIST_FEATHER 96 +#define ITEM_GENIUS_FEATHER 97 +#define ITEM_CLEVER_FEATHER 98 +#define ITEM_SWIFT_FEATHER 99 +#define ITEM_PRETTY_FEATHER 100 // Evolution stones #define ITEM_SUN_STONE 101 #define ITEM_MOON_STONE 102 diff --git a/include/graphics.h b/include/graphics.h index 4e05a911bd..1c538694bc 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -879,13 +879,13 @@ extern const u32 gMonFrontPic_Meltan[]; extern const u32 gMonFrontPic_Melmetal[]; extern const u32 gMonFrontPic_Grookey[]; extern const u32 gMonFrontPic_Thwackey[]; -//extern const u32 gMonFrontPic_Rillaboom[]; +extern const u32 gMonFrontPic_Rillaboom[]; extern const u32 gMonFrontPic_Scorbunny[]; extern const u32 gMonFrontPic_Raboot[]; extern const u32 gMonFrontPic_Cinderace[]; extern const u32 gMonFrontPic_Sobble[]; extern const u32 gMonFrontPic_Drizzile[]; -//extern const u32 gMonFrontPic_Inteleon[]; +extern const u32 gMonFrontPic_Inteleon[]; extern const u32 gMonFrontPic_Skwovet[]; extern const u32 gMonFrontPic_Greedent[]; extern const u32 gMonFrontPic_Rookidee[]; @@ -961,7 +961,7 @@ extern const u32 gMonFrontPic_Eternatus[]; extern const u32 gMonFrontPic_Kubfu[]; extern const u32 gMonFrontPic_Urshifu[]; extern const u32 gMonFrontPic_Zarude[]; -//extern const u32 gMonFrontPic_Regieleki[]; +extern const u32 gMonFrontPic_Regieleki[]; extern const u32 gMonFrontPic_Regidrago[]; extern const u32 gMonFrontPic_Glastrier[]; extern const u32 gMonFrontPic_Spectrier[]; @@ -1198,7 +1198,7 @@ extern const u32 gMonFrontPic_IndeedeeFemale[]; extern const u32 gMonFrontPic_MorpekoHangry[]; extern const u32 gMonFrontPic_ZacianCrownedSword[]; extern const u32 gMonFrontPic_ZamazentaCrownedShield[]; -//extern const u32 gMonFrontPic_EternatusEternamax[]; +extern const u32 gMonFrontPic_EternatusEternamax[]; extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonFrontPic_ZarudeDada[]; extern const u32 gMonFrontPic_CalyrexIceRider[]; @@ -2019,13 +2019,13 @@ extern const u32 gMonBackPic_Meltan[]; extern const u32 gMonBackPic_Melmetal[]; extern const u32 gMonBackPic_Grookey[]; extern const u32 gMonBackPic_Thwackey[]; -//extern const u32 gMonBackPic_Rillaboom[]; +extern const u32 gMonBackPic_Rillaboom[]; extern const u32 gMonBackPic_Scorbunny[]; extern const u32 gMonBackPic_Raboot[]; extern const u32 gMonBackPic_Cinderace[]; extern const u32 gMonBackPic_Sobble[]; extern const u32 gMonBackPic_Drizzile[]; -//extern const u32 gMonBackPic_Inteleon[]; +extern const u32 gMonBackPic_Inteleon[]; extern const u32 gMonBackPic_Skwovet[]; extern const u32 gMonBackPic_Greedent[]; extern const u32 gMonBackPic_Rookidee[]; @@ -2101,7 +2101,7 @@ extern const u32 gMonBackPic_Eternatus[]; extern const u32 gMonBackPic_Kubfu[]; extern const u32 gMonBackPic_Urshifu[]; extern const u32 gMonBackPic_Zarude[]; -//extern const u32 gMonBackPic_Regieleki[]; +extern const u32 gMonBackPic_Regieleki[]; extern const u32 gMonBackPic_Regidrago[]; extern const u32 gMonBackPic_Glastrier[]; extern const u32 gMonBackPic_Spectrier[]; @@ -2338,7 +2338,7 @@ extern const u32 gMonBackPic_IndeedeeFemale[]; extern const u32 gMonBackPic_MorpekoHangry[]; extern const u32 gMonBackPic_ZacianCrownedSword[]; extern const u32 gMonBackPic_ZamazentaCrownedShield[]; -//extern const u32 gMonBackPic_EternatusEternamax[]; +extern const u32 gMonBackPic_EternatusEternamax[]; extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonBackPic_ZarudeDada[]; extern const u32 gMonBackPic_CalyrexIceRider[]; @@ -3157,13 +3157,13 @@ extern const u32 gMonPalette_Meltan[]; extern const u32 gMonPalette_Melmetal[]; extern const u32 gMonPalette_Grookey[]; extern const u32 gMonPalette_Thwackey[]; -//extern const u32 gMonPalette_Rillaboom[]; +extern const u32 gMonPalette_Rillaboom[]; extern const u32 gMonPalette_Scorbunny[]; extern const u32 gMonPalette_Raboot[]; extern const u32 gMonPalette_Cinderace[]; extern const u32 gMonPalette_Sobble[]; extern const u32 gMonPalette_Drizzile[]; -//extern const u32 gMonPalette_Inteleon[]; +extern const u32 gMonPalette_Inteleon[]; extern const u32 gMonPalette_Skwovet[]; extern const u32 gMonPalette_Greedent[]; extern const u32 gMonPalette_Rookidee[]; @@ -3239,7 +3239,7 @@ extern const u32 gMonPalette_Eternatus[]; extern const u32 gMonPalette_Kubfu[]; extern const u32 gMonPalette_Urshifu[]; extern const u32 gMonPalette_Zarude[]; -//extern const u32 gMonPalette_Regieleki[]; +extern const u32 gMonPalette_Regieleki[]; extern const u32 gMonPalette_Regidrago[]; extern const u32 gMonPalette_Glastrier[]; extern const u32 gMonPalette_Spectrier[]; @@ -3502,7 +3502,7 @@ extern const u32 gMonPalette_IndeedeeFemale[]; extern const u32 gMonPalette_MorpekoHangry[]; extern const u32 gMonPalette_ZacianCrownedSword[]; extern const u32 gMonPalette_ZamazentaCrownedShield[]; -//extern const u32 gMonPalette_EternatusEternamax[]; +extern const u32 gMonPalette_EternatusEternamax[]; extern const u32 gMonPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonPalette_ZarudeDada[]; extern const u32 gMonPalette_CalyrexIceRider[]; @@ -4322,13 +4322,13 @@ extern const u32 gMonShinyPalette_Meltan[]; extern const u32 gMonShinyPalette_Melmetal[]; extern const u32 gMonShinyPalette_Grookey[]; extern const u32 gMonShinyPalette_Thwackey[]; -//extern const u32 gMonShinyPalette_Rillaboom[]; +extern const u32 gMonShinyPalette_Rillaboom[]; extern const u32 gMonShinyPalette_Scorbunny[]; extern const u32 gMonShinyPalette_Raboot[]; extern const u32 gMonShinyPalette_Cinderace[]; extern const u32 gMonShinyPalette_Sobble[]; extern const u32 gMonShinyPalette_Drizzile[]; -//extern const u32 gMonShinyPalette_Inteleon[]; +extern const u32 gMonShinyPalette_Inteleon[]; extern const u32 gMonShinyPalette_Skwovet[]; extern const u32 gMonShinyPalette_Greedent[]; extern const u32 gMonShinyPalette_Rookidee[]; @@ -4404,7 +4404,7 @@ extern const u32 gMonShinyPalette_Eternatus[]; extern const u32 gMonShinyPalette_Kubfu[]; extern const u32 gMonShinyPalette_Urshifu[]; extern const u32 gMonShinyPalette_Zarude[]; -//extern const u32 gMonShinyPalette_Regieleki[]; +extern const u32 gMonShinyPalette_Regieleki[]; extern const u32 gMonShinyPalette_Regidrago[]; extern const u32 gMonShinyPalette_Glastrier[]; extern const u32 gMonShinyPalette_Spectrier[]; @@ -4661,7 +4661,7 @@ extern const u32 gMonShinyPalette_IndeedeeFemale[]; extern const u32 gMonShinyPalette_MorpekoHangry[]; extern const u32 gMonShinyPalette_ZacianCrownedSword[]; extern const u32 gMonShinyPalette_ZamazentaCrownedShield[]; -//extern const u32 gMonShinyPalette_EternatusEternamax[]; +extern const u32 gMonShinyPalette_EternatusEternamax[]; extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonShinyPalette_ZarudeDada[]; extern const u32 gMonShinyPalette_CalyrexIceRider[]; @@ -5477,6 +5477,95 @@ extern const u8 gMonIcon_Blacephalon[]; extern const u8 gMonIcon_Zeraora[]; extern const u8 gMonIcon_Meltan[]; extern const u8 gMonIcon_Melmetal[]; +extern const u8 gMonIcon_Grookey[]; +extern const u8 gMonIcon_Thwackey[]; +extern const u8 gMonIcon_Rillaboom[]; +extern const u8 gMonIcon_Scorbunny[]; +extern const u8 gMonIcon_Raboot[]; +extern const u8 gMonIcon_Cinderace[]; +extern const u8 gMonIcon_Sobble[]; +extern const u8 gMonIcon_Drizzile[]; +extern const u8 gMonIcon_Inteleon[]; +//extern const u8 gMonIcon_Skwovet[]; +//extern const u8 gMonIcon_Greedent[]; +extern const u8 gMonIcon_Rookidee[]; +extern const u8 gMonIcon_Corvisquire[]; +extern const u8 gMonIcon_Corviknight[]; +extern const u8 gMonIcon_Blipbug[]; +extern const u8 gMonIcon_Dottler[]; +extern const u8 gMonIcon_Orbeetle[]; +extern const u8 gMonIcon_Nickit[]; +extern const u8 gMonIcon_Thievul[]; +extern const u8 gMonIcon_Gossifleur[]; +extern const u8 gMonIcon_Eldegoss[]; +extern const u8 gMonIcon_Wooloo[]; +extern const u8 gMonIcon_Dubwool[]; +extern const u8 gMonIcon_Chewtle[]; +extern const u8 gMonIcon_Drednaw[]; +extern const u8 gMonIcon_Yamper[]; +extern const u8 gMonIcon_Boltund[]; +extern const u8 gMonIcon_Rolycoly[]; +extern const u8 gMonIcon_Carkol[]; +extern const u8 gMonIcon_Coalossal[]; +extern const u8 gMonIcon_Applin[]; +extern const u8 gMonIcon_Flapple[]; +extern const u8 gMonIcon_Appletun[]; +extern const u8 gMonIcon_Silicobra[]; +extern const u8 gMonIcon_Sandaconda[]; +extern const u8 gMonIcon_Cramorant[]; +//extern const u8 gMonIcon_Arrokuda[]; +//extern const u8 gMonIcon_Barraskewda[]; +//extern const u8 gMonIcon_Toxel[]; +extern const u8 gMonIcon_Toxtricity[]; +extern const u8 gMonIcon_Sizzlipede[]; +extern const u8 gMonIcon_Centiskorch[]; +extern const u8 gMonIcon_Clobbopus[]; +extern const u8 gMonIcon_Grapploct[]; +extern const u8 gMonIcon_Sinistea[]; +extern const u8 gMonIcon_Polteageist[]; +extern const u8 gMonIcon_Hatenna[]; +extern const u8 gMonIcon_Hattrem[]; +extern const u8 gMonIcon_Hatterene[]; +extern const u8 gMonIcon_Impidimp[]; +extern const u8 gMonIcon_Morgrem[]; +extern const u8 gMonIcon_Grimmsnarl[]; +extern const u8 gMonIcon_Obstagoon[]; +extern const u8 gMonIcon_Perrserker[]; +extern const u8 gMonIcon_Cursola[]; +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_Falinks[]; +//extern const u8 gMonIcon_Pincurchin[]; +extern const u8 gMonIcon_Snom[]; +extern const u8 gMonIcon_Frosmoth[]; +extern const u8 gMonIcon_Stonjourner[]; +extern const u8 gMonIcon_Eiscue[]; +extern const u8 gMonIcon_Indeedee[]; +extern const u8 gMonIcon_Morpeko[]; +extern const u8 gMonIcon_Cufant[]; +extern const u8 gMonIcon_Copperajah[]; +//extern const u8 gMonIcon_Dracozolt[]; +//extern const u8 gMonIcon_Arctozolt[]; +//extern const u8 gMonIcon_Dracovish[]; +//extern const u8 gMonIcon_Arctovish[]; +extern const u8 gMonIcon_Duraludon[]; +extern const u8 gMonIcon_Dreepy[]; +extern const u8 gMonIcon_Drakloak[]; +extern const u8 gMonIcon_Dragapult[]; +extern const u8 gMonIcon_Zacian[]; +extern const u8 gMonIcon_Zamazenta[]; +extern const u8 gMonIcon_Eternatus[]; +//extern const u8 gMonIcon_Kubfu[]; +//extern const u8 gMonIcon_Urshifu[]; +//extern const u8 gMonIcon_Zarude[]; +//extern const u8 gMonIcon_Regieleki[]; +//extern const u8 gMonIcon_Regidrago[]; +//extern const u8 gMonIcon_Glastrier[]; +//extern const u8 gMonIcon_Spectrier[]; +//extern const u8 gMonIcon_Calyrex[]; extern const u8 gMonIcon_VenusaurMega[]; extern const u8 gMonIcon_CharizardMegaX[]; extern const u8 gMonIcon_CharizardMegaY[]; @@ -5545,6 +5634,25 @@ extern const u8 gMonIcon_GrimerAlolan[]; extern const u8 gMonIcon_MukAlolan[]; extern const u8 gMonIcon_ExeggutorAlolan[]; extern const u8 gMonIcon_MarowakAlolan[]; +extern const u8 gMonIcon_MeowthGalarian[]; +extern const u8 gMonIcon_PonytaGalarian[]; +extern const u8 gMonIcon_RapidashGalarian[]; +//extern const u8 gMonIcon_SlowpokeGalarian[]; +//extern const u8 gMonIcon_SlowbroGalarian[]; +extern const u8 gMonIcon_FarfetchdGalarian[]; +extern const u8 gMonIcon_WeezingGalarian[]; +extern const u8 gMonIcon_MrMimeGalarian[]; +//extern const u8 gMonIcon_ArticunoGalarian[]; +//extern const u8 gMonIcon_ZapdosGalarian[]; +//extern const u8 gMonIcon_MoltresGalarian[]; +//extern const u8 gMonIcon_SlowkingGalarian[]; +extern const u8 gMonIcon_CorsolaGalarian[]; +extern const u8 gMonIcon_ZigzagoonGalarian[]; +extern const u8 gMonIcon_LinooneGalarian[]; +extern const u8 gMonIcon_DarumakaGalarian[]; +extern const u8 gMonIcon_DarmanitanGalarian[]; +extern const u8 gMonIcon_YamaskGalarian[]; +extern const u8 gMonIcon_StunfiskGalarian[]; extern const u8 gMonIcon_PikachuCosplay[]; extern const u8 gMonIcon_PikachuRockStar[]; extern const u8 gMonIcon_PikachuBelle[]; @@ -5608,6 +5716,7 @@ extern const u8 gMonIcon_GiratinaOrigin[]; extern const u8 gMonIcon_ShayminSky[]; extern const u8 gMonIcon_BasculinBlueStriped[]; extern const u8 gMonIcon_DarmanitanZenMode[]; +//extern const u8 gMonIcon_DarmanitanZenModeGalarian[]; extern const u8 gMonIcon_DeerlingSummer[]; extern const u8 gMonIcon_DeerlingAutumn[]; extern const u8 gMonIcon_DeerlingWinter[]; @@ -5687,6 +5796,27 @@ extern const u8 gMonIcon_NecrozmaDuskMane[]; extern const u8 gMonIcon_NecrozmaDawnWings[]; extern const u8 gMonIcon_NecrozmaUltra[]; extern const u8 gMonIcon_MagearnaOriginalColor[]; +extern const u8 gMonIcon_CramorantGulping[]; +extern const u8 gMonIcon_CramorantGorging[]; +extern const u8 gMonIcon_ToxtricityLowKey[]; +//extern const u8 gMonIcon_AlcremieRubyCream[]; +//extern const u8 gMonIcon_AlcremieMatchaCream[]; +//extern const u8 gMonIcon_AlcremieMintCream[]; +//extern const u8 gMonIcon_AlcremieLemonCream[]; +//extern const u8 gMonIcon_AlcremieSaltedCream[]; +//extern const u8 gMonIcon_AlcremieRubySwirl[]; +//extern const u8 gMonIcon_AlcremieCaramelSwirl[]; +//extern const u8 gMonIcon_AlcremieRainbowSwirl[]; +extern const u8 gMonIcon_EiscueNoiceFace[]; +extern const u8 gMonIcon_IndeedeeFemale[]; +extern const u8 gMonIcon_MorpekoHangry[]; +extern const u8 gMonIcon_ZacianCrownedSword[]; +extern const u8 gMonIcon_ZamazentaCrownedShield[]; +//extern const u8 gMonIcon_EternatusEternamax[]; +//extern const u8 gMonIcon_UrshifuRapidStrikeStyle[]; +//extern const u8 gMonIcon_ZarudeDada[]; +//extern const u8 gMonIcon_CalyrexIceRider[]; +//extern const u8 gMonIcon_CalyrexShadowRider[]; extern const u8 gMonIcon_Egg[]; extern const u8 gMonFootprint_QuestionMark[]; diff --git a/include/pokemon.h b/include/pokemon.h index b9785f898c..980274c111 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -209,7 +209,7 @@ struct BaseStats u8 safariZoneFleeRate; u8 bodyColor : 7; u8 noFlip : 1; - /* 0x1B */ u8 flags; + u8 flags; }; #include "constants/battle_config.h" diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index e279db7c18..25c9e25342 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -812,13 +812,13 @@ const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/front.4bpp const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz"); const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/front.4bpp.lz"); const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz"); -//const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); +const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); const u32 gMonFrontPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/front.4bpp.lz"); const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/front.4bpp.lz"); const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/front.4bpp.lz"); const u32 gMonFrontPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/front.4bpp.lz"); const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front.4bpp.lz"); -//const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); +const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/front.4bpp.lz"); const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz"); const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/front.4bpp.lz"); @@ -894,7 +894,7 @@ const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/fron const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/front.4bpp.lz"); const u32 gMonFrontPic_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/front.4bpp.lz"); -//const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz"); +const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz"); const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/front.4bpp.lz"); const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz"); const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz"); @@ -1131,7 +1131,7 @@ const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/ const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/front.4bpp.lz"); const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz"); const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz"); -//const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); +const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/front.4bpp.lz"); 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"); @@ -1952,13 +1952,13 @@ const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/back.4bpp.l const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/back.4bpp.lz"); const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz"); const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/back.4bpp.lz"); -//const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); +const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/back.4bpp.lz"); const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/back.4bpp.lz"); const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/back.4bpp.lz"); const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/back.4bpp.lz"); const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/back.4bpp.lz"); -//const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz"); +const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz"); const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/back.4bpp.lz"); const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/back.4bpp.lz"); const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/back.4bpp.lz"); @@ -2034,7 +2034,7 @@ const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/back. const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/back.4bpp.lz"); const u32 gMonBackPic_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/back.4bpp.lz"); -//const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); +const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.4bpp.lz"); const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz"); const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); @@ -2271,7 +2271,7 @@ const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/f const u32 gMonBackPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/back.4bpp.lz"); const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/back.4bpp.lz"); const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/back.4bpp.lz"); -//const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/back.4bpp.lz"); +const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/back.4bpp.lz"); const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/back.4bpp.lz"); 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"); @@ -3090,13 +3090,13 @@ const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/normal.gbap const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz"); const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/normal.gbapal.lz"); const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz"); -//const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); +const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); const u32 gMonPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/normal.gbapal.lz"); const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/normal.gbapal.lz"); const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/normal.gbapal.lz"); const u32 gMonPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/normal.gbapal.lz"); const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/normal.gbapal.lz"); -//const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); +const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); const u32 gMonPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/normal.gbapal.lz"); const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/normal.gbapal.lz"); const u32 gMonPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/normal.gbapal.lz"); @@ -3172,7 +3172,7 @@ const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/norma const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/normal.gbapal.lz"); const u32 gMonPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/normal.gbapal.lz"); -//const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz"); +const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz"); const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/normal.gbapal.lz"); const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz"); const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz"); @@ -3435,7 +3435,7 @@ const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/f const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/normal.gbapal.lz"); const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz"); const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz"); -//const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); +const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/normal.gbapal.lz"); 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"); @@ -4255,13 +4255,13 @@ const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny. const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz"); const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz"); const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/shiny.gbapal.lz"); const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/shiny.gbapal.lz"); const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/shiny.gbapal.lz"); const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/shiny.gbapal.lz"); @@ -4337,7 +4337,7 @@ const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/ const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/shiny.gbapal.lz"); const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); @@ -4594,7 +4594,7 @@ const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indee const u32 gMonShinyPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/shiny.gbapal.lz"); const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/shiny.gbapal.lz"); 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"); @@ -5410,6 +5410,95 @@ const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/icon.4 const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp"); const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp"); const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/icon.4bpp"); +const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp"); +const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp"); +const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/icon.4bpp"); +const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/icon.4bpp"); +const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/icon.4bpp"); +const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/icon.4bpp"); +const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/icon.4bpp"); +const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/icon.4bpp"); +const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/icon.4bpp"); +//const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp"); +//const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp"); +const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/icon.4bpp"); +const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/icon.4bpp"); +const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/icon.4bpp"); +const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/icon.4bpp"); +const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/icon.4bpp"); +const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/icon.4bpp"); +const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/icon.4bpp"); +const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/icon.4bpp"); +const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/icon.4bpp"); +const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/icon.4bpp"); +const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/icon.4bpp"); +const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/icon.4bpp"); +const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/icon.4bpp"); +const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/icon.4bpp"); +const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/icon.4bpp"); +const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/icon.4bpp"); +const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/icon.4bpp"); +const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/icon.4bpp"); +const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/icon.4bpp"); +const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/applin/icon.4bpp"); +const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/icon.4bpp"); +const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/icon.4bpp"); +const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/icon.4bpp"); +const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/icon.4bpp"); +const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp"); +//const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp"); +//const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp"); +//const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp"); +const u8 gMonIcon_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp"); +const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp"); +const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp"); +const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/icon.4bpp"); +const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/icon.4bpp"); +const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/icon.4bpp"); +const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/icon.4bpp"); +const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/icon.4bpp"); +const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/icon.4bpp"); +const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/icon.4bpp"); +const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/icon.4bpp"); +const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/icon.4bpp"); +const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/icon.4bpp"); +const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/icon.4bpp"); +const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/icon.4bpp"); +const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/icon.4bpp"); +const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/icon.4bpp"); +const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/icon.4bpp"); +const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/icon.4bpp"); +const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/icon.4bpp"); +//const u8 gMonIcon_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/icon.4bpp"); +const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/icon.4bpp"); +//const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp"); +const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp"); +const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp"); +const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp"); +const u8 gMonIcon_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); +const u8 gMonIcon_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); +const u8 gMonIcon_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp"); +const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp"); +const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp"); +//const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp"); +//const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp"); +//const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp"); +//const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp"); +const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp"); +const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp"); +const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp"); +const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp"); +const u8 gMonIcon_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); +const u8 gMonIcon_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); +const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp"); +//const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp"); +//const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); +//const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp"); +//const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp"); +//const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"); +//const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp"); +//const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp"); +//const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp"); const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/mega_venusaur/icon.4bpp"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/mega_charizard_x/icon.4bpp"); const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/mega_charizard_y/icon.4bpp"); @@ -5478,6 +5567,25 @@ const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/alolan_grimer/ico const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/alolan_muk/icon.4bpp"); const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/alolan_exeggutor/icon.4bpp"); const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/alolan_marowak/icon.4bpp"); +const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp"); +const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp"); +const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp"); +//const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp"); +//const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp"); +const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/farfetchd/galarian/icon.4bpp"); +const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/weezing/galarian/icon.4bpp"); +const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/mr_mime/galarian/icon.4bpp"); +//const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp"); +//const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp"); +//const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp"); +//const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp"); +const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp"); +const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp"); +const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp"); +const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp"); +const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); +const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp"); +const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp"); const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp"); const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp"); const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp"); @@ -5541,6 +5649,7 @@ const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp"); const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp"); const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp"); +//const u8 gMonIcon_DarmanitanZenModeGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp"); const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp"); const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/deerling/autumn/icon.4bpp"); const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/deerling/winter/icon.4bpp"); @@ -5620,6 +5729,27 @@ const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/necrozma/dusk const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/necrozma/dawn_wings/icon.4bpp"); const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp"); const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp"); +const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp"); +const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/icon.4bpp"); +const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/toxtricity/low_key/icon.4bpp"); +//const u8 gMonIcon_AlcremieRubyCream[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieMatchaCream[] = INCBIN_U8("graphics/pokemon/alcremie/matcha_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieMintCream[] = INCBIN_U8("graphics/pokemon/alcremie/mint_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieLemonCream[] = INCBIN_U8("graphics/pokemon/alcremie/lemon_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieSaltedCream[] = INCBIN_U8("graphics/pokemon/alcremie/salted_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieRubySwirl[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieCaramelSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/caramel_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieRainbowSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/rainbow_swirl/icon.4bpp"); +const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp"); +const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female/icon.4bpp"); +const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/morpeko/hangry/icon.4bpp"); +const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp"); +const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp"); +//const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/icon.4bpp"); +//const u8 gMonIcon_UrshifuRapidStrikeStyle[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style/icon.4bpp"); +//const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp"); +//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_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 6c71c17c22..49edc4de88 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -487,13 +487,13 @@ const u32 *const gItemIconTable[][2] = [ITEM_CELL_BATTERY] = {gItemIcon_CellBattery, gItemIconPalette_CellBattery}, [ITEM_COVER_FOSSIL] = {gItemIcon_CoverFossil, gItemIconPalette_CoverFossil}, [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil}, - [ITEM_HEALTH_WING] = {gItemIcon_HealthWing, gItemIconPalette_HealthWing}, - [ITEM_MUSCLE_WING] = {gItemIcon_MuscleWing, gItemIconPalette_MuscleWing}, - [ITEM_RESIST_WING] = {gItemIcon_ResistWing, gItemIconPalette_ResistWing}, - [ITEM_GENIUS_WING] = {gItemIcon_GeniusWing, gItemIconPalette_GeniusWing}, - [ITEM_CLEVER_WING] = {gItemIcon_CleverWing, gItemIconPalette_CleverWing}, - [ITEM_SWIFT_WING] = {gItemIcon_SwiftWing, gItemIconPalette_SwiftWing}, - [ITEM_PRETTY_WING] = {gItemIcon_PrettyWing, gItemIconPalette_PrettyWing}, + [ITEM_HEALTH_FEATHER] = {gItemIcon_HealthWing, gItemIconPalette_HealthWing}, + [ITEM_MUSCLE_FEATHER] = {gItemIcon_MuscleWing, gItemIconPalette_MuscleWing}, + [ITEM_RESIST_FEATHER] = {gItemIcon_ResistWing, gItemIconPalette_ResistWing}, + [ITEM_GENIUS_FEATHER] = {gItemIcon_GeniusWing, gItemIconPalette_GeniusWing}, + [ITEM_CLEVER_FEATHER] = {gItemIcon_CleverWing, gItemIconPalette_CleverWing}, + [ITEM_SWIFT_FEATHER] = {gItemIcon_SwiftWing, gItemIconPalette_SwiftWing}, + [ITEM_PRETTY_FEATHER] = {gItemIcon_PrettyWing, gItemIconPalette_PrettyWing}, [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm}, // Gen 6 Items diff --git a/src/data/items.h b/src/data/items.h index 52530e752a..a138f545a4 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -6983,10 +6983,10 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_HEALTH_WING] = + [ITEM_HEALTH_FEATHER] = { .name = _("HealthFeather"), - .itemId = ITEM_HEALTH_WING, + .itemId = ITEM_HEALTH_FEATHER, .price = 300, .holdEffect = 0, .holdEffectParam = 4, @@ -6997,10 +6997,10 @@ const struct Item gItems[] = .secondaryId = STAT_HP, }, - [ITEM_MUSCLE_WING] = + [ITEM_MUSCLE_FEATHER] = { .name = _("MuscleFeather"), - .itemId = ITEM_MUSCLE_WING, + .itemId = ITEM_MUSCLE_FEATHER, .price = 300, .holdEffect = 0, .holdEffectParam = 4, @@ -7011,10 +7011,10 @@ const struct Item gItems[] = .secondaryId = STAT_ATK, }, - [ITEM_RESIST_WING] = + [ITEM_RESIST_FEATHER] = { .name = _("ResistFeather"), - .itemId = ITEM_RESIST_WING, + .itemId = ITEM_RESIST_FEATHER, .price = 300, .holdEffect = 0, .holdEffectParam = 4, @@ -7025,10 +7025,10 @@ const struct Item gItems[] = .secondaryId = STAT_DEF, }, - [ITEM_GENIUS_WING] = + [ITEM_GENIUS_FEATHER] = { .name = _("GeniusFeather"), - .itemId = ITEM_GENIUS_WING, + .itemId = ITEM_GENIUS_FEATHER, .price = 300, .holdEffect = 0, .holdEffectParam = 4, @@ -7039,10 +7039,10 @@ const struct Item gItems[] = .secondaryId = STAT_SPATK, }, - [ITEM_CLEVER_WING] = + [ITEM_CLEVER_FEATHER] = { .name = _("CleverFeather"), - .itemId = ITEM_CLEVER_WING, + .itemId = ITEM_CLEVER_FEATHER, .price = 300, .holdEffect = 0, .holdEffectParam = 4, @@ -7053,10 +7053,10 @@ const struct Item gItems[] = .secondaryId = STAT_SPDEF, }, - [ITEM_SWIFT_WING] = + [ITEM_SWIFT_FEATHER] = { .name = _("Swift Feather"), - .itemId = ITEM_SWIFT_WING, + .itemId = ITEM_SWIFT_FEATHER, .price = 300, .holdEffect = 0, .holdEffectParam = 4, @@ -7067,10 +7067,10 @@ const struct Item gItems[] = .secondaryId = STAT_SPEED, }, - [ITEM_PRETTY_WING] = + [ITEM_PRETTY_FEATHER] = { .name = _("PrettyFeather"), - .itemId = ITEM_PRETTY_WING, + .itemId = ITEM_PRETTY_FEATHER, .price = 1000, .description = sPrettyWingDesc, .pocket = POCKET_ITEMS, diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index bc590d31fe..15e406ae21 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -983,7 +983,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_CLEFABLE] = @@ -1021,7 +1021,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_VULPIX] = @@ -1106,7 +1106,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_WIGGLYTUFF] = @@ -1144,7 +1144,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ZUBAT] = @@ -1710,7 +1710,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_WATER_1, .abilities = {ABILITY_WATER_ABSORB, ABILITY_DAMP, ABILITY_SWIFT_SWIM}, .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_POLIWHIRL] = @@ -1735,7 +1735,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_WATER_1, .abilities = {ABILITY_WATER_ABSORB, ABILITY_DAMP, ABILITY_SWIFT_SWIM}, .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_POLIWRATH] = @@ -1764,7 +1764,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_WATER_1, .abilities = {ABILITY_WATER_ABSORB, ABILITY_DAMP, ABILITY_SWIFT_SWIM}, .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ABRA] = @@ -1822,7 +1822,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_SYNCHRONIZE, ABILITY_INNER_FOCUS}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ALAKAZAM] = @@ -1913,7 +1913,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_GUTS, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MACHAMP] = @@ -2819,7 +2819,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_VOLTORB] = @@ -3133,7 +3133,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_LEVITATE, ABILITY_NONE, ABILITY_STENCH}, #endif .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_RHYHORN] = @@ -3413,7 +3413,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_ILLUMINATE, ABILITY_NATURAL_CURE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_STARMIE] = @@ -3559,7 +3559,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_VITAL_SPIRIT}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MAGMAR] = @@ -4496,7 +4496,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_TORRENT, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_FERALIGATR] = @@ -4893,7 +4893,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_IGGLYBUFF] = @@ -4926,7 +4926,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_TOGEPI] = @@ -5283,7 +5283,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_WATER_1, .abilities = {ABILITY_WATER_ABSORB, ABILITY_DAMP, ABILITY_DRIZZLE}, .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_HOPPIP] = @@ -6104,7 +6104,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE}, #endif .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_TEDDIURSA] = @@ -6132,7 +6132,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_PICKUP, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_URSARING] = @@ -6221,7 +6221,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_MAGMA_ARMOR, ABILITY_FLAME_BODY}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_SWINUB] = @@ -6785,7 +6785,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_VITAL_SPIRIT}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MAGBY] = @@ -6812,7 +6812,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_FLAME_BODY, ABILITY_NONE, ABILITY_VITAL_SPIRIT}, .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MILTANK] = @@ -7844,7 +7844,7 @@ const struct BaseStats gBaseStats[] = .expYield = 54, .evYield_Speed = 1, #ifdef ITEM_EXPANSION - .item1 = ITEM_PRETTY_WING, + .item1 = ITEM_PRETTY_FEATHER, #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -7879,7 +7879,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 2, #ifdef ITEM_EXPANSION - .item1 = ITEM_PRETTY_WING, + .item1 = ITEM_PRETTY_FEATHER, #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -8951,7 +8951,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NATURAL_CURE, ABILITY_POISON_POINT}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GULPIN] = @@ -9275,7 +9275,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_OWN_TEMPO, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_TRAPINCH] = @@ -9498,7 +9498,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_IMMUNITY, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_SEVIPER] = @@ -9530,7 +9530,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_LUNATONE] = @@ -10181,7 +10181,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_WYNAUT] = @@ -10690,7 +10690,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_STURDY}, .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_REGICE] = @@ -10994,7 +10994,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_GRASS, .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_SHELL_ARMOR}, .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_CHIMCHAR] = @@ -11022,7 +11022,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_BLAZE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MONFERNO] = @@ -11051,7 +11051,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_BLAZE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_INFERNAPE] = @@ -11480,7 +11480,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NATURAL_CURE, ABILITY_POISON_POINT}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ROSERADE] = @@ -11513,7 +11513,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NATURAL_CURE, ABILITY_POISON_POINT}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_CRANIDOS] = @@ -11891,7 +11891,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PURPLE, - .noFlip = TRUE, + .noFlip = FALSE, }, [SPECIES_SHELLOS] = @@ -13182,7 +13182,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_HUMAN_LIKE, .abilities = {ABILITY_FLAME_BODY, ABILITY_NONE, ABILITY_VITAL_SPIRIT}, .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_TOGEKISS] = @@ -13216,7 +13216,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_HUSTLE, ABILITY_SERENE_GRACE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_YANMEGA] = @@ -13935,7 +13935,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_YELLOW, - .noFlip = TRUE, + .noFlip = FALSE, }, [SPECIES_SNIVY] = @@ -14095,7 +14095,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_BLAZE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_OSHAWOTT] = @@ -14447,7 +14447,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE, ABILITY_BLAZE}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_SIMISEAR] = @@ -14475,7 +14475,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE, ABILITY_BLAZE}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PANPOUR] = @@ -14914,7 +14914,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_EXCADRILL] = @@ -14942,7 +14942,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_AUDINO] = @@ -15202,7 +15202,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_STURDY, ABILITY_INNER_FOCUS}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_SEWADDLE] = @@ -15530,7 +15530,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_OWN_TEMPO}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_BASCULIN] = @@ -16115,7 +16115,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_STENCH, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ZORUA] = @@ -16227,7 +16227,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GOTHITA] = @@ -16339,7 +16339,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_DUOSION] = @@ -16738,7 +16738,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_EFFECT_SPORE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_FRILLISH] = @@ -16964,7 +16964,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_MINERAL, .abilities = {ABILITY_PLUS, ABILITY_MINUS, ABILITY_CLEAR_BODY}, .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_KLANG] = @@ -16988,7 +16988,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_MINERAL, .abilities = {ABILITY_PLUS, ABILITY_MINUS, ABILITY_CLEAR_BODY}, .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_KLINKLANG] = @@ -17012,7 +17012,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_MINERAL, .abilities = {ABILITY_PLUS, ABILITY_MINUS, ABILITY_CLEAR_BODY}, .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_TYNAMO] = @@ -17172,7 +17172,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_LAMPENT] = @@ -17607,7 +17607,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GOLURK] = @@ -17638,7 +17638,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PAWNIARD] = @@ -17834,7 +17834,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = TRUE, + .noFlip = FALSE, }, [SPECIES_HEATMOR] = @@ -18258,7 +18258,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_KELDEO] = @@ -18314,7 +18314,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE}, .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GENESECT] = @@ -18596,7 +18596,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_TORRENT, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_BUNNELBY] = @@ -19474,7 +19474,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_SKRELP] = @@ -19558,7 +19558,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_CLAWITZER] = @@ -19586,7 +19586,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_HELIOPTILE] = @@ -19783,7 +19783,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_CUTE_CHARM, ABILITY_CUTE_CHARM}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_HAWLUCHA] = @@ -19987,7 +19987,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PHANTUMP] = @@ -20311,7 +20311,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_DIANCIE] = @@ -20444,7 +20444,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_OVERGROW, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_DECIDUEYE] = @@ -21551,7 +21551,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_OBLIVIOUS}, #endif .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_TSAREENA] = @@ -21582,7 +21582,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_COMFEY] = @@ -21613,7 +21613,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE, ABILITY_NATURAL_CURE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ORANGURU] = @@ -21893,7 +21893,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_KOMALA] = @@ -22094,7 +22094,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_JANGMO_O] = @@ -22643,7 +22643,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MAGEARNA] = @@ -22700,7 +22700,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_POIPOLE] = @@ -22786,7 +22786,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, .flags = F_ULTRA_BEAST, }, @@ -22815,7 +22815,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, .flags = F_ULTRA_BEAST, }, @@ -26332,7 +26332,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GLALIE_MEGA] = @@ -27020,7 +27020,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_SAND_VEIL, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, .flags = F_ALOLAN_FORM, }, @@ -27235,7 +27235,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, .flags = F_ALOLAN_FORM, }, @@ -27921,7 +27921,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PIKACHU_POP_STAR] = @@ -27946,7 +27946,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PIKACHU_PH_D] = @@ -28021,7 +28021,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PIKACHU_HOENN_CAP] = @@ -28171,7 +28171,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_PIKACHU_WORLD_CAP] = @@ -28220,7 +28220,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_B] = @@ -28245,7 +28245,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_C] = @@ -28270,7 +28270,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_D] = @@ -28295,7 +28295,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_E] = @@ -28320,7 +28320,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_F] = @@ -28345,7 +28345,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_G] = @@ -28370,7 +28370,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_H] = @@ -28395,7 +28395,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_I] = @@ -28445,7 +28445,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_K] = @@ -28470,7 +28470,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_L] = @@ -28495,7 +28495,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_M] = @@ -28545,7 +28545,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_O] = @@ -28595,7 +28595,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_Q] = @@ -28620,7 +28620,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_R] = @@ -28645,7 +28645,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_S] = @@ -28670,7 +28670,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_T] = @@ -28745,7 +28745,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_W] = @@ -28845,7 +28845,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_UNOWN_EMARK] = @@ -28895,7 +28895,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_CASTFORM_SUNNY] = @@ -29047,7 +29047,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_BURMY_SANDY_CLOAK] = @@ -29183,7 +29183,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PINK, - .noFlip = TRUE, + .noFlip = FALSE, }, [SPECIES_SHELLOS_EAST_SEA] = @@ -29289,7 +29289,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_AMORPHOUS, .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ROTOM_FROST] = @@ -29414,7 +29414,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE}, .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ARCEUS_FIGHTING] = @@ -30248,7 +30248,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_KYUREM_BLACK] = @@ -30276,7 +30276,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_KELDEO_RESOLUTE] = @@ -30304,7 +30304,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MELOETTA_PIROUETTE] = @@ -30332,7 +30332,7 @@ const struct BaseStats gBaseStats[] = .eggGroup2 = EGG_GROUP_UNDISCOVERED, .abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE}, .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GENESECT_DOUSE_DRIVE] = @@ -30480,7 +30480,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_GRENINJA_ASH] = @@ -30508,7 +30508,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_VIVILLON_POLAR] = @@ -31554,7 +31554,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_FURFROU_MATRON_TRIM] = @@ -31980,7 +31980,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = @@ -32008,7 +32008,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = @@ -32036,7 +32036,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_ZYGARDE_COMPLETE] = @@ -32064,7 +32064,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_HOOPA_UNBOUND] = @@ -32799,7 +32799,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_METEOR_YELLOW] = @@ -32829,7 +32829,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_METEOR_GREEN] = @@ -32859,7 +32859,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_METEOR_BLUE] = @@ -32889,7 +32889,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_METEOR_INDIGO] = @@ -32919,7 +32919,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_METEOR_VIOLET] = @@ -32949,7 +32949,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_RED] = @@ -32979,7 +32979,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_ORANGE] = @@ -33009,7 +33009,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_YELLOW] = @@ -33039,7 +33039,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_GREEN] = @@ -33069,7 +33069,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_BLUE] = @@ -33099,7 +33099,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_INDIGO] = @@ -33129,7 +33129,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MINIOR_CORE_VIOLET] = @@ -33159,7 +33159,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MIMIKYU_BUSTED] = @@ -33215,7 +33215,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_NECROZMA_DAWN_WINGS] = @@ -33243,7 +33243,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_NECROZMA_ULTRA] = @@ -33273,7 +33273,7 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_NONE, ABILITY_NONE}, #endif .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, + .noFlip = TRUE, }, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 9d67f1f17d..2a5d18d143 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -317,8 +317,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PANPOUR] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_SIMIPOUR}}, [SPECIES_MUNNA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_MUSHARNA}}, [SPECIES_PIDOVE] = {{EVO_LEVEL, 21, SPECIES_TRANQUILL}}, - [SPECIES_TRANQUILL] = {{EVO_LEVEL_MALE, 32, SPECIES_UNFEZANT}, - {EVO_LEVEL_FEMALE, 32, SPECIES_UNFEZANT}}, + [SPECIES_TRANQUILL] = {{EVO_LEVEL, 32, SPECIES_UNFEZANT}}, [SPECIES_BLITZLE] = {{EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}}, [SPECIES_ROGGENROLA] = {{EVO_LEVEL, 25, SPECIES_BOLDORE}}, [SPECIES_BOLDORE] = {{EVO_TRADE, 0, SPECIES_GIGALITH}}, @@ -493,7 +492,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DREEPY] = {{EVO_LEVEL, 50, SPECIES_DRAKLOAK}}, [SPECIES_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT}}, [SPECIES_KUBFU] = {{EVO_LEVEL, 0, SPECIES_URSHIFU}, - {EVO_LEVEL, 0, SPECIES_URSHIFU}}, + {EVO_LEVEL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, [SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}}, @@ -503,7 +502,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}}, [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, [SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}}, - [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, + [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_NONE, SPECIES_SLOWBRO_GALARIAN}, {EVO_ITEM, ITEM_NONE, SPECIES_SLOWKING_GALARIAN}}, [SPECIES_FARFETCHD_GALARIAN] = {{EVO_LEVEL, 0, SPECIES_SIRFETCHD}}, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index c07a70071f..192d895f54 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -502,12 +502,12 @@ const u8 *const gItemEffectTable[] = [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp, [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, - [ITEM_HEALTH_WING - ITEM_POTION] = gItemEffect_HpWing, - [ITEM_MUSCLE_WING - ITEM_POTION] = gItemEffect_AtkWing, - [ITEM_RESIST_WING - ITEM_POTION] = gItemEffect_DefWing, - [ITEM_GENIUS_WING - ITEM_POTION] = gItemEffect_SpatkWing, - [ITEM_CLEVER_WING - ITEM_POTION] = gItemEffect_SpdefWing, - [ITEM_SWIFT_WING - ITEM_POTION] = gItemEffect_SpeedWing, + [ITEM_HEALTH_FEATHER - ITEM_POTION] = gItemEffect_HpWing, + [ITEM_MUSCLE_FEATHER - ITEM_POTION] = gItemEffect_AtkWing, + [ITEM_RESIST_FEATHER - ITEM_POTION] = gItemEffect_DefWing, + [ITEM_GENIUS_FEATHER - ITEM_POTION] = gItemEffect_SpatkWing, + [ITEM_CLEVER_FEATHER - ITEM_POTION] = gItemEffect_SpdefWing, + [ITEM_SWIFT_FEATHER - ITEM_POTION] = gItemEffect_SpeedWing, [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax, [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec, [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 1770255c27..6c98620e09 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4063,7 +4063,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_RILLABOOM] = { .size = 0x85, - .y_offset = 13, + .y_offset = 4, }, [SPECIES_SCORBUNNY] = { @@ -4093,7 +4093,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_INTELEON] = { .size = 0x85, - .y_offset = 13, + .y_offset = 4, }, [SPECIES_SKWOVET] = { @@ -4473,7 +4473,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_REGIELEKI] = { .size = 0x85, - .y_offset = 13, + .y_offset = 9, }, [SPECIES_REGIDRAGO] = { @@ -6075,7 +6075,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ETERNATUS_ETERNAMAX] = { .size = 0x85, - .y_offset = 13, + .y_offset = 7, }, // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index e1670e8195..a70aa13c5b 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -812,13 +812,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal), SPECIES_SPRITE(GROOKEY, gMonBackPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonBackPic_Thwackey), - SPECIES_SPRITE(RILLABOOM, gMonBackPic_DoubleQuestionMark/*gMonBackPic_Rillaboom*/), + SPECIES_SPRITE(RILLABOOM, gMonBackPic_Rillaboom), SPECIES_SPRITE(SCORBUNNY, gMonBackPic_Scorbunny), SPECIES_SPRITE(RABOOT, gMonBackPic_Raboot), SPECIES_SPRITE(CINDERACE, gMonBackPic_Cinderace), SPECIES_SPRITE(SOBBLE, gMonBackPic_Sobble), SPECIES_SPRITE(DRIZZILE, gMonBackPic_Drizzile), - SPECIES_SPRITE(INTELEON, gMonBackPic_DoubleQuestionMark/*gMonBackPic_Inteleon*/), + SPECIES_SPRITE(INTELEON, gMonBackPic_Inteleon), SPECIES_SPRITE(SKWOVET, gMonBackPic_Skwovet), SPECIES_SPRITE(GREEDENT, gMonBackPic_Greedent), SPECIES_SPRITE(ROOKIDEE, gMonBackPic_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(KUBFU, gMonBackPic_Kubfu), SPECIES_SPRITE(URSHIFU, gMonBackPic_Urshifu), SPECIES_SPRITE(ZARUDE, gMonBackPic_Zarude), - SPECIES_SPRITE(REGIELEKI, gMonBackPic_DoubleQuestionMark/*gMonBackPic_Regieleki*/), + SPECIES_SPRITE(REGIELEKI, gMonBackPic_Regieleki), SPECIES_SPRITE(REGIDRAGO, gMonBackPic_Regidrago), SPECIES_SPRITE(GLASTRIER, gMonBackPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier), @@ -1263,7 +1263,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ZAMAZENTA_CROWNED_SHIELD, gMonBackPic_ZamazentaCrownedShield), - SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonBackPic_Eternatus/*Eternamax*/), + SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonBackPic_EternatusEternamax), SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE, gMonBackPic_UrshifuRapidStrikeStyle), diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 4528ed59d3..c0896e3feb 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -131,5 +131,5 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = // Misc Forms [SPECIES_GIRATINA_ORIGIN] = 7, [SPECIES_THUNDURUS_THERIAN] = 7, + [SPECIES_ETERNATUS_ETERNAMAX] = 4, }; - diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 56632aa435..e302b90c33 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4064,7 +4064,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_RILLABOOM] = { .size = 0x86, - .y_offset = 4, + .y_offset = 3, }, [SPECIES_SCORBUNNY] = { @@ -4094,7 +4094,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_INTELEON] = { .size = 0x86, - .y_offset = 4, + .y_offset = 1, }, [SPECIES_SKWOVET] = { @@ -6076,7 +6076,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_ETERNATUS_ETERNAMAX] = { .size = 0x86, - .y_offset = 4, + .y_offset = 0, }, // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index e73f6458be..0bc35542c7 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -812,13 +812,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal), SPECIES_SPRITE(GROOKEY, gMonFrontPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonFrontPic_Thwackey), - SPECIES_SPRITE(RILLABOOM, gMonFrontPic_DoubleQuestionMark/*gMonFrontPic_Rillaboom*/), + SPECIES_SPRITE(RILLABOOM, gMonFrontPic_Rillaboom), SPECIES_SPRITE(SCORBUNNY, gMonFrontPic_Scorbunny), SPECIES_SPRITE(RABOOT, gMonFrontPic_Raboot), SPECIES_SPRITE(CINDERACE, gMonFrontPic_Cinderace), SPECIES_SPRITE(SOBBLE, gMonFrontPic_Sobble), SPECIES_SPRITE(DRIZZILE, gMonFrontPic_Drizzile), - SPECIES_SPRITE(INTELEON, gMonFrontPic_DoubleQuestionMark/*gMonFrontPic_Inteleon*/), + SPECIES_SPRITE(INTELEON, gMonFrontPic_Inteleon), SPECIES_SPRITE(SKWOVET, gMonFrontPic_Skwovet), SPECIES_SPRITE(GREEDENT, gMonFrontPic_Greedent), SPECIES_SPRITE(ROOKIDEE, gMonFrontPic_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(KUBFU, gMonFrontPic_Kubfu), SPECIES_SPRITE(URSHIFU, gMonFrontPic_Urshifu), SPECIES_SPRITE(ZARUDE, gMonFrontPic_Zarude), - SPECIES_SPRITE(REGIELEKI, gMonFrontPic_DoubleQuestionMark/*gMonFrontPic_Regieleki*/), + SPECIES_SPRITE(REGIELEKI, gMonFrontPic_Regieleki), SPECIES_SPRITE(REGIDRAGO, gMonFrontPic_Regidrago), SPECIES_SPRITE(GLASTRIER, gMonFrontPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier), @@ -1263,7 +1263,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ZAMAZENTA_CROWNED_SHIELD, gMonFrontPic_ZamazentaCrownedShield), - SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonFrontPic_Eternatus/*Eternamax*/), + SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonFrontPic_EternatusEternamax), SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE, gMonFrontPic_UrshifuRapidStrikeStyle), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index c66d578468..59e3d918b4 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -812,13 +812,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MELMETAL, gMonPalette_Melmetal), SPECIES_PAL(GROOKEY, gMonPalette_Grookey), SPECIES_PAL(THWACKEY, gMonPalette_Thwackey), - SPECIES_PAL(RILLABOOM, gMonPalette_DoubleQuestionMark/*gMonPalette_Rillaboom*/), + SPECIES_PAL(RILLABOOM, gMonPalette_Rillaboom), SPECIES_PAL(SCORBUNNY, gMonPalette_Scorbunny), SPECIES_PAL(RABOOT, gMonPalette_Raboot), SPECIES_PAL(CINDERACE, gMonPalette_Cinderace), SPECIES_PAL(SOBBLE, gMonPalette_Sobble), SPECIES_PAL(DRIZZILE, gMonPalette_Drizzile), - SPECIES_PAL(INTELEON, gMonPalette_DoubleQuestionMark/*gMonPalette_Inteleon*/), + SPECIES_PAL(INTELEON, gMonPalette_Inteleon), SPECIES_PAL(SKWOVET, gMonPalette_Skwovet), SPECIES_PAL(GREEDENT, gMonPalette_Greedent), SPECIES_PAL(ROOKIDEE, gMonPalette_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(KUBFU, gMonPalette_Kubfu), SPECIES_PAL(URSHIFU, gMonPalette_Urshifu), SPECIES_PAL(ZARUDE, gMonPalette_Zarude), - SPECIES_PAL(REGIELEKI, gMonPalette_DoubleQuestionMark/*gMonPalette_Regieleki*/), + SPECIES_PAL(REGIELEKI, gMonPalette_Regieleki), SPECIES_PAL(REGIDRAGO, gMonPalette_Regidrago), SPECIES_PAL(GLASTRIER, gMonPalette_Glastrier), SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier), @@ -1235,7 +1235,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MAGEARNA_ORIGINAL_COLOR, gMonPalette_MagearnaOriginalColor), -SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), + SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(CRAMORANT_GORGING, gMonPalette_CramorantGorging), SPECIES_PAL(TOXTRICITY_LOW_KEY, gMonPalette_ToxtricityLowKey), @@ -1263,7 +1263,7 @@ SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(ZAMAZENTA_CROWNED_SHIELD, gMonPalette_ZamazentaCrownedShield), - SPECIES_PAL(ETERNATUS_ETERNAMAX, gMonPalette_Eternatus/*Eternamax*/), + SPECIES_PAL(ETERNATUS_ETERNAMAX, gMonPalette_EternatusEternamax), SPECIES_PAL(URSHIFU_RAPID_STRIKE_STYLE, gMonPalette_UrshifuRapidStrikeStyle), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 0985b1609b..38b3a662df 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -812,13 +812,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal), SPECIES_SHINY_PAL(GROOKEY, gMonShinyPalette_Grookey), SPECIES_SHINY_PAL(THWACKEY, gMonShinyPalette_Thwackey), - SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_DoubleQuestionMark/*gMonShinyPalette_Rillaboom*/), + SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_Rillaboom), SPECIES_SHINY_PAL(SCORBUNNY, gMonShinyPalette_Scorbunny), SPECIES_SHINY_PAL(RABOOT, gMonShinyPalette_Raboot), SPECIES_SHINY_PAL(CINDERACE, gMonShinyPalette_Cinderace), SPECIES_SHINY_PAL(SOBBLE, gMonShinyPalette_Sobble), SPECIES_SHINY_PAL(DRIZZILE, gMonShinyPalette_Drizzile), - SPECIES_SHINY_PAL(INTELEON, gMonShinyPalette_DoubleQuestionMark/*gMonShinyPalette_Inteleon*/), + SPECIES_SHINY_PAL(INTELEON, gMonShinyPalette_Inteleon), SPECIES_SHINY_PAL(SKWOVET, gMonShinyPalette_Skwovet), SPECIES_SHINY_PAL(GREEDENT, gMonShinyPalette_Greedent), SPECIES_SHINY_PAL(ROOKIDEE, gMonShinyPalette_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(KUBFU, gMonShinyPalette_Kubfu), SPECIES_SHINY_PAL(URSHIFU, gMonShinyPalette_Urshifu), SPECIES_SHINY_PAL(ZARUDE, gMonShinyPalette_Zarude), - SPECIES_SHINY_PAL(REGIELEKI, gMonShinyPalette_DoubleQuestionMark/*gMonShinyPalette_Regieleki*/), + SPECIES_SHINY_PAL(REGIELEKI, gMonShinyPalette_Regieleki), SPECIES_SHINY_PAL(REGIDRAGO, gMonShinyPalette_Regidrago), SPECIES_SHINY_PAL(GLASTRIER, gMonShinyPalette_Glastrier), SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier), @@ -1263,7 +1263,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ZAMAZENTA_CROWNED_SHIELD, gMonShinyPalette_ZamazentaCrownedShield), - SPECIES_SHINY_PAL(ETERNATUS_ETERNAMAX, gMonShinyPalette_Eternatus/*Eternamax*/), + SPECIES_SHINY_PAL(ETERNATUS_ETERNAMAX, gMonShinyPalette_EternatusEternamax), SPECIES_SHINY_PAL(URSHIFU_RAPID_STRIKE_STYLE, gMonShinyPalette_UrshifuRapidStrikeStyle), diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h index 6018984459..f7f9e75c75 100644 --- a/src/data/text/nature_names.h +++ b/src/data/text/nature_names.h @@ -1,28 +1,28 @@ -static const u8 sHardyNatureName[] = _("HARDY"); -static const u8 sLonelyNatureName[] = _("LONELY"); -static const u8 sBraveNatureName[] = _("BRAVE"); -static const u8 sAdamantNatureName[] = _("ADAMANT"); -static const u8 sNaughtyNatureName[] = _("NAUGHTY"); -static const u8 sBoldNatureName[] = _("BOLD"); -static const u8 sDocileNatureName[] = _("DOCILE"); -static const u8 sRelaxedNatureName[] = _("RELAXED"); -static const u8 sImpishNatureName[] = _("IMPISH"); -static const u8 sLaxNatureName[] = _("LAX"); -static const u8 sTimidNatureName[] = _("TIMID"); -static const u8 sHastyNatureName[] = _("HASTY"); -static const u8 sSeriousNatureName[] = _("SERIOUS"); -static const u8 sJollyNatureName[] = _("JOLLY"); -static const u8 sNaiveNatureName[] = _("NAIVE"); -static const u8 sModestNatureName[] = _("MODEST"); -static const u8 sMildNatureName[] = _("MILD"); -static const u8 sQuietNatureName[] = _("QUIET"); -static const u8 sBashfulNatureName[] = _("BASHFUL"); -static const u8 sRashNatureName[] = _("RASH"); -static const u8 sCalmNatureName[] = _("CALM"); -static const u8 sGentleNatureName[] = _("GENTLE"); -static const u8 sSassyNatureName[] = _("SASSY"); -static const u8 sCarefulNatureName[] = _("CAREFUL"); -static const u8 sQuirkyNatureName[] = _("QUIRKY"); +static const u8 sHardyNatureName[] = _("Hardy"); +static const u8 sLonelyNatureName[] = _("Lonely"); +static const u8 sBraveNatureName[] = _("Brave"); +static const u8 sAdamantNatureName[] = _("Adamant"); +static const u8 sNaughtyNatureName[] = _("Naughty"); +static const u8 sBoldNatureName[] = _("Bold"); +static const u8 sDocileNatureName[] = _("Docile"); +static const u8 sRelaxedNatureName[] = _("Relaxed"); +static const u8 sImpishNatureName[] = _("Impish"); +static const u8 sLaxNatureName[] = _("Lax"); +static const u8 sTimidNatureName[] = _("Timid"); +static const u8 sHastyNatureName[] = _("Hasty"); +static const u8 sSeriousNatureName[] = _("Serious"); +static const u8 sJollyNatureName[] = _("Jolly"); +static const u8 sNaiveNatureName[] = _("Naive"); +static const u8 sModestNatureName[] = _("Modest"); +static const u8 sMildNatureName[] = _("Mild"); +static const u8 sQuietNatureName[] = _("Quiet"); +static const u8 sBashfulNatureName[] = _("Bashful"); +static const u8 sRashNatureName[] = _("Rash"); +static const u8 sCalmNatureName[] = _("Calm"); +static const u8 sGentleNatureName[] = _("Gentle"); +static const u8 sSassyNatureName[] = _("Sassy"); +static const u8 sCarefulNatureName[] = _("Careful"); +static const u8 sQuirkyNatureName[] = _("Quirky"); const u8 *const gNatureNamePointers[NUM_NATURES] = { diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 9d5c3ebd5c..8129e2a602 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -805,7 +805,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_POIPOLE] = _("Poipole"), [SPECIES_NAGANADEL] = _("Naganadel"), [SPECIES_STAKATAKA] = _("Stakataka"), - [SPECIES_BLACEPHALON] = _("Blacefalon"), + [SPECIES_BLACEPHALON] = _("Blacephaln"), [SPECIES_ZERAORA] = _("Zeraora"), [SPECIES_MELTAN] = _("Meltan"), [SPECIES_MELMETAL] = _("Melmetal"), diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 3798d59165..0bf2ac2a15 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -1502,12 +1502,12 @@ static void Task_DoDomeConfetti(u8 taskId) if (tTimer != 0 && tTimer % 3 == 0) { // Create new confetti every 3 frames - id = ConfettiUtil_AddNew(&sOamData_Confetti, - TAG_CONFETTI, - TAG_CONFETTI, - Random() % DISPLAY_WIDTH, - -(Random() % 8), - Random() % ARRAY_COUNT(sAnims_Confetti), + id = ConfettiUtil_AddNew(&sOamData_Confetti, + TAG_CONFETTI, + TAG_CONFETTI, + Random() % DISPLAY_WIDTH, + -(Random() % 8), + Random() % ARRAY_COUNT(sAnims_Confetti), id); if (id != 0xFF) { diff --git a/src/pokemon.c b/src/pokemon.c index 5dec155e44..26c04337aa 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5098,6 +5098,9 @@ u16 GetAbilityBySpecies(u16 species, u8 abilityNum) else gLastUsedAbility = gBaseStats[species].abilities[0]; + if (gLastUsedAbility == ABILITY_NONE) + gLastUsedAbility = gBaseStats[species].abilities[0]; + return gLastUsedAbility; } @@ -6366,9 +6369,9 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, u { for (j = 0; j < PARTY_SIZE; j++) { - u16 species = GetMonData(&gPlayerParty[j], MON_DATA_SPECIES, NULL); - if (gBaseStats[species].type1 == TYPE_DARK - || gBaseStats[species].type2 == TYPE_DARK) + u16 currSpecies = GetMonData(&gPlayerParty[j], MON_DATA_SPECIES, NULL); + if (gBaseStats[currSpecies].type1 == TYPE_DARK + || gBaseStats[currSpecies].type2 == TYPE_DARK) { targetSpecies = gEvolutionTable[species][i].targetSpecies; break; diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index c67fd1327c..0a617b5464 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -212,7 +212,7 @@ static struct PokemonAnimData sAnims[MAX_BATTLERS_COUNT]; static u8 sAnimIdx; static bool32 sIsSummaryAnim; -static const u8 sSpeciesToBackAnimSet[] = +static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = { [SPECIES_BULBASAUR] = BACK_ANIM_DIP_RIGHT_SIDE, [SPECIES_IVYSAUR] = BACK_ANIM_H_SLIDE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index cfcbf90eb3..ee6388578d 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -837,95 +837,95 @@ const u8 *const gMonIconTable[] = [SPECIES_ZERAORA] = gMonIcon_Zeraora, [SPECIES_MELTAN] = gMonIcon_Meltan, [SPECIES_MELMETAL] = gMonIcon_Melmetal, - [SPECIES_GROOKEY] = gMonIcon_QuestionMark, - [SPECIES_THWACKEY] = gMonIcon_QuestionMark, - [SPECIES_RILLABOOM] = gMonIcon_QuestionMark, - [SPECIES_SCORBUNNY] = gMonIcon_QuestionMark, - [SPECIES_RABOOT] = gMonIcon_QuestionMark, - [SPECIES_CINDERACE] = gMonIcon_QuestionMark, - [SPECIES_SOBBLE] = gMonIcon_QuestionMark, - [SPECIES_DRIZZILE] = gMonIcon_QuestionMark, - [SPECIES_INTELEON] = gMonIcon_QuestionMark, - [SPECIES_SKWOVET] = gMonIcon_QuestionMark, - [SPECIES_GREEDENT] = gMonIcon_QuestionMark, - [SPECIES_ROOKIDEE] = gMonIcon_QuestionMark, - [SPECIES_CORVISQUIRE] = gMonIcon_QuestionMark, - [SPECIES_CORVIKNIGHT] = gMonIcon_QuestionMark, - [SPECIES_BLIPBUG] = gMonIcon_QuestionMark, - [SPECIES_DOTTLER] = gMonIcon_QuestionMark, - [SPECIES_ORBEETLE] = gMonIcon_QuestionMark, - [SPECIES_NICKIT] = gMonIcon_QuestionMark, - [SPECIES_THIEVUL] = gMonIcon_QuestionMark, - [SPECIES_GOSSIFLEUR] = gMonIcon_QuestionMark, - [SPECIES_ELDEGOSS] = gMonIcon_QuestionMark, - [SPECIES_WOOLOO] = gMonIcon_QuestionMark, - [SPECIES_DUBWOOL] = gMonIcon_QuestionMark, - [SPECIES_CHEWTLE] = gMonIcon_QuestionMark, - [SPECIES_DREDNAW] = gMonIcon_QuestionMark, - [SPECIES_YAMPER] = gMonIcon_QuestionMark, - [SPECIES_BOLTUND] = gMonIcon_QuestionMark, - [SPECIES_ROLYCOLY] = gMonIcon_QuestionMark, - [SPECIES_CARKOL] = gMonIcon_QuestionMark, - [SPECIES_COALOSSAL] = gMonIcon_QuestionMark, - [SPECIES_APPLIN] = gMonIcon_QuestionMark, - [SPECIES_FLAPPLE] = gMonIcon_QuestionMark, - [SPECIES_APPLETUN] = gMonIcon_QuestionMark, - [SPECIES_SILICOBRA] = gMonIcon_QuestionMark, - [SPECIES_SANDACONDA] = gMonIcon_QuestionMark, - [SPECIES_CRAMORANT] = gMonIcon_QuestionMark, - [SPECIES_ARROKUDA] = gMonIcon_QuestionMark, - [SPECIES_BARRASKEWDA] = gMonIcon_QuestionMark, - [SPECIES_TOXEL] = gMonIcon_QuestionMark, - [SPECIES_TOXTRICITY] = gMonIcon_QuestionMark, - [SPECIES_SIZZLIPEDE] = gMonIcon_QuestionMark, - [SPECIES_CENTISKORCH] = gMonIcon_QuestionMark, - [SPECIES_CLOBBOPUS] = gMonIcon_QuestionMark, - [SPECIES_GRAPPLOCT] = gMonIcon_QuestionMark, - [SPECIES_SINISTEA] = gMonIcon_QuestionMark, - [SPECIES_POLTEAGEIST] = gMonIcon_QuestionMark, - [SPECIES_HATENNA] = gMonIcon_QuestionMark, - [SPECIES_HATTREM] = gMonIcon_QuestionMark, - [SPECIES_HATTERENE] = gMonIcon_QuestionMark, - [SPECIES_IMPIDIMP] = gMonIcon_QuestionMark, - [SPECIES_MORGREM] = gMonIcon_QuestionMark, - [SPECIES_GRIMMSNARL] = gMonIcon_QuestionMark, - [SPECIES_OBSTAGOON] = gMonIcon_QuestionMark, - [SPECIES_PERRSERKER] = gMonIcon_QuestionMark, - [SPECIES_CURSOLA] = gMonIcon_QuestionMark, - [SPECIES_SIRFETCHD] = gMonIcon_QuestionMark, - [SPECIES_MR_RIME] = gMonIcon_QuestionMark, - [SPECIES_RUNERIGUS] = gMonIcon_QuestionMark, - [SPECIES_MILCERY] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE] = gMonIcon_QuestionMark, - [SPECIES_FALINKS] = gMonIcon_QuestionMark, - [SPECIES_PINCURCHIN] = gMonIcon_QuestionMark, - [SPECIES_SNOM] = gMonIcon_QuestionMark, - [SPECIES_FROSMOTH] = gMonIcon_QuestionMark, - [SPECIES_STONJOURNER] = gMonIcon_QuestionMark, - [SPECIES_EISCUE] = gMonIcon_QuestionMark, - [SPECIES_INDEEDEE] = gMonIcon_QuestionMark, - [SPECIES_MORPEKO] = gMonIcon_QuestionMark, - [SPECIES_CUFANT] = gMonIcon_QuestionMark, - [SPECIES_COPPERAJAH] = gMonIcon_QuestionMark, - [SPECIES_DRACOZOLT] = gMonIcon_QuestionMark, - [SPECIES_ARCTOZOLT] = gMonIcon_QuestionMark, - [SPECIES_DRACOVISH] = gMonIcon_QuestionMark, - [SPECIES_ARCTOVISH] = gMonIcon_QuestionMark, - [SPECIES_DURALUDON] = gMonIcon_QuestionMark, - [SPECIES_DREEPY] = gMonIcon_QuestionMark, - [SPECIES_DRAKLOAK] = gMonIcon_QuestionMark, - [SPECIES_DRAGAPULT] = gMonIcon_QuestionMark, - [SPECIES_ZACIAN] = gMonIcon_QuestionMark, - [SPECIES_ZAMAZENTA] = gMonIcon_QuestionMark, - [SPECIES_ETERNATUS] = gMonIcon_QuestionMark, - [SPECIES_KUBFU] = gMonIcon_QuestionMark, - [SPECIES_URSHIFU] = gMonIcon_QuestionMark, - [SPECIES_ZARUDE] = gMonIcon_QuestionMark, - [SPECIES_REGIELEKI] = gMonIcon_QuestionMark, - [SPECIES_REGIDRAGO] = gMonIcon_QuestionMark, - [SPECIES_GLASTRIER] = gMonIcon_QuestionMark, - [SPECIES_SPECTRIER] = gMonIcon_QuestionMark, - [SPECIES_CALYREX] = gMonIcon_QuestionMark, + [SPECIES_GROOKEY] = gMonIcon_Grookey, + [SPECIES_THWACKEY] = gMonIcon_Thwackey, + [SPECIES_RILLABOOM] = gMonIcon_Rillaboom, + [SPECIES_SCORBUNNY] = gMonIcon_Scorbunny, + [SPECIES_RABOOT] = gMonIcon_Raboot, + [SPECIES_CINDERACE] = gMonIcon_Cinderace, + [SPECIES_SOBBLE] = gMonIcon_Sobble, + [SPECIES_DRIZZILE] = gMonIcon_Drizzile, + [SPECIES_INTELEON] = gMonIcon_Inteleon, + [SPECIES_SKWOVET] = gMonIcon_QuestionMark,//gMonIcon_Skwovet, + [SPECIES_GREEDENT] = gMonIcon_QuestionMark,//gMonIcon_Greedent, + [SPECIES_ROOKIDEE] = gMonIcon_Rookidee, + [SPECIES_CORVISQUIRE] = gMonIcon_Corvisquire, + [SPECIES_CORVIKNIGHT] = gMonIcon_Corviknight, + [SPECIES_BLIPBUG] = gMonIcon_Blipbug, + [SPECIES_DOTTLER] = gMonIcon_Dottler, + [SPECIES_ORBEETLE] = gMonIcon_Orbeetle, + [SPECIES_NICKIT] = gMonIcon_Nickit, + [SPECIES_THIEVUL] = gMonIcon_Thievul, + [SPECIES_GOSSIFLEUR] = gMonIcon_Gossifleur, + [SPECIES_ELDEGOSS] = gMonIcon_Eldegoss, + [SPECIES_WOOLOO] = gMonIcon_Wooloo, + [SPECIES_DUBWOOL] = gMonIcon_Dubwool, + [SPECIES_CHEWTLE] = gMonIcon_Chewtle, + [SPECIES_DREDNAW] = gMonIcon_Drednaw, + [SPECIES_YAMPER] = gMonIcon_Yamper, + [SPECIES_BOLTUND] = gMonIcon_Boltund, + [SPECIES_ROLYCOLY] = gMonIcon_Rolycoly, + [SPECIES_CARKOL] = gMonIcon_Carkol, + [SPECIES_COALOSSAL] = gMonIcon_Coalossal, + [SPECIES_APPLIN] = gMonIcon_Applin, + [SPECIES_FLAPPLE] = gMonIcon_Flapple, + [SPECIES_APPLETUN] = gMonIcon_Appletun, + [SPECIES_SILICOBRA] = gMonIcon_Silicobra, + [SPECIES_SANDACONDA] = gMonIcon_Sandaconda, + [SPECIES_CRAMORANT] = gMonIcon_Cramorant, + [SPECIES_ARROKUDA] = gMonIcon_QuestionMark,//gMonIcon_Arrokuda, + [SPECIES_BARRASKEWDA] = gMonIcon_QuestionMark,//gMonIcon_Barraskewda, + [SPECIES_TOXEL] = gMonIcon_QuestionMark,//gMonIcon_Toxel, + [SPECIES_TOXTRICITY] = gMonIcon_Toxtricity, + [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede, + [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch, + [SPECIES_CLOBBOPUS] = gMonIcon_Clobbopus, + [SPECIES_GRAPPLOCT] = gMonIcon_Grapploct, + [SPECIES_SINISTEA] = gMonIcon_Sinistea, + [SPECIES_POLTEAGEIST] = gMonIcon_Polteageist, + [SPECIES_HATENNA] = gMonIcon_Hatenna, + [SPECIES_HATTREM] = gMonIcon_Hattrem, + [SPECIES_HATTERENE] = gMonIcon_Hatterene, + [SPECIES_IMPIDIMP] = gMonIcon_Impidimp, + [SPECIES_MORGREM] = gMonIcon_Morgrem, + [SPECIES_GRIMMSNARL] = gMonIcon_Grimmsnarl, + [SPECIES_OBSTAGOON] = gMonIcon_Obstagoon, + [SPECIES_PERRSERKER] = gMonIcon_Perrserker, + [SPECIES_CURSOLA] = gMonIcon_Cursola, + [SPECIES_SIRFETCHD] = gMonIcon_Sirfetchd, + [SPECIES_MR_RIME] = gMonIcon_MrRime, + [SPECIES_RUNERIGUS] = gMonIcon_Runerigus, + [SPECIES_MILCERY] = gMonIcon_Milcery, + [SPECIES_ALCREMIE] = gMonIcon_QuestionMark,//gMonIcon_Alcremie, + [SPECIES_FALINKS] = gMonIcon_Falinks, + [SPECIES_PINCURCHIN] = gMonIcon_QuestionMark,//gMonIcon_Pincurchin, + [SPECIES_SNOM] = gMonIcon_Snom, + [SPECIES_FROSMOTH] = gMonIcon_Frosmoth, + [SPECIES_STONJOURNER] = gMonIcon_Stonjourner, + [SPECIES_EISCUE] = gMonIcon_Eiscue, + [SPECIES_INDEEDEE] = gMonIcon_Indeedee, + [SPECIES_MORPEKO] = gMonIcon_Morpeko, + [SPECIES_CUFANT] = gMonIcon_Cufant, + [SPECIES_COPPERAJAH] = gMonIcon_Copperajah, + [SPECIES_DRACOZOLT] = gMonIcon_QuestionMark,//gMonIcon_Dracozolt, + [SPECIES_ARCTOZOLT] = gMonIcon_QuestionMark,//gMonIcon_Arctozolt, + [SPECIES_DRACOVISH] = gMonIcon_QuestionMark,//gMonIcon_Dracovish, + [SPECIES_ARCTOVISH] = gMonIcon_QuestionMark,//gMonIcon_Arctovish, + [SPECIES_DURALUDON] = gMonIcon_Duraludon, + [SPECIES_DREEPY] = gMonIcon_Dreepy, + [SPECIES_DRAKLOAK] = gMonIcon_Drakloak, + [SPECIES_DRAGAPULT] = gMonIcon_Dragapult, + [SPECIES_ZACIAN] = gMonIcon_Zacian, + [SPECIES_ZAMAZENTA] = gMonIcon_Zamazenta, + [SPECIES_ETERNATUS] = gMonIcon_Eternatus, + [SPECIES_KUBFU] = gMonIcon_QuestionMark,//gMonIcon_Kubfu, + [SPECIES_URSHIFU] = gMonIcon_QuestionMark,//gMonIcon_Urshifu, + [SPECIES_ZARUDE] = gMonIcon_QuestionMark,//gMonIcon_Zarude, + [SPECIES_REGIELEKI] = gMonIcon_QuestionMark,//gMonIcon_Regieleki, + [SPECIES_REGIDRAGO] = gMonIcon_QuestionMark,//gMonIcon_Regidrago, + [SPECIES_GLASTRIER] = gMonIcon_QuestionMark,//gMonIcon_Glastrier, + [SPECIES_SPECTRIER] = gMonIcon_QuestionMark,//gMonIcon_Spectrier, + [SPECIES_CALYREX] = gMonIcon_QuestionMark,//gMonIcon_Calyrex, [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, @@ -994,25 +994,25 @@ const u8 *const gMonIconTable[] = [SPECIES_MUK_ALOLAN] = gMonIcon_MukAlolan, [SPECIES_EXEGGUTOR_ALOLAN] = gMonIcon_ExeggutorAlolan, [SPECIES_MAROWAK_ALOLAN] = gMonIcon_MarowakAlolan, - [SPECIES_MEOWTH_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_PONYTA_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_WEEZING_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_MR_MIME_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_MOLTRES_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_SLOWKING_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_CORSOLA_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_LINOONE_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_YAMASK_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_STUNFISK_GALARIAN] = gMonIcon_QuestionMark, + [SPECIES_MEOWTH_GALARIAN] = gMonIcon_MeowthGalarian, + [SPECIES_PONYTA_GALARIAN] = gMonIcon_PonytaGalarian, + [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_RapidashGalarian, + [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowpokeGalarian, + [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowbroGalarian, + [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_FarfetchdGalarian, + [SPECIES_WEEZING_GALARIAN] = gMonIcon_WeezingGalarian, + [SPECIES_MR_MIME_GALARIAN] = gMonIcon_MrMimeGalarian, + [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_ArticunoGalarian, + [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_ZapdosGalarian, + [SPECIES_MOLTRES_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_MoltresGalarian, + [SPECIES_SLOWKING_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowkingGalarian, + [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, + [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, + [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, + [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, + [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, + [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, + [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, @@ -1094,7 +1094,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_QuestionMark, + [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_DarmanitanZenModeGalarian, [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn, [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter, @@ -1211,29 +1211,29 @@ const u8 *const gMonIconTable[] = [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, - [SPECIES_CRAMORANT_GULPING] = gMonIcon_QuestionMark, - [SPECIES_CRAMORANT_GORGING] = gMonIcon_QuestionMark, - [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_QuestionMark, - [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_QuestionMark, - [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_RUBY_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_MATCHA_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_MINT_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_LEMON_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_SALTED_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_RUBY_SWIRL] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = gMonIcon_QuestionMark, - [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_QuestionMark, - [SPECIES_INDEEDEE_FEMALE] = gMonIcon_QuestionMark, - [SPECIES_MORPEKO_HANGRY] = gMonIcon_QuestionMark, - [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_QuestionMark, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_QuestionMark, - [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_QuestionMark, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_QuestionMark, - [SPECIES_ZARUDE_DADA] = gMonIcon_QuestionMark, - [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_QuestionMark, - [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_QuestionMark, + [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, + [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, + [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, + [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_Sinistea, + [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_Polteageist, + [SPECIES_ALCREMIE_RUBY_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubyCream, + [SPECIES_ALCREMIE_MATCHA_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMatchaCream, + [SPECIES_ALCREMIE_MINT_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMintCream, + [SPECIES_ALCREMIE_LEMON_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieLemonCream, + [SPECIES_ALCREMIE_SALTED_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieSaltedCream, + [SPECIES_ALCREMIE_RUBY_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubySwirl, + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieCaramelSwirl, + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRainbowSwirl, + [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_EiscueNoiceFace, + [SPECIES_INDEEDEE_FEMALE] = gMonIcon_IndeedeeFemale, + [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry, + [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield, + [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_QuestionMark,//gMonIcon_EternatusEternamax, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_QuestionMark,//gMonIcon_UrshifuRapidStrikeStyle, + [SPECIES_ZARUDE_DADA] = gMonIcon_QuestionMark,//gMonIcon_ZarudeDada, + [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexIceRider, + [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexShadowRider, [SPECIES_EGG] = gMonIcon_Egg, }; @@ -2053,14 +2053,14 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZERAORA] = 0, [SPECIES_MELTAN] = 2, [SPECIES_MELMETAL] = 2, - [SPECIES_GROOKEY] = 0, - [SPECIES_THWACKEY] = 0, - [SPECIES_RILLABOOM] = 0, + [SPECIES_GROOKEY] = 1, + [SPECIES_THWACKEY] = 1, + [SPECIES_RILLABOOM] = 1, [SPECIES_SCORBUNNY] = 0, [SPECIES_RABOOT] = 0, [SPECIES_CINDERACE] = 0, - [SPECIES_SOBBLE] = 0, - [SPECIES_DRIZZILE] = 0, + [SPECIES_SOBBLE] = 2, + [SPECIES_DRIZZILE] = 2, [SPECIES_INTELEON] = 0, [SPECIES_SKWOVET] = 0, [SPECIES_GREEDENT] = 0, @@ -2068,37 +2068,37 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CORVISQUIRE] = 0, [SPECIES_CORVIKNIGHT] = 0, [SPECIES_BLIPBUG] = 0, - [SPECIES_DOTTLER] = 0, + [SPECIES_DOTTLER] = 2, [SPECIES_ORBEETLE] = 0, - [SPECIES_NICKIT] = 0, - [SPECIES_THIEVUL] = 0, - [SPECIES_GOSSIFLEUR] = 0, - [SPECIES_ELDEGOSS] = 0, + [SPECIES_NICKIT] = 2, + [SPECIES_THIEVUL] = 2, + [SPECIES_GOSSIFLEUR] = 1, + [SPECIES_ELDEGOSS] = 1, [SPECIES_WOOLOO] = 0, - [SPECIES_DUBWOOL] = 0, + [SPECIES_DUBWOOL] = 2, [SPECIES_CHEWTLE] = 0, [SPECIES_DREDNAW] = 0, - [SPECIES_YAMPER] = 0, - [SPECIES_BOLTUND] = 0, + [SPECIES_YAMPER] = 1, + [SPECIES_BOLTUND] = 1, [SPECIES_ROLYCOLY] = 0, [SPECIES_CARKOL] = 0, [SPECIES_COALOSSAL] = 0, - [SPECIES_APPLIN] = 0, - [SPECIES_FLAPPLE] = 0, - [SPECIES_APPLETUN] = 0, - [SPECIES_SILICOBRA] = 0, - [SPECIES_SANDACONDA] = 0, + [SPECIES_APPLIN] = 1, + [SPECIES_FLAPPLE] = 1, + [SPECIES_APPLETUN] = 1, + [SPECIES_SILICOBRA] = 1, + [SPECIES_SANDACONDA] = 1, [SPECIES_CRAMORANT] = 0, [SPECIES_ARROKUDA] = 0, [SPECIES_BARRASKEWDA] = 0, [SPECIES_TOXEL] = 0, - [SPECIES_TOXTRICITY] = 0, + [SPECIES_TOXTRICITY] = 2, [SPECIES_SIZZLIPEDE] = 0, [SPECIES_CENTISKORCH] = 0, [SPECIES_CLOBBOPUS] = 0, - [SPECIES_GRAPPLOCT] = 0, - [SPECIES_SINISTEA] = 0, - [SPECIES_POLTEAGEIST] = 0, + [SPECIES_GRAPPLOCT] = 2, + [SPECIES_SINISTEA] = 2, + [SPECIES_POLTEAGEIST] = 2, [SPECIES_HATENNA] = 0, [SPECIES_HATTREM] = 0, [SPECIES_HATTERENE] = 0, @@ -2106,21 +2106,21 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MORGREM] = 0, [SPECIES_GRIMMSNARL] = 0, [SPECIES_OBSTAGOON] = 0, - [SPECIES_PERRSERKER] = 0, + [SPECIES_PERRSERKER] = 2, [SPECIES_CURSOLA] = 0, - [SPECIES_SIRFETCHD] = 0, + [SPECIES_SIRFETCHD] = 1, [SPECIES_MR_RIME] = 0, - [SPECIES_RUNERIGUS] = 0, - [SPECIES_MILCERY] = 0, + [SPECIES_RUNERIGUS] = 2, + [SPECIES_MILCERY] = 1, [SPECIES_ALCREMIE] = 0, [SPECIES_FALINKS] = 0, [SPECIES_PINCURCHIN] = 0, [SPECIES_SNOM] = 0, [SPECIES_FROSMOTH] = 0, - [SPECIES_STONJOURNER] = 0, + [SPECIES_STONJOURNER] = 2, [SPECIES_EISCUE] = 0, - [SPECIES_INDEEDEE] = 0, - [SPECIES_MORPEKO] = 0, + [SPECIES_INDEEDEE] = 2, + [SPECIES_MORPEKO] = 2, [SPECIES_CUFANT] = 0, [SPECIES_COPPERAJAH] = 0, [SPECIES_DRACOZOLT] = 0, @@ -2131,8 +2131,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DREEPY] = 0, [SPECIES_DRAKLOAK] = 0, [SPECIES_DRAGAPULT] = 0, - [SPECIES_ZACIAN] = 0, - [SPECIES_ZAMAZENTA] = 0, + [SPECIES_ZACIAN] = 2, + [SPECIES_ZAMAZENTA] = 2, [SPECIES_ETERNATUS] = 0, [SPECIES_KUBFU] = 0, [SPECIES_URSHIFU] = 0, @@ -2211,12 +2211,12 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_EXEGGUTOR_ALOLAN] = 1, [SPECIES_MAROWAK_ALOLAN] = 1, [SPECIES_MEOWTH_GALARIAN] = 0, - [SPECIES_PONYTA_GALARIAN] = 0, - [SPECIES_RAPIDASH_GALARIAN] = 0, + [SPECIES_PONYTA_GALARIAN] = 2, + [SPECIES_RAPIDASH_GALARIAN] = 2, [SPECIES_SLOWPOKE_GALARIAN] = 0, [SPECIES_SLOWBRO_GALARIAN] = 0, - [SPECIES_FARFETCHD_GALARIAN] = 0, - [SPECIES_WEEZING_GALARIAN] = 0, + [SPECIES_FARFETCHD_GALARIAN] = 1, + [SPECIES_WEEZING_GALARIAN] = 1, [SPECIES_MR_MIME_GALARIAN] = 0, [SPECIES_ARTICUNO_GALARIAN] = 0, [SPECIES_ZAPDOS_GALARIAN] = 0, @@ -2227,8 +2227,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_LINOONE_GALARIAN] = 0, [SPECIES_DARUMAKA_GALARIAN] = 0, [SPECIES_DARMANITAN_GALARIAN] = 0, - [SPECIES_YAMASK_GALARIAN] = 0, - [SPECIES_STUNFISK_GALARIAN] = 0, + [SPECIES_YAMASK_GALARIAN] = 2, + [SPECIES_STUNFISK_GALARIAN] = 1, [SPECIES_PIKACHU_COSPLAY] = 2, [SPECIES_PIKACHU_ROCK_STAR] = 1, [SPECIES_PIKACHU_BELLE] = 0, @@ -2394,9 +2394,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, [SPECIES_CRAMORANT_GULPING] = 0, [SPECIES_CRAMORANT_GORGING] = 0, - [SPECIES_TOXTRICITY_LOW_KEY] = 0, - [SPECIES_SINISTEA_ANTIQUE] = 0, - [SPECIES_POLTEAGEIST_ANTIQUE] = 0, + [SPECIES_TOXTRICITY_LOW_KEY] = 2, + [SPECIES_SINISTEA_ANTIQUE] = 2, + [SPECIES_POLTEAGEIST_ANTIQUE] = 2, [SPECIES_ALCREMIE_RUBY_CREAM] = 0, [SPECIES_ALCREMIE_MATCHA_CREAM] = 0, [SPECIES_ALCREMIE_MINT_CREAM] = 0, @@ -2406,10 +2406,10 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ALCREMIE_CARAMEL_SWIRL] = 0, [SPECIES_ALCREMIE_RAINBOW_SWIRL] = 0, [SPECIES_EISCUE_NOICE_FACE] = 0, - [SPECIES_INDEEDEE_FEMALE] = 0, - [SPECIES_MORPEKO_HANGRY] = 0, - [SPECIES_ZACIAN_CROWNED_SWORD] = 0, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 0, + [SPECIES_INDEEDEE_FEMALE] = 2, + [SPECIES_MORPEKO_HANGRY] = 2, + [SPECIES_ZACIAN_CROWNED_SWORD] = 2, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 2, [SPECIES_ETERNATUS_ETERNAMAX] = 0, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 0, [SPECIES_ZARUDE_DADA] = 0,