diff --git a/graphics/pokemon/abomasnow/mega/overworld.png b/graphics/pokemon/abomasnow/mega/overworld.png new file mode 100644 index 000000000..319e37016 Binary files /dev/null and b/graphics/pokemon/abomasnow/mega/overworld.png differ diff --git a/graphics/pokemon/abomasnow/mega/overworld_normal.pal b/graphics/pokemon/abomasnow/mega/overworld_normal.pal new file mode 100644 index 000000000..124ab1628 --- /dev/null +++ b/graphics/pokemon/abomasnow/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +48 72 56 +48 120 64 +50 86 102 +80 80 80 +122 122 122 +48 152 72 +120 120 152 +0 0 0 +160 168 200 +192 136 208 +184 192 208 +156 233 255 +216 216 232 +201 255 255 +232 232 248 diff --git a/graphics/pokemon/abomasnow/mega/overworld_shiny.pal b/graphics/pokemon/abomasnow/mega/overworld_shiny.pal new file mode 100644 index 000000000..91c1c0527 --- /dev/null +++ b/graphics/pokemon/abomasnow/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +41 66 79 +26 113 141 +50 86 102 +80 80 80 +122 122 122 +16 141 183 +120 120 152 +0 0 0 +160 168 200 +192 136 208 +184 192 208 +156 233 255 +216 216 232 +201 255 255 +232 232 248 diff --git a/graphics/pokemon/absol/mega/overworld.png b/graphics/pokemon/absol/mega/overworld.png new file mode 100644 index 000000000..609bcb4ff Binary files /dev/null and b/graphics/pokemon/absol/mega/overworld.png differ diff --git a/graphics/pokemon/absol/mega/overworld_normal.pal b/graphics/pokemon/absol/mega/overworld_normal.pal new file mode 100644 index 000000000..f112d97f6 --- /dev/null +++ b/graphics/pokemon/absol/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +40 48 64 +64 72 88 +64 72 96 +128 32 32 +96 104 128 +120 128 160 +0 0 0 +176 184 200 +208 216 232 +232 232 248 +96 104 128 +120 128 160 +40 48 64 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/absol/mega/overworld_shiny.pal b/graphics/pokemon/absol/mega/overworld_shiny.pal new file mode 100644 index 000000000..189f1f477 --- /dev/null +++ b/graphics/pokemon/absol/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +72 32 40 +124 38 38 +64 72 96 +128 32 32 +192 56 56 +240 88 88 +0 0 0 +176 184 200 +208 216 232 +232 232 248 +96 104 128 +120 128 160 +40 48 64 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/aerodactyl/mega/overworld.png b/graphics/pokemon/aerodactyl/mega/overworld.png new file mode 100644 index 000000000..286e43696 Binary files /dev/null and b/graphics/pokemon/aerodactyl/mega/overworld.png differ diff --git a/graphics/pokemon/aerodactyl/mega/overworld_normal.pal b/graphics/pokemon/aerodactyl/mega/overworld_normal.pal new file mode 100644 index 000000000..1a4ef75e7 --- /dev/null +++ b/graphics/pokemon/aerodactyl/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +62 62 62 +96 16 16 +92 92 92 +72 64 96 +122 122 122 +128 88 128 +128 112 176 +0 0 0 +144 136 200 +184 136 192 +176 176 224 +200 200 208 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/aerodactyl/mega/overworld_shiny.pal b/graphics/pokemon/aerodactyl/mega/overworld_shiny.pal new file mode 100644 index 000000000..a2869cb40 --- /dev/null +++ b/graphics/pokemon/aerodactyl/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +62 62 62 +96 16 16 +92 92 92 +72 64 96 +122 122 122 +79 76 138 +169 112 176 +0 0 0 +186 136 200 +112 116 222 +208 176 224 +200 200 208 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/aggron/mega/overworld.png b/graphics/pokemon/aggron/mega/overworld.png new file mode 100644 index 000000000..fbceb62a3 Binary files /dev/null and b/graphics/pokemon/aggron/mega/overworld.png differ diff --git a/graphics/pokemon/aggron/mega/overworld_normal.pal b/graphics/pokemon/aggron/mega/overworld_normal.pal new file mode 100644 index 000000000..e7ed20af2 --- /dev/null +++ b/graphics/pokemon/aggron/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +48 40 56 +72 64 80 +104 96 112 +97 97 120 +97 108 120 +208 88 88 +64 96 128 +104 144 200 +128 128 144 +153 153 174 +176 176 192 +0 0 0 +208 208 216 +232 232 248 +104 96 112 diff --git a/graphics/pokemon/aggron/mega/overworld_shiny.pal b/graphics/pokemon/aggron/mega/overworld_shiny.pal new file mode 100644 index 000000000..8a3048a37 --- /dev/null +++ b/graphics/pokemon/aggron/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +16 56 48 +32 88 88 +48 128 120 +120 110 97 +120 99 97 +208 88 88 +64 96 128 +208 88 88 +64 167 157 +174 164 153 +192 185 176 +0 0 0 +216 212 208 +248 241 232 +108 105 100 diff --git a/graphics/pokemon/alakazam/mega/overworld.png b/graphics/pokemon/alakazam/mega/overworld.png new file mode 100644 index 000000000..7eecdd28d Binary files /dev/null and b/graphics/pokemon/alakazam/mega/overworld.png differ diff --git a/graphics/pokemon/alakazam/mega/overworld_normal.pal b/graphics/pokemon/alakazam/mega/overworld_normal.pal new file mode 100644 index 000000000..f9858b0bc --- /dev/null +++ b/graphics/pokemon/alakazam/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +37 37 40 +71 42 23 +111 79 63 +93 93 99 +144 120 56 +201 65 59 +144 109 96 +216 168 48 +248 216 96 +176 176 184 +176 176 188 +0 0 0 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alakazam/mega/overworld_shiny.pal b/graphics/pokemon/alakazam/mega/overworld_shiny.pal new file mode 100644 index 000000000..73211d068 --- /dev/null +++ b/graphics/pokemon/alakazam/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +37 37 40 +71 42 23 +142 72 100 +93 93 99 +144 120 56 +201 65 59 +193 103 130 +216 168 48 +248 216 96 +176 176 184 +176 176 188 +0 0 0 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/altaria/mega/overworld.png b/graphics/pokemon/altaria/mega/overworld.png new file mode 100644 index 000000000..d85233b8a Binary files /dev/null and b/graphics/pokemon/altaria/mega/overworld.png differ diff --git a/graphics/pokemon/altaria/mega/overworld_normal.pal b/graphics/pokemon/altaria/mega/overworld_normal.pal new file mode 100644 index 000000000..af72a688c --- /dev/null +++ b/graphics/pokemon/altaria/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +0 32 96 +0 64 104 +72 80 104 +40 104 152 +40 128 168 +112 128 144 +64 168 216 +96 192 232 +0 0 0 +168 176 192 +208 224 232 +248 248 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/altaria/mega/overworld_shiny.pal b/graphics/pokemon/altaria/mega/overworld_shiny.pal new file mode 100644 index 000000000..b15eb80b8 --- /dev/null +++ b/graphics/pokemon/altaria/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +77 96 16 +104 95 18 +72 80 104 +151 146 55 +167 149 58 +112 128 144 +215 194 85 +231 209 115 +0 0 0 +168 176 192 +208 224 232 +248 248 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/ampharos/mega/overworld.png b/graphics/pokemon/ampharos/mega/overworld.png new file mode 100644 index 000000000..c96d8e2be Binary files /dev/null and b/graphics/pokemon/ampharos/mega/overworld.png differ diff --git a/graphics/pokemon/ampharos/mega/overworld_normal.pal b/graphics/pokemon/ampharos/mega/overworld_normal.pal new file mode 100644 index 000000000..38bd7636c --- /dev/null +++ b/graphics/pokemon/ampharos/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +104 88 8 +48 56 64 +80 96 112 +128 24 8 +184 56 16 +240 88 80 +152 128 24 +200 160 32 +240 208 88 +112 128 152 +136 152 176 +184 200 224 +0 0 0 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/ampharos/mega/overworld_shiny.pal b/graphics/pokemon/ampharos/mega/overworld_shiny.pal new file mode 100644 index 000000000..53ddfe807 --- /dev/null +++ b/graphics/pokemon/ampharos/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +98 43 91 +48 56 64 +80 96 112 +8 62 128 +16 74 184 +80 165 240 +147 75 141 +187 98 185 +226 161 225 +112 128 152 +136 152 176 +184 200 224 +0 0 0 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/araquanid/icon.png b/graphics/pokemon/araquanid/icon.png index fa13eba83..10676126a 100644 Binary files a/graphics/pokemon/araquanid/icon.png and b/graphics/pokemon/araquanid/icon.png differ diff --git a/graphics/pokemon/ariados/anim_front.png b/graphics/pokemon/ariados/anim_front.png index 945c4d188..82d947054 100644 Binary files a/graphics/pokemon/ariados/anim_front.png and b/graphics/pokemon/ariados/anim_front.png differ diff --git a/graphics/pokemon/audino/mega/overworld.png b/graphics/pokemon/audino/mega/overworld.png new file mode 100644 index 000000000..180d9a788 Binary files /dev/null and b/graphics/pokemon/audino/mega/overworld.png differ diff --git a/graphics/pokemon/audino/mega/overworld_normal.pal b/graphics/pokemon/audino/mega/overworld_normal.pal new file mode 100644 index 000000000..e7058d01f --- /dev/null +++ b/graphics/pokemon/audino/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +112 64 72 +128 88 24 +184 144 24 +216 192 72 +226 115 139 +209 165 186 +0 0 0 +248 224 136 +240 202 222 +248 228 238 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/audino/mega/overworld_shiny.pal b/graphics/pokemon/audino/mega/overworld_shiny.pal new file mode 100644 index 000000000..71b23c24b --- /dev/null +++ b/graphics/pokemon/audino/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +112 64 104 +128 88 24 +184 144 24 +216 192 72 +184 144 24 +209 165 186 +0 0 0 +248 224 136 +233 202 240 +245 228 248 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/audino/overworld.png b/graphics/pokemon/audino/overworld.png index 27fdc5f6b..082abdd27 100644 Binary files a/graphics/pokemon/audino/overworld.png and b/graphics/pokemon/audino/overworld.png differ diff --git a/graphics/pokemon/banette/mega/overworld.png b/graphics/pokemon/banette/mega/overworld.png new file mode 100644 index 000000000..cd5a63078 Binary files /dev/null and b/graphics/pokemon/banette/mega/overworld.png differ diff --git a/graphics/pokemon/banette/mega/overworld_normal.pal b/graphics/pokemon/banette/mega/overworld_normal.pal new file mode 100644 index 000000000..f98360fa1 --- /dev/null +++ b/graphics/pokemon/banette/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +44 36 58 +72 56 16 +120 96 24 +71 58 87 +100 87 115 +160 128 40 +200 160 48 +178 90 154 +135 115 144 +213 106 188 +243 120 219 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/banette/mega/overworld_shiny.pal b/graphics/pokemon/banette/mega/overworld_shiny.pal new file mode 100644 index 000000000..1ebf612ac --- /dev/null +++ b/graphics/pokemon/banette/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +32 59 58 +72 56 16 +120 96 24 +52 85 89 +81 114 117 +160 128 40 +200 160 48 +178 90 154 +109 135 146 +213 106 188 +243 120 219 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/beedrill/mega/overworld.png b/graphics/pokemon/beedrill/mega/overworld.png new file mode 100644 index 000000000..8bc2cb674 Binary files /dev/null and b/graphics/pokemon/beedrill/mega/overworld.png differ diff --git a/graphics/pokemon/beedrill/mega/overworld_normal.pal b/graphics/pokemon/beedrill/mega/overworld_normal.pal new file mode 100644 index 000000000..660a71651 --- /dev/null +++ b/graphics/pokemon/beedrill/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +51 49 47 +51 50 47 +104 80 40 +80 80 80 +192 40 64 +183 143 49 +245 202 48 +144 144 144 +154 152 145 +245 231 171 +0 0 0 +192 192 192 +210 220 221 +232 232 248 +255 255 255 diff --git a/graphics/pokemon/beedrill/mega/overworld_shiny.pal b/graphics/pokemon/beedrill/mega/overworld_shiny.pal new file mode 100644 index 000000000..8a6ca6e8e --- /dev/null +++ b/graphics/pokemon/beedrill/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +51 49 47 +51 50 47 +69 104 42 +80 80 80 +44 81 173 +100 183 54 +107 245 56 +144 144 144 +154 152 145 +245 231 171 +0 0 0 +192 192 192 +210 220 221 +232 232 248 +255 255 255 diff --git a/graphics/pokemon/bewear/icon.png b/graphics/pokemon/bewear/icon.png index 5ceb073fb..30cc96672 100644 Binary files a/graphics/pokemon/bewear/icon.png and b/graphics/pokemon/bewear/icon.png differ diff --git a/graphics/pokemon/blacephalon/icon.png b/graphics/pokemon/blacephalon/icon.png index bb1f9cdc3..c3fad2f3e 100644 Binary files a/graphics/pokemon/blacephalon/icon.png and b/graphics/pokemon/blacephalon/icon.png differ diff --git a/graphics/pokemon/blastoise/mega/overworld.png b/graphics/pokemon/blastoise/mega/overworld.png new file mode 100644 index 000000000..ec3ad397c Binary files /dev/null and b/graphics/pokemon/blastoise/mega/overworld.png differ diff --git a/graphics/pokemon/blastoise/mega/overworld_normal.pal b/graphics/pokemon/blastoise/mega/overworld_normal.pal new file mode 100644 index 000000000..58d6f0db2 --- /dev/null +++ b/graphics/pokemon/blastoise/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +72 40 8 +48 56 88 +80 80 80 +160 8 48 +128 80 8 +176 112 24 +152 136 80 +200 168 80 +240 200 80 +64 120 216 +112 152 224 +136 136 136 +184 184 184 +0 0 0 +232 232 248 diff --git a/graphics/pokemon/blastoise/mega/overworld_shiny.pal b/graphics/pokemon/blastoise/mega/overworld_shiny.pal new file mode 100644 index 000000000..7bde8b938 --- /dev/null +++ b/graphics/pokemon/blastoise/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +56 67 11 +66 56 79 +80 80 80 +160 8 48 +86 118 14 +128 165 32 +152 136 80 +200 168 80 +240 200 80 +120 96 184 +154 135 200 +136 136 136 +184 184 184 +0 0 0 +232 232 248 diff --git a/graphics/pokemon/blaziken/mega/overworld.png b/graphics/pokemon/blaziken/mega/overworld.png new file mode 100644 index 000000000..ec6833026 Binary files /dev/null and b/graphics/pokemon/blaziken/mega/overworld.png differ diff --git a/graphics/pokemon/blaziken/mega/overworld_normal.pal b/graphics/pokemon/blaziken/mega/overworld_normal.pal new file mode 100644 index 000000000..243ecb769 --- /dev/null +++ b/graphics/pokemon/blaziken/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +97 21 7 +114 42 38 +78 78 78 +112 88 64 +176 38 38 +219 60 53 +238 122 36 +237 106 99 +176 128 80 +208 184 88 +248 208 80 +32 96 184 +240 224 152 +255 242 183 +0 0 0 diff --git a/graphics/pokemon/blaziken/mega/overworld_shiny.pal b/graphics/pokemon/blaziken/mega/overworld_shiny.pal new file mode 100644 index 000000000..cec00622d --- /dev/null +++ b/graphics/pokemon/blaziken/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +97 48 7 +114 42 38 +78 78 78 +112 88 64 +176 80 38 +219 110 53 +238 122 36 +237 148 99 +176 128 80 +208 184 88 +248 208 80 +32 96 184 +240 224 152 +255 242 183 +0 0 0 diff --git a/graphics/pokemon/boldore/overworld.png b/graphics/pokemon/boldore/overworld.png index 013a09dcf..e4c4cb5b1 100644 Binary files a/graphics/pokemon/boldore/overworld.png and b/graphics/pokemon/boldore/overworld.png differ diff --git a/graphics/pokemon/bounsweet/icon.png b/graphics/pokemon/bounsweet/icon.png index 80df38b9a..5fa805deb 100644 Binary files a/graphics/pokemon/bounsweet/icon.png and b/graphics/pokemon/bounsweet/icon.png differ diff --git a/graphics/pokemon/brionne/icon.png b/graphics/pokemon/brionne/icon.png index da33e8ee0..88cf5d01b 100644 Binary files a/graphics/pokemon/brionne/icon.png and b/graphics/pokemon/brionne/icon.png differ diff --git a/graphics/pokemon/bruxish/icon.png b/graphics/pokemon/bruxish/icon.png index 00d049a5c..eab625140 100644 Binary files a/graphics/pokemon/bruxish/icon.png and b/graphics/pokemon/bruxish/icon.png differ diff --git a/graphics/pokemon/bulbasaur/icon.png b/graphics/pokemon/bulbasaur/icon.png index 7738836b9..d8f508ee8 100644 Binary files a/graphics/pokemon/bulbasaur/icon.png and b/graphics/pokemon/bulbasaur/icon.png differ diff --git a/graphics/pokemon/buzzwole/icon.png b/graphics/pokemon/buzzwole/icon.png index 72e3270da..c1126c081 100644 Binary files a/graphics/pokemon/buzzwole/icon.png and b/graphics/pokemon/buzzwole/icon.png differ diff --git a/graphics/pokemon/camerupt/mega/overworld.png b/graphics/pokemon/camerupt/mega/overworld.png new file mode 100644 index 000000000..38fd221e9 Binary files /dev/null and b/graphics/pokemon/camerupt/mega/overworld.png differ diff --git a/graphics/pokemon/camerupt/mega/overworld_normal.pal b/graphics/pokemon/camerupt/mega/overworld_normal.pal new file mode 100644 index 000000000..395fb07c8 --- /dev/null +++ b/graphics/pokemon/camerupt/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +32 37 41 +88 32 32 +48 56 64 +96 85 64 +88 96 96 +178 53 27 +213 77 26 +227 111 51 +128 112 80 +217 132 42 +235 192 61 +160 152 120 +192 184 152 +0 0 0 +248 248 248 diff --git a/graphics/pokemon/camerupt/mega/overworld_shiny.pal b/graphics/pokemon/camerupt/mega/overworld_shiny.pal new file mode 100644 index 000000000..2de7faa9a --- /dev/null +++ b/graphics/pokemon/camerupt/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +32 37 41 +57 57 62 +48 56 64 +96 85 64 +88 96 96 +96 94 118 +213 77 26 +142 134 159 +128 112 80 +217 132 42 +235 192 61 +160 152 120 +192 184 152 +0 0 0 +248 248 248 diff --git a/graphics/pokemon/celesteela/icon.png b/graphics/pokemon/celesteela/icon.png index 854c36851..7722e43da 100644 Binary files a/graphics/pokemon/celesteela/icon.png and b/graphics/pokemon/celesteela/icon.png differ diff --git a/graphics/pokemon/charizard/mega_x/overworld.png b/graphics/pokemon/charizard/mega_x/overworld.png new file mode 100644 index 000000000..47ef85b67 Binary files /dev/null and b/graphics/pokemon/charizard/mega_x/overworld.png differ diff --git a/graphics/pokemon/charizard/mega_x/overworld_normal.pal b/graphics/pokemon/charizard/mega_x/overworld_normal.pal new file mode 100644 index 000000000..32de717e2 --- /dev/null +++ b/graphics/pokemon/charizard/mega_x/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +30 31 36 +80 29 52 +126 40 64 +74 78 90 +91 94 103 +107 109 115 +40 96 142 +74 132 189 +57 173 255 +126 178 213 +160 160 160 +0 0 0 +149 209 241 +165 231 255 +216 216 248 diff --git a/graphics/pokemon/charizard/mega_x/overworld_shiny.pal b/graphics/pokemon/charizard/mega_x/overworld_shiny.pal new file mode 100644 index 000000000..ca80ec4de --- /dev/null +++ b/graphics/pokemon/charizard/mega_x/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +30 31 36 +80 29 52 +126 40 64 +45 83 75 +62 116 105 +71 136 123 +142 40 54 +189 74 84 +57 173 255 +126 178 213 +160 160 160 +0 0 0 +149 209 241 +165 231 255 +216 216 248 diff --git a/graphics/pokemon/charizard/mega_y/overworld.png b/graphics/pokemon/charizard/mega_y/overworld.png new file mode 100644 index 000000000..ec153e5a3 Binary files /dev/null and b/graphics/pokemon/charizard/mega_y/overworld.png differ diff --git a/graphics/pokemon/charizard/mega_y/overworld_normal.pal b/graphics/pokemon/charizard/mega_y/overworld_normal.pal new file mode 100644 index 000000000..7bf6f4e8e --- /dev/null +++ b/graphics/pokemon/charizard/mega_y/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +96 48 0 +96 64 0 +40 72 88 +192 16 32 +144 64 32 +200 88 40 +248 120 56 +248 184 16 +216 168 48 +240 208 112 +64 128 128 +160 160 160 +0 0 0 +216 216 248 +0 0 0 diff --git a/graphics/pokemon/charizard/mega_y/overworld_shiny.pal b/graphics/pokemon/charizard/mega_y/overworld_shiny.pal new file mode 100644 index 000000000..6aedfdfd2 --- /dev/null +++ b/graphics/pokemon/charizard/mega_y/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +53 34 65 +77 76 80 +118 33 45 +192 16 32 +86 72 106 +115 96 142 +146 122 178 +248 184 16 +163 161 167 +196 194 199 +160 61 70 +160 160 160 +0 0 0 +216 216 248 +0 0 0 diff --git a/graphics/pokemon/charjabug/icon.png b/graphics/pokemon/charjabug/icon.png index eb2f9206e..6743ab681 100644 Binary files a/graphics/pokemon/charjabug/icon.png and b/graphics/pokemon/charjabug/icon.png differ diff --git a/graphics/pokemon/cinderace/gmax/icon.png b/graphics/pokemon/cinderace/gmax/icon.png index 3d1f1e423..791801bb6 100644 Binary files a/graphics/pokemon/cinderace/gmax/icon.png and b/graphics/pokemon/cinderace/gmax/icon.png differ diff --git a/graphics/pokemon/clodsire/anim_front.png b/graphics/pokemon/clodsire/anim_front.png new file mode 100644 index 000000000..1630189f6 Binary files /dev/null and b/graphics/pokemon/clodsire/anim_front.png differ diff --git a/graphics/pokemon/clodsire/back.png b/graphics/pokemon/clodsire/back.png index 64132a060..115f84243 100755 Binary files a/graphics/pokemon/clodsire/back.png and b/graphics/pokemon/clodsire/back.png differ diff --git a/graphics/pokemon/clodsire/normal.pal b/graphics/pokemon/clodsire/normal.pal index c7d36df32..bf8f45d0c 100755 --- a/graphics/pokemon/clodsire/normal.pal +++ b/graphics/pokemon/clodsire/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 60 48 -128 108 96 +153 211 165 +248 141 165 +176 90 105 +105 54 57 +184 160 162 +152 122 126 +86 71 72 +128 109 102 96 80 72 -48 40 32 +69 60 50 +51 41 36 +46 39 36 16 16 16 -184 160 160 -208 208 208 -40 36 32 -152 120 120 -80 68 72 -104 52 56 -176 88 104 -248 140 160 -0 0 0 -0 0 0 +215 189 217 +152 116 156 +91 67 108 diff --git a/graphics/pokemon/clodsire/shiny.pal b/graphics/pokemon/clodsire/shiny.pal index fcf3c9dc2..e3c18d79d 100755 --- a/graphics/pokemon/clodsire/shiny.pal +++ b/graphics/pokemon/clodsire/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -74 67 90 -127 116 143 -107 97 124 -46 40 44 -16 16 16 +153 211 165 +248 141 142 +176 94 90 +105 62 54 160 158 197 -205 180 170 -40 36 32 127 127 157 87 85 112 -104 52 56 -176 88 104 -248 140 160 -0 0 0 -0 0 0 +127 116 143 +107 97 124 +74 67 90 +49 43 62 +46 40 44 +16 16 16 +230 209 181 +201 159 123 +99 63 59 diff --git a/graphics/pokemon/comfey/icon.png b/graphics/pokemon/comfey/icon.png index 916ac5c18..10d1a3fe5 100644 Binary files a/graphics/pokemon/comfey/icon.png and b/graphics/pokemon/comfey/icon.png differ diff --git a/graphics/pokemon/cosmoem/icon.png b/graphics/pokemon/cosmoem/icon.png index ab4c13b8f..c461bdada 100644 Binary files a/graphics/pokemon/cosmoem/icon.png and b/graphics/pokemon/cosmoem/icon.png differ diff --git a/graphics/pokemon/cosmog/icon.png b/graphics/pokemon/cosmog/icon.png index 6057034a9..a74b399d1 100644 Binary files a/graphics/pokemon/cosmog/icon.png and b/graphics/pokemon/cosmog/icon.png differ diff --git a/graphics/pokemon/cottonee/overworld.png b/graphics/pokemon/cottonee/overworld.png index 15aec0406..55a0d48ba 100644 Binary files a/graphics/pokemon/cottonee/overworld.png and b/graphics/pokemon/cottonee/overworld.png differ diff --git a/graphics/pokemon/cottonee/overworld_normal.pal b/graphics/pokemon/cottonee/overworld_normal.pal index 76222db0c..2af87bcf9 100644 --- a/graphics/pokemon/cottonee/overworld_normal.pal +++ b/graphics/pokemon/cottonee/overworld_normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 110 110 110 -204 227 209 -208 241 229 -164 207 173 +198 212 159 +222 230 197 +165 173 132 64 128 16 92 224 48 74 176 49 47 46 47 -198 196 235 -137 162 175 +165 173 132 +123 132 107 238 238 247 137 117 107 -230 77 40 +230 132 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/cottonee/overworld_shiny.pal b/graphics/pokemon/cottonee/overworld_shiny.pal index bb3d8c85c..d530eb089 100644 --- a/graphics/pokemon/cottonee/overworld_shiny.pal +++ b/graphics/pokemon/cottonee/overworld_shiny.pal @@ -11,9 +11,9 @@ JASC-PAL 192 96 40 47 46 47 192 176 136 -137 162 175 +112 96 40 248 248 248 -137 117 107 -230 77 40 +138 106 91 +112 184 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/crabominable/icon.png b/graphics/pokemon/crabominable/icon.png index e3f32d504..c3ae3235b 100644 Binary files a/graphics/pokemon/crabominable/icon.png and b/graphics/pokemon/crabominable/icon.png differ diff --git a/graphics/pokemon/crabrawler/icon.png b/graphics/pokemon/crabrawler/icon.png index d28b81b6b..47b3b3451 100644 Binary files a/graphics/pokemon/crabrawler/icon.png and b/graphics/pokemon/crabrawler/icon.png differ diff --git a/graphics/pokemon/cutiefly/icon.png b/graphics/pokemon/cutiefly/icon.png index 5e25a942d..25af39c74 100644 Binary files a/graphics/pokemon/cutiefly/icon.png and b/graphics/pokemon/cutiefly/icon.png differ diff --git a/graphics/pokemon/dartrix/icon.png b/graphics/pokemon/dartrix/icon.png index 39fb8fddd..bd378938d 100644 Binary files a/graphics/pokemon/dartrix/icon.png and b/graphics/pokemon/dartrix/icon.png differ diff --git a/graphics/pokemon/decidueye/icon.png b/graphics/pokemon/decidueye/icon.png index 6078f20b8..8cb628c31 100644 Binary files a/graphics/pokemon/decidueye/icon.png and b/graphics/pokemon/decidueye/icon.png differ diff --git a/graphics/pokemon/deoxys/anim_front.png b/graphics/pokemon/deoxys/anim_front.png index d2f3e9938..fc782931d 100644 Binary files a/graphics/pokemon/deoxys/anim_front.png and b/graphics/pokemon/deoxys/anim_front.png differ diff --git a/graphics/pokemon/deoxys/attack/anim_front.png b/graphics/pokemon/deoxys/attack/anim_front.png index 0b43a9fe1..566e80eaf 100644 Binary files a/graphics/pokemon/deoxys/attack/anim_front.png and b/graphics/pokemon/deoxys/attack/anim_front.png differ diff --git a/graphics/pokemon/deoxys/attack/normal.pal b/graphics/pokemon/deoxys/attack/normal.pal index 246d4784a..52ddbb8fc 100644 --- a/graphics/pokemon/deoxys/attack/normal.pal +++ b/graphics/pokemon/deoxys/attack/normal.pal @@ -3,8 +3,8 @@ JASC-PAL 16 248 160 176 96 56 56 -248 112 72 -184 104 104 +255 115 74 +204 65 65 24 24 24 104 200 224 80 144 176 diff --git a/graphics/pokemon/deoxys/defense/anim_front.png b/graphics/pokemon/deoxys/defense/anim_front.png index 2ee6e0c52..ce3cdad39 100644 Binary files a/graphics/pokemon/deoxys/defense/anim_front.png and b/graphics/pokemon/deoxys/defense/anim_front.png differ diff --git a/graphics/pokemon/deoxys/defense/normal.pal b/graphics/pokemon/deoxys/defense/normal.pal index 8b37f5111..4beda8613 100644 --- a/graphics/pokemon/deoxys/defense/normal.pal +++ b/graphics/pokemon/deoxys/defense/normal.pal @@ -3,9 +3,9 @@ JASC-PAL 16 248 160 176 96 56 56 -192 104 104 -248 112 72 -96 64 48 +204 65 65 +255 115 74 +68 28 89 240 176 144 104 200 224 80 144 176 diff --git a/graphics/pokemon/deoxys/defense/shiny.pal b/graphics/pokemon/deoxys/defense/shiny.pal index c1f34410a..3f285246c 100644 --- a/graphics/pokemon/deoxys/defense/shiny.pal +++ b/graphics/pokemon/deoxys/defense/shiny.pal @@ -5,7 +5,7 @@ JASC-PAL 112 96 16 168 168 56 248 232 64 -96 64 48 +49 29 82 248 248 216 112 208 168 72 160 112 diff --git a/graphics/pokemon/deoxys/normal.pal b/graphics/pokemon/deoxys/normal.pal index 59124c56a..e11c27771 100644 --- a/graphics/pokemon/deoxys/normal.pal +++ b/graphics/pokemon/deoxys/normal.pal @@ -2,12 +2,12 @@ JASC-PAL 0100 16 248 160 176 -184 104 104 +204 65 65 248 176 144 -248 112 72 +255 115 74 96 56 56 104 200 224 -88 56 48 +68 28 89 56 80 96 80 144 176 152 96 176 diff --git a/graphics/pokemon/deoxys/shiny.pal b/graphics/pokemon/deoxys/shiny.pal index 5bbc6b683..621aac6d4 100644 --- a/graphics/pokemon/deoxys/shiny.pal +++ b/graphics/pokemon/deoxys/shiny.pal @@ -7,7 +7,7 @@ JASC-PAL 248 232 64 112 96 16 112 208 168 -112 96 16 +51 27 101 56 96 88 72 160 112 96 120 192 diff --git a/graphics/pokemon/deoxys/speed/anim_front.png b/graphics/pokemon/deoxys/speed/anim_front.png index 947052f81..1f2063bdd 100644 Binary files a/graphics/pokemon/deoxys/speed/anim_front.png and b/graphics/pokemon/deoxys/speed/anim_front.png differ diff --git a/graphics/pokemon/deoxys/speed/normal.pal b/graphics/pokemon/deoxys/speed/normal.pal index dad052e1d..ea1073a0e 100644 --- a/graphics/pokemon/deoxys/speed/normal.pal +++ b/graphics/pokemon/deoxys/speed/normal.pal @@ -6,9 +6,9 @@ JASC-PAL 80 144 176 104 200 224 96 56 56 -248 112 72 +255 115 74 24 24 24 -192 104 104 +204 65 65 192 192 208 152 96 176 248 248 248 diff --git a/graphics/pokemon/dewpider/icon.png b/graphics/pokemon/dewpider/icon.png index bcf5707d3..2cc98e2a3 100644 Binary files a/graphics/pokemon/dewpider/icon.png and b/graphics/pokemon/dewpider/icon.png differ diff --git a/graphics/pokemon/dhelmise/icon.png b/graphics/pokemon/dhelmise/icon.png index 07b0c4d18..fd7e83627 100644 Binary files a/graphics/pokemon/dhelmise/icon.png and b/graphics/pokemon/dhelmise/icon.png differ diff --git a/graphics/pokemon/diancie/mega/overworld.png b/graphics/pokemon/diancie/mega/overworld.png new file mode 100644 index 000000000..2843e4fc3 Binary files /dev/null and b/graphics/pokemon/diancie/mega/overworld.png differ diff --git a/graphics/pokemon/diancie/mega/overworld_normal.pal b/graphics/pokemon/diancie/mega/overworld_normal.pal new file mode 100644 index 000000000..004fc3731 --- /dev/null +++ b/graphics/pokemon/diancie/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +45 46 58 +75 77 101 +167 41 91 +198 152 98 +116 120 150 +217 95 170 +182 166 178 +227 199 137 +242 154 218 +0 0 0 +225 213 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/diancie/mega/overworld_shiny.pal b/graphics/pokemon/diancie/mega/overworld_shiny.pal new file mode 100644 index 000000000..32e063691 --- /dev/null +++ b/graphics/pokemon/diancie/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +45 46 58 +144 36 77 +161 42 109 +198 152 98 +116 120 150 +217 100 143 +211 127 159 +227 199 137 +243 148 184 +0 0 0 +255 177 207 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/diggersby/anim_front.png b/graphics/pokemon/diggersby/anim_front.png index f2a0998e8..69c49c527 100644 Binary files a/graphics/pokemon/diggersby/anim_front.png and b/graphics/pokemon/diggersby/anim_front.png differ diff --git a/graphics/pokemon/diggersby/back.png b/graphics/pokemon/diggersby/back.png index 36a437381..a1cc29260 100644 Binary files a/graphics/pokemon/diggersby/back.png and b/graphics/pokemon/diggersby/back.png differ diff --git a/graphics/pokemon/diggersby/shiny.pal b/graphics/pokemon/diggersby/shiny.pal index 5fd7727a4..f5f12f2cf 100644 --- a/graphics/pokemon/diggersby/shiny.pal +++ b/graphics/pokemon/diggersby/shiny.pal @@ -6,7 +6,7 @@ JASC-PAL 120 120 112 160 160 144 8 8 8 -120 120 112 +84 84 78 48 48 56 232 232 232 240 152 168 diff --git a/graphics/pokemon/diglett/alola/icon.png b/graphics/pokemon/diglett/alola/icon.png index 1b575078a..ccde6cb2a 100644 Binary files a/graphics/pokemon/diglett/alola/icon.png and b/graphics/pokemon/diglett/alola/icon.png differ diff --git a/graphics/pokemon/drampa/icon.png b/graphics/pokemon/drampa/icon.png index 5550dcb74..59428b634 100644 Binary files a/graphics/pokemon/drampa/icon.png and b/graphics/pokemon/drampa/icon.png differ diff --git a/graphics/pokemon/drilbur/overworld.png b/graphics/pokemon/drilbur/overworld.png index 9d1c7ddcf..981e575fc 100644 Binary files a/graphics/pokemon/drilbur/overworld.png and b/graphics/pokemon/drilbur/overworld.png differ diff --git a/graphics/pokemon/drilbur/overworld_normal.pal b/graphics/pokemon/drilbur/overworld_normal.pal index 34ab39137..9d33ec625 100644 --- a/graphics/pokemon/drilbur/overworld_normal.pal +++ b/graphics/pokemon/drilbur/overworld_normal.pal @@ -5,7 +5,7 @@ JASC-PAL 40 40 40 40 40 40 11 11 11 -55 55 55 +43 43 43 55 55 55 87 87 87 0 0 0 diff --git a/graphics/pokemon/dugtrio/alola/icon.png b/graphics/pokemon/dugtrio/alola/icon.png index 2a409cb8d..3b10a41c6 100644 Binary files a/graphics/pokemon/dugtrio/alola/icon.png and b/graphics/pokemon/dugtrio/alola/icon.png differ diff --git a/graphics/pokemon/duraludon/anim_front.png b/graphics/pokemon/duraludon/anim_front.png new file mode 100644 index 000000000..32624a498 Binary files /dev/null and b/graphics/pokemon/duraludon/anim_front.png differ diff --git a/graphics/pokemon/duraludon/overworld.png b/graphics/pokemon/duraludon/overworld.png index 0c8228abc..a7488c496 100644 Binary files a/graphics/pokemon/duraludon/overworld.png and b/graphics/pokemon/duraludon/overworld.png differ diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/duraludon/shiny.pal index 19e7323e3..9ac865c3f 100644 --- a/graphics/pokemon/duraludon/shiny.pal +++ b/graphics/pokemon/duraludon/shiny.pal @@ -8,7 +8,7 @@ JASC-PAL 16 16 16 81 96 101 226 157 109 -253 248 236 +242 211 111 118 138 154 149 163 164 8 36 82 diff --git a/graphics/pokemon/emboar/overworld.png b/graphics/pokemon/emboar/overworld.png index 06e17288d..e647d062c 100644 Binary files a/graphics/pokemon/emboar/overworld.png and b/graphics/pokemon/emboar/overworld.png differ diff --git a/graphics/pokemon/emboar/overworld_normal.pal b/graphics/pokemon/emboar/overworld_normal.pal index e9f672d50..e507a90ca 100644 --- a/graphics/pokemon/emboar/overworld_normal.pal +++ b/graphics/pokemon/emboar/overworld_normal.pal @@ -6,14 +6,14 @@ JASC-PAL 5 5 5 48 48 48 111 40 1 -216 85 36 -188 82 31 +224 88 25 +184 80 32 119 19 12 -215 195 196 +240 240 240 230 49 41 -237 172 8 -180 139 32 +232 184 8 +176 136 32 123 90 8 -0 0 0 -0 0 0 +160 56 48 +64 64 64 0 0 0 diff --git a/graphics/pokemon/emboar/overworld_shiny.pal b/graphics/pokemon/emboar/overworld_shiny.pal index 1c5459473..8fa173f59 100644 --- a/graphics/pokemon/emboar/overworld_shiny.pal +++ b/graphics/pokemon/emboar/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -41 41 41 +32 32 32 5 5 5 -41 41 41 +48 48 48 117 70 5 229 130 31 -41 41 41 -41 41 41 -229 130 31 +168 96 40 +49 53 92 +240 240 240 128 152 224 151 195 221 128 152 224 -117 70 5 -0 0 0 -0 0 0 +64 72 144 +96 112 184 +61 61 61 0 0 0 diff --git a/graphics/pokemon/enamorus/anim_front.png b/graphics/pokemon/enamorus/anim_front.png new file mode 100644 index 000000000..e4b21fc52 Binary files /dev/null and b/graphics/pokemon/enamorus/anim_front.png differ diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/enamorus/back.png index 1b2b00e21..17668de57 100755 Binary files a/graphics/pokemon/enamorus/back.png and b/graphics/pokemon/enamorus/back.png differ diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/enamorus/normal.pal index 08f6e5ebf..b8986ffd4 100755 --- a/graphics/pokemon/enamorus/normal.pal +++ b/graphics/pokemon/enamorus/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 211 165 -74 74 74 +255 255 255 180 180 189 -252 252 252 +105 106 115 16 16 16 -118 50 58 -147 33 30 -224 116 156 -243 46 46 -174 74 87 -199 46 41 -243 84 143 -187 62 94 -255 197 60 -239 228 176 -0 0 0 +237 129 170 +185 81 133 +126 44 70 +255 203 81 +201 50 96 +157 36 61 +40 40 40 +177 109 135 +123 79 110 +82 50 75 +111 26 47 diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/enamorus/shiny.pal index 180ae687e..41b6650a7 100644 --- a/graphics/pokemon/enamorus/shiny.pal +++ b/graphics/pokemon/enamorus/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -74 74 74 -180 180 189 +153 211 165 255 255 255 -0 0 0 -131 57 82 -164 24 24 -230 131 164 -255 90 0 -189 82 106 -222 74 41 -255 139 238 -205 98 189 +194 184 173 +115 107 104 +16 16 16 +251 142 224 +198 83 185 +127 58 131 255 197 32 -0 0 0 -0 0 0 +246 81 4 +205 35 35 +40 40 40 +230 131 164 +189 82 106 +107 51 74 +140 29 49 diff --git a/graphics/pokemon/enamorus/therian/back.png b/graphics/pokemon/enamorus/therian/back.png index a563156e4..04a5286fc 100644 Binary files a/graphics/pokemon/enamorus/therian/back.png and b/graphics/pokemon/enamorus/therian/back.png differ diff --git a/graphics/pokemon/enamorus/therian/front.png b/graphics/pokemon/enamorus/therian/front.png index 8ac7c93f0..e51457cf8 100644 Binary files a/graphics/pokemon/enamorus/therian/front.png and b/graphics/pokemon/enamorus/therian/front.png differ diff --git a/graphics/pokemon/enamorus/therian/normal.pal b/graphics/pokemon/enamorus/therian/normal.pal index 096dfb36a..e2ddf7838 100644 --- a/graphics/pokemon/enamorus/therian/normal.pal +++ b/graphics/pokemon/enamorus/therian/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 213 164 -131 41 49 -213 106 156 +152 208 160 +112 48 56 +72 72 72 +144 32 24 +192 40 40 +240 40 40 +184 56 88 +168 72 80 +248 192 56 +240 80 136 +224 112 152 +176 176 184 16 16 16 -213 65 57 -74 74 74 -255 255 255 -180 180 189 -255 197 57 -123 164 131 -98 115 98 -148 197 156 -230 246 230 -49 57 49 -213 106 156 +248 248 248 +0 0 0 0 0 0 diff --git a/graphics/pokemon/enamorus/therian/shiny.pal b/graphics/pokemon/enamorus/therian/shiny.pal index 58c556462..a84be28f0 100644 --- a/graphics/pokemon/enamorus/therian/shiny.pal +++ b/graphics/pokemon/enamorus/therian/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 213 164 -131 41 49 -213 106 156 +152 208 160 +112 56 80 +72 72 72 +136 32 32 +192 72 48 +240 88 16 +176 96 176 +168 80 104 +248 192 56 +232 128 224 +200 128 152 +176 176 184 16 16 16 -213 65 57 -74 74 74 -255 255 255 -180 180 189 -255 197 57 -123 164 131 -98 115 98 -148 197 156 -230 246 230 -49 57 49 -238 131 230 +248 248 248 +0 0 0 0 0 0 diff --git a/graphics/pokemon/exeggutor/alola/icon.png b/graphics/pokemon/exeggutor/alola/icon.png index 723d0a4ea..49b788b71 100644 Binary files a/graphics/pokemon/exeggutor/alola/icon.png and b/graphics/pokemon/exeggutor/alola/icon.png differ diff --git a/graphics/pokemon/farfetchd/overworld.png b/graphics/pokemon/farfetchd/overworld.png index 46aec0976..63d29215b 100644 Binary files a/graphics/pokemon/farfetchd/overworld.png and b/graphics/pokemon/farfetchd/overworld.png differ diff --git a/graphics/pokemon/fezandipiti/back.png b/graphics/pokemon/fezandipiti/back.png index 458340504..4ca492548 100644 Binary files a/graphics/pokemon/fezandipiti/back.png and b/graphics/pokemon/fezandipiti/back.png differ diff --git a/graphics/pokemon/fezandipiti/front.png b/graphics/pokemon/fezandipiti/front.png index fc841ec39..1ff68f500 100644 Binary files a/graphics/pokemon/fezandipiti/front.png and b/graphics/pokemon/fezandipiti/front.png differ diff --git a/graphics/pokemon/fezandipiti/normal.pal b/graphics/pokemon/fezandipiti/normal.pal index ac9c00532..a34688fc3 100644 --- a/graphics/pokemon/fezandipiti/normal.pal +++ b/graphics/pokemon/fezandipiti/normal.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -152 208 160 -167 135 48 -118 61 41 -238 204 45 +16 +153 211 165 26 29 28 -78 73 71 45 45 45 -146 57 119 -202 103 162 -90 33 73 -192 78 22 -254 254 254 -164 175 176 -16 16 16 69 37 29 +118 61 41 +90 33 73 +78 73 71 +192 78 22 +146 57 119 +167 135 48 +238 204 45 +202 103 162 +179 177 162 +16 16 16 +254 254 254 +0 0 0 diff --git a/graphics/pokemon/fezandipiti/shiny.pal b/graphics/pokemon/fezandipiti/shiny.pal index 673473f5c..b8f491878 100644 --- a/graphics/pokemon/fezandipiti/shiny.pal +++ b/graphics/pokemon/fezandipiti/shiny.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -152 208 160 -167 135 48 -118 61 41 -238 204 45 +16 +153 211 165 26 29 28 -59 63 133 -36 40 99 -146 57 119 -202 103 162 -90 33 73 -192 78 22 -254 254 254 -164 175 176 -16 16 16 +51 48 101 69 37 29 +118 61 41 +90 33 73 +71 61 199 +192 78 22 +146 57 119 +167 135 48 +238 204 45 +202 103 162 +179 177 162 +16 16 16 +254 254 254 +0 0 0 diff --git a/graphics/pokemon/floette/eternal/icon.png b/graphics/pokemon/floette/eternal/icon.png index 32f7face1..4874a7720 100644 Binary files a/graphics/pokemon/floette/eternal/icon.png and b/graphics/pokemon/floette/eternal/icon.png differ diff --git a/graphics/pokemon/fomantis/icon.png b/graphics/pokemon/fomantis/icon.png index 2604f517d..d26f29932 100644 Binary files a/graphics/pokemon/fomantis/icon.png and b/graphics/pokemon/fomantis/icon.png differ diff --git a/graphics/pokemon/furfrou/dandy/anim_front.png b/graphics/pokemon/furfrou/dandy/anim_front.png new file mode 100644 index 000000000..a8395c443 Binary files /dev/null and b/graphics/pokemon/furfrou/dandy/anim_front.png differ diff --git a/graphics/pokemon/furfrou/dandy/back.png b/graphics/pokemon/furfrou/dandy/back.png new file mode 100644 index 000000000..7feb3479d Binary files /dev/null and b/graphics/pokemon/furfrou/dandy/back.png differ diff --git a/graphics/pokemon/furfrou/dandy/icon.png b/graphics/pokemon/furfrou/dandy/icon.png new file mode 100644 index 000000000..4903feef7 Binary files /dev/null and b/graphics/pokemon/furfrou/dandy/icon.png differ diff --git a/graphics/pokemon/furfrou/dandy/normal.pal b/graphics/pokemon/furfrou/dandy/normal.pal new file mode 100644 index 000000000..40a8d1151 --- /dev/null +++ b/graphics/pokemon/furfrou/dandy/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +160 160 152 +64 64 64 +122 119 97 +224 224 216 +204 209 181 +16 16 16 +52 73 34 +77 122 42 +110 168 63 +24 96 120 +72 80 64 +255 255 255 +184 0 48 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/dandy/overworld.png b/graphics/pokemon/furfrou/dandy/overworld.png new file mode 100644 index 000000000..4fa5e53c1 Binary files /dev/null and b/graphics/pokemon/furfrou/dandy/overworld.png differ diff --git a/graphics/pokemon/furfrou/dandy/overworld_normal.pal b/graphics/pokemon/furfrou/dandy/overworld_normal.pal new file mode 100644 index 000000000..16e445224 --- /dev/null +++ b/graphics/pokemon/furfrou/dandy/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +54 91 49 +88 88 88 +103 184 66 +237 241 227 +177 175 160 +16 16 16 +65 145 57 +91 134 247 +88 88 88 +237 241 227 +119 118 115 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/dandy/overworld_shiny.pal b/graphics/pokemon/furfrou/dandy/overworld_shiny.pal new file mode 100644 index 000000000..f25fd2922 --- /dev/null +++ b/graphics/pokemon/furfrou/dandy/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +54 91 49 +50 48 48 +103 184 66 +119 118 115 +88 88 88 +16 16 16 +65 145 57 +91 134 247 +177 175 160 +255 255 255 +237 241 227 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/dandy/shiny.pal b/graphics/pokemon/furfrou/dandy/shiny.pal new file mode 100644 index 000000000..a342aa9a3 --- /dev/null +++ b/graphics/pokemon/furfrou/dandy/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +66 66 68 +20 21 22 +39 39 40 +101 102 107 +82 82 89 +16 16 16 +45 79 40 +78 132 58 +110 185 43 +30 101 126 +179 181 180 +255 255 255 +189 0 48 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/debutante/anim_front.png b/graphics/pokemon/furfrou/debutante/anim_front.png new file mode 100644 index 000000000..aa3a5489e Binary files /dev/null and b/graphics/pokemon/furfrou/debutante/anim_front.png differ diff --git a/graphics/pokemon/furfrou/debutante/back.png b/graphics/pokemon/furfrou/debutante/back.png new file mode 100644 index 000000000..ec2567514 Binary files /dev/null and b/graphics/pokemon/furfrou/debutante/back.png differ diff --git a/graphics/pokemon/furfrou/debutante/icon.png b/graphics/pokemon/furfrou/debutante/icon.png new file mode 100644 index 000000000..57c08949a Binary files /dev/null and b/graphics/pokemon/furfrou/debutante/icon.png differ diff --git a/graphics/pokemon/furfrou/debutante/normal.pal b/graphics/pokemon/furfrou/debutante/normal.pal new file mode 100644 index 000000000..2d6b70f57 --- /dev/null +++ b/graphics/pokemon/furfrou/debutante/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +72 73 64 +224 224 216 +16 16 16 +160 160 152 +142 119 82 +255 240 173 +206 189 111 +72 80 64 +24 96 120 +184 0 48 +255 255 255 +233 234 234 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/debutante/overworld.png b/graphics/pokemon/furfrou/debutante/overworld.png new file mode 100644 index 000000000..4ba981659 Binary files /dev/null and b/graphics/pokemon/furfrou/debutante/overworld.png differ diff --git a/graphics/pokemon/furfrou/debutante/overworld_normal.pal b/graphics/pokemon/furfrou/debutante/overworld_normal.pal new file mode 100644 index 000000000..6acebd650 --- /dev/null +++ b/graphics/pokemon/furfrou/debutante/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +177 175 160 +237 241 227 +120 85 30 +229 214 89 +88 88 88 +188 149 56 +16 16 16 +91 134 247 +119 118 115 +237 241 227 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/debutante/overworld_shiny.pal b/graphics/pokemon/furfrou/debutante/overworld_shiny.pal new file mode 100644 index 000000000..43cfed54c --- /dev/null +++ b/graphics/pokemon/furfrou/debutante/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +88 88 88 +119 118 115 +120 85 30 +229 214 89 +177 175 160 +188 149 56 +16 16 16 +91 134 247 +237 241 227 +255 255 255 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/debutante/shiny.pal b/graphics/pokemon/furfrou/debutante/shiny.pal new file mode 100644 index 000000000..8ac48509b --- /dev/null +++ b/graphics/pokemon/furfrou/debutante/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +20 21 22 +101 102 107 +16 16 16 +66 66 68 +158 108 75 +251 245 136 +211 173 101 +179 181 180 +30 101 126 +189 0 48 +255 255 255 +233 234 234 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/diamond/anim_front.png b/graphics/pokemon/furfrou/diamond/anim_front.png new file mode 100644 index 000000000..5db380075 Binary files /dev/null and b/graphics/pokemon/furfrou/diamond/anim_front.png differ diff --git a/graphics/pokemon/furfrou/diamond/back.png b/graphics/pokemon/furfrou/diamond/back.png new file mode 100644 index 000000000..f3f8ae713 Binary files /dev/null and b/graphics/pokemon/furfrou/diamond/back.png differ diff --git a/graphics/pokemon/furfrou/diamond/icon.png b/graphics/pokemon/furfrou/diamond/icon.png new file mode 100644 index 000000000..815332baf Binary files /dev/null and b/graphics/pokemon/furfrou/diamond/icon.png differ diff --git a/graphics/pokemon/furfrou/diamond/normal.pal b/graphics/pokemon/furfrou/diamond/normal.pal new file mode 100644 index 000000000..7fdb0b262 --- /dev/null +++ b/graphics/pokemon/furfrou/diamond/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +72 73 64 +224 224 216 +160 160 152 +122 119 97 +16 16 16 +127 78 38 +242 171 89 +193 111 38 +72 80 64 +24 96 120 +184 0 48 +255 255 255 +233 234 234 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/diamond/overworld.png b/graphics/pokemon/furfrou/diamond/overworld.png new file mode 100644 index 000000000..ca116d262 Binary files /dev/null and b/graphics/pokemon/furfrou/diamond/overworld.png differ diff --git a/graphics/pokemon/furfrou/diamond/overworld_normal.pal b/graphics/pokemon/furfrou/diamond/overworld_normal.pal new file mode 100644 index 000000000..1251ffea2 --- /dev/null +++ b/graphics/pokemon/furfrou/diamond/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +111 51 19 +237 241 227 +252 141 44 +177 175 160 +16 16 16 +228 94 48 +119 118 115 +59 86 159 +91 134 247 +88 88 88 +119 118 115 +237 241 227 +188 4 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/diamond/overworld_shiny.pal b/graphics/pokemon/furfrou/diamond/overworld_shiny.pal new file mode 100644 index 000000000..8daa740a7 --- /dev/null +++ b/graphics/pokemon/furfrou/diamond/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +111 51 19 +119 118 115 +252 141 44 +88 88 88 +16 16 16 +228 94 48 +67 65 65 +59 86 159 +91 134 247 +177 175 160 +237 241 227 +255 255 255 +188 4 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/diamond/shiny.pal b/graphics/pokemon/furfrou/diamond/shiny.pal new file mode 100644 index 000000000..f83b4779f --- /dev/null +++ b/graphics/pokemon/furfrou/diamond/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +20 21 22 +101 102 107 +66 66 68 +39 39 40 +16 16 16 +124 60 37 +239 144 88 +191 86 42 +179 181 180 +30 101 126 +189 0 48 +255 255 255 +233 234 234 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/heart/anim_front.png b/graphics/pokemon/furfrou/heart/anim_front.png new file mode 100644 index 000000000..5cbba5a5c Binary files /dev/null and b/graphics/pokemon/furfrou/heart/anim_front.png differ diff --git a/graphics/pokemon/furfrou/heart/back.png b/graphics/pokemon/furfrou/heart/back.png new file mode 100644 index 000000000..de6a03902 Binary files /dev/null and b/graphics/pokemon/furfrou/heart/back.png differ diff --git a/graphics/pokemon/furfrou/heart/icon.png b/graphics/pokemon/furfrou/heart/icon.png new file mode 100644 index 000000000..d779ea9c2 Binary files /dev/null and b/graphics/pokemon/furfrou/heart/icon.png differ diff --git a/graphics/pokemon/furfrou/heart/normal.pal b/graphics/pokemon/furfrou/heart/normal.pal new file mode 100644 index 000000000..d8ddffcaa --- /dev/null +++ b/graphics/pokemon/furfrou/heart/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +64 64 64 +224 224 216 +204 209 181 +120 120 112 +160 160 152 +16 16 16 +114 50 77 +255 117 147 +193 77 98 +24 96 120 +72 80 64 +184 0 48 +255 255 255 +233 234 234 +0 0 0 diff --git a/graphics/pokemon/furfrou/heart/overworld.png b/graphics/pokemon/furfrou/heart/overworld.png new file mode 100644 index 000000000..226b08ce7 Binary files /dev/null and b/graphics/pokemon/furfrou/heart/overworld.png differ diff --git a/graphics/pokemon/furfrou/heart/overworld_normal.pal b/graphics/pokemon/furfrou/heart/overworld_normal.pal new file mode 100644 index 000000000..dda455926 --- /dev/null +++ b/graphics/pokemon/furfrou/heart/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +99 51 78 +88 88 88 +224 98 118 +177 175 160 +237 241 227 +16 16 16 +188 62 109 +119 118 115 +88 88 88 +91 134 247 +59 86 159 +188 4 0 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/heart/overworld_shiny.pal b/graphics/pokemon/furfrou/heart/overworld_shiny.pal new file mode 100644 index 000000000..9718218e1 --- /dev/null +++ b/graphics/pokemon/furfrou/heart/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +99 51 78 +50 48 48 +224 98 118 +88 88 88 +119 118 115 +16 16 16 +188 62 109 +237 241 227 +177 175 160 +91 134 247 +59 86 159 +188 4 0 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/heart/shiny.pal b/graphics/pokemon/furfrou/heart/shiny.pal new file mode 100644 index 000000000..5112eb700 --- /dev/null +++ b/graphics/pokemon/furfrou/heart/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +20 21 22 +101 102 107 +82 82 89 +39 39 40 +66 66 68 +16 16 16 +109 59 70 +255 142 150 +188 94 102 +30 101 126 +179 181 180 +189 0 48 +255 255 255 +233 234 234 +0 0 0 diff --git a/graphics/pokemon/furfrou/kabuki/anim_front.png b/graphics/pokemon/furfrou/kabuki/anim_front.png new file mode 100644 index 000000000..9bcc9ea28 Binary files /dev/null and b/graphics/pokemon/furfrou/kabuki/anim_front.png differ diff --git a/graphics/pokemon/furfrou/kabuki/back.png b/graphics/pokemon/furfrou/kabuki/back.png new file mode 100644 index 000000000..5904d6e41 Binary files /dev/null and b/graphics/pokemon/furfrou/kabuki/back.png differ diff --git a/graphics/pokemon/furfrou/kabuki/icon.png b/graphics/pokemon/furfrou/kabuki/icon.png new file mode 100644 index 000000000..6b3527207 Binary files /dev/null and b/graphics/pokemon/furfrou/kabuki/icon.png differ diff --git a/graphics/pokemon/furfrou/kabuki/normal.pal b/graphics/pokemon/furfrou/kabuki/normal.pal new file mode 100644 index 000000000..40203cfa4 --- /dev/null +++ b/graphics/pokemon/furfrou/kabuki/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +72 73 64 +122 119 97 +224 224 216 +204 209 181 +160 160 152 +16 16 16 +122 27 18 +198 46 25 +24 96 120 +255 59 38 +255 255 255 +184 0 48 +72 80 64 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/kabuki/overworld.png b/graphics/pokemon/furfrou/kabuki/overworld.png new file mode 100644 index 000000000..97cf66d39 Binary files /dev/null and b/graphics/pokemon/furfrou/kabuki/overworld.png differ diff --git a/graphics/pokemon/furfrou/kabuki/overworld_normal.pal b/graphics/pokemon/furfrou/kabuki/overworld_normal.pal new file mode 100644 index 000000000..b88fca160 --- /dev/null +++ b/graphics/pokemon/furfrou/kabuki/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +177 175 160 +237 241 227 +16 16 16 +99 32 31 +255 108 63 +201 52 49 +119 118 115 +91 134 247 +88 88 88 +59 86 159 +59 85 156 +237 241 227 +188 4 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/kabuki/overworld_shiny.pal b/graphics/pokemon/furfrou/kabuki/overworld_shiny.pal new file mode 100644 index 000000000..ec0564b46 --- /dev/null +++ b/graphics/pokemon/furfrou/kabuki/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +88 88 88 +119 118 115 +16 16 16 +99 32 31 +255 108 63 +201 52 49 +237 241 227 +91 134 247 +177 175 160 +59 86 159 +59 85 156 +255 255 255 +188 4 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/kabuki/shiny.pal b/graphics/pokemon/furfrou/kabuki/shiny.pal new file mode 100644 index 000000000..5dfad43f4 --- /dev/null +++ b/graphics/pokemon/furfrou/kabuki/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +20 21 22 +39 39 40 +101 102 107 +82 82 89 +66 66 68 +16 16 16 +119 29 29 +196 45 45 +30 101 126 +255 79 63 +255 255 255 +189 0 48 +179 181 180 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/la_reine/anim_front.png b/graphics/pokemon/furfrou/la_reine/anim_front.png new file mode 100644 index 000000000..441e12750 Binary files /dev/null and b/graphics/pokemon/furfrou/la_reine/anim_front.png differ diff --git a/graphics/pokemon/furfrou/la_reine/back.png b/graphics/pokemon/furfrou/la_reine/back.png new file mode 100644 index 000000000..66c970346 Binary files /dev/null and b/graphics/pokemon/furfrou/la_reine/back.png differ diff --git a/graphics/pokemon/furfrou/la_reine/icon.png b/graphics/pokemon/furfrou/la_reine/icon.png new file mode 100644 index 000000000..6e9384aaf Binary files /dev/null and b/graphics/pokemon/furfrou/la_reine/icon.png differ diff --git a/graphics/pokemon/furfrou/la_reine/normal.pal b/graphics/pokemon/furfrou/la_reine/normal.pal new file mode 100644 index 000000000..7f9c221dc --- /dev/null +++ b/graphics/pokemon/furfrou/la_reine/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +122 119 97 +72 73 64 +224 224 216 +160 160 152 +204 209 181 +37 92 107 +85 186 214 +53 131 153 +16 16 16 +24 96 120 +255 255 255 +184 0 48 +72 80 64 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/la_reine/overworld.png b/graphics/pokemon/furfrou/la_reine/overworld.png new file mode 100644 index 000000000..79ab66d7f Binary files /dev/null and b/graphics/pokemon/furfrou/la_reine/overworld.png differ diff --git a/graphics/pokemon/furfrou/la_reine/overworld_normal.pal b/graphics/pokemon/furfrou/la_reine/overworld_normal.pal new file mode 100644 index 000000000..d93d3a1ac --- /dev/null +++ b/graphics/pokemon/furfrou/la_reine/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +37 64 73 +50 48 48 +70 200 206 +177 175 160 +237 241 227 +16 16 16 +119 118 115 +23 128 149 +91 134 247 +59 86 159 +88 88 88 +119 118 115 +237 241 227 +188 4 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/la_reine/overworld_shiny.pal b/graphics/pokemon/furfrou/la_reine/overworld_shiny.pal new file mode 100644 index 000000000..4a660b347 --- /dev/null +++ b/graphics/pokemon/furfrou/la_reine/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +37 64 73 +50 48 48 +70 200 206 +88 88 88 +119 118 115 +16 16 16 +60 59 59 +23 128 149 +91 134 247 +59 86 159 +177 175 160 +237 241 227 +255 255 255 +188 4 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/la_reine/shiny.pal b/graphics/pokemon/furfrou/la_reine/shiny.pal new file mode 100644 index 000000000..439053af9 --- /dev/null +++ b/graphics/pokemon/furfrou/la_reine/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +39 39 40 +20 21 22 +101 102 107 +66 66 68 +82 82 89 +36 101 104 +84 205 211 +53 148 153 +16 16 16 +30 101 126 +255 255 255 +189 0 48 +179 181 180 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/matron/anim_front.png b/graphics/pokemon/furfrou/matron/anim_front.png new file mode 100644 index 000000000..8c3fb4149 Binary files /dev/null and b/graphics/pokemon/furfrou/matron/anim_front.png differ diff --git a/graphics/pokemon/furfrou/matron/back.png b/graphics/pokemon/furfrou/matron/back.png new file mode 100644 index 000000000..c4d7eb117 Binary files /dev/null and b/graphics/pokemon/furfrou/matron/back.png differ diff --git a/graphics/pokemon/furfrou/matron/icon.png b/graphics/pokemon/furfrou/matron/icon.png new file mode 100644 index 000000000..098b90962 Binary files /dev/null and b/graphics/pokemon/furfrou/matron/icon.png differ diff --git a/graphics/pokemon/furfrou/matron/normal.pal b/graphics/pokemon/furfrou/matron/normal.pal new file mode 100644 index 000000000..a804bf092 --- /dev/null +++ b/graphics/pokemon/furfrou/matron/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +122 119 97 +72 73 64 +224 224 216 +150 90 126 +107 56 86 +191 135 174 +160 160 152 +16 16 16 +204 209 181 +24 96 120 +72 80 64 +255 255 255 +184 0 48 +190 105 141 +0 0 0 diff --git a/graphics/pokemon/furfrou/matron/overworld.png b/graphics/pokemon/furfrou/matron/overworld.png new file mode 100644 index 000000000..34ba857e5 Binary files /dev/null and b/graphics/pokemon/furfrou/matron/overworld.png differ diff --git a/graphics/pokemon/furfrou/matron/overworld_normal.pal b/graphics/pokemon/furfrou/matron/overworld_normal.pal new file mode 100644 index 000000000..ba544e822 --- /dev/null +++ b/graphics/pokemon/furfrou/matron/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +88 88 88 +237 241 227 +181 107 211 +16 16 16 +177 175 160 +73 47 89 +136 62 182 +91 134 247 +88 88 88 +119 118 115 +237 241 227 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/matron/overworld_shiny.pal b/graphics/pokemon/furfrou/matron/overworld_shiny.pal new file mode 100644 index 000000000..617f8f675 --- /dev/null +++ b/graphics/pokemon/furfrou/matron/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +119 118 115 +181 107 211 +16 16 16 +88 88 88 +73 47 89 +136 62 182 +91 134 247 +177 175 160 +237 241 227 +255 255 255 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/matron/shiny.pal b/graphics/pokemon/furfrou/matron/shiny.pal new file mode 100644 index 000000000..2722c069f --- /dev/null +++ b/graphics/pokemon/furfrou/matron/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +39 39 40 +20 21 22 +101 102 107 +173 86 124 +122 58 86 +214 139 179 +66 66 68 +16 16 16 +82 82 89 +30 101 126 +179 181 180 +255 255 255 +189 0 48 +190 105 141 +0 0 0 diff --git a/graphics/pokemon/furfrou/pharaoh/anim_front.png b/graphics/pokemon/furfrou/pharaoh/anim_front.png new file mode 100644 index 000000000..a929542a8 Binary files /dev/null and b/graphics/pokemon/furfrou/pharaoh/anim_front.png differ diff --git a/graphics/pokemon/furfrou/pharaoh/back.png b/graphics/pokemon/furfrou/pharaoh/back.png new file mode 100644 index 000000000..f0bfdcce3 Binary files /dev/null and b/graphics/pokemon/furfrou/pharaoh/back.png differ diff --git a/graphics/pokemon/furfrou/pharaoh/icon.png b/graphics/pokemon/furfrou/pharaoh/icon.png new file mode 100644 index 000000000..ec2f4c1df Binary files /dev/null and b/graphics/pokemon/furfrou/pharaoh/icon.png differ diff --git a/graphics/pokemon/furfrou/pharaoh/normal.pal b/graphics/pokemon/furfrou/pharaoh/normal.pal new file mode 100644 index 000000000..4218a6758 --- /dev/null +++ b/graphics/pokemon/furfrou/pharaoh/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +72 73 64 +224 224 216 +204 209 181 +160 160 152 +122 119 97 +31 62 96 +33 127 196 +16 16 16 +23 90 137 +24 96 120 +255 255 255 +184 0 48 +72 80 64 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/pharaoh/overworld.png b/graphics/pokemon/furfrou/pharaoh/overworld.png new file mode 100644 index 000000000..dc51c70e5 Binary files /dev/null and b/graphics/pokemon/furfrou/pharaoh/overworld.png differ diff --git a/graphics/pokemon/furfrou/pharaoh/overworld_normal.pal b/graphics/pokemon/furfrou/pharaoh/overworld_normal.pal new file mode 100644 index 000000000..24d49d04c --- /dev/null +++ b/graphics/pokemon/furfrou/pharaoh/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +237 241 227 +177 175 160 +16 16 16 +34 50 102 +57 91 209 +91 134 247 +112 184 248 +88 88 88 +119 118 115 +237 241 227 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/pharaoh/overworld_shiny.pal b/graphics/pokemon/furfrou/pharaoh/overworld_shiny.pal new file mode 100644 index 000000000..bca12d7fa --- /dev/null +++ b/graphics/pokemon/furfrou/pharaoh/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +119 118 115 +88 88 88 +16 16 16 +34 50 102 +57 91 209 +91 134 247 +112 184 248 +177 175 160 +237 241 227 +255 255 255 +188 4 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/pharaoh/shiny.pal b/graphics/pokemon/furfrou/pharaoh/shiny.pal new file mode 100644 index 000000000..8c4ef8063 --- /dev/null +++ b/graphics/pokemon/furfrou/pharaoh/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +20 21 22 +101 102 107 +82 82 89 +66 66 68 +39 39 40 +40 57 94 +52 111 193 +16 16 16 +36 79 135 +30 101 126 +255 255 255 +189 0 48 +179 181 180 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/star/anim_front.png b/graphics/pokemon/furfrou/star/anim_front.png new file mode 100644 index 000000000..117946c45 Binary files /dev/null and b/graphics/pokemon/furfrou/star/anim_front.png differ diff --git a/graphics/pokemon/furfrou/star/back.png b/graphics/pokemon/furfrou/star/back.png new file mode 100644 index 000000000..1e4dd296f Binary files /dev/null and b/graphics/pokemon/furfrou/star/back.png differ diff --git a/graphics/pokemon/furfrou/star/icon.png b/graphics/pokemon/furfrou/star/icon.png new file mode 100644 index 000000000..551c32add Binary files /dev/null and b/graphics/pokemon/furfrou/star/icon.png differ diff --git a/graphics/pokemon/furfrou/star/normal.pal b/graphics/pokemon/furfrou/star/normal.pal new file mode 100644 index 000000000..1299c1639 --- /dev/null +++ b/graphics/pokemon/furfrou/star/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +72 73 64 +224 224 216 +16 16 16 +160 160 152 +122 119 97 +38 87 102 +130 214 237 +73 134 153 +24 96 120 +72 80 64 +184 0 48 +255 255 255 +233 234 234 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/star/overworld.png b/graphics/pokemon/furfrou/star/overworld.png new file mode 100644 index 000000000..09cd1a2e4 Binary files /dev/null and b/graphics/pokemon/furfrou/star/overworld.png differ diff --git a/graphics/pokemon/furfrou/star/overworld_normal.pal b/graphics/pokemon/furfrou/star/overworld_normal.pal new file mode 100644 index 000000000..5814a041a --- /dev/null +++ b/graphics/pokemon/furfrou/star/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +237 241 227 +44 105 154 +177 175 160 +80 163 212 +16 16 16 +28 60 86 +119 118 115 +91 134 247 +88 88 88 +188 4 0 +237 241 227 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/star/overworld_shiny.pal b/graphics/pokemon/furfrou/star/overworld_shiny.pal new file mode 100644 index 000000000..55b7e6f09 --- /dev/null +++ b/graphics/pokemon/furfrou/star/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +50 48 48 +119 118 115 +44 105 154 +88 88 88 +80 163 212 +16 16 16 +28 60 86 +237 241 227 +91 134 247 +177 175 160 +188 4 0 +255 255 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/furfrou/star/shiny.pal b/graphics/pokemon/furfrou/star/shiny.pal new file mode 100644 index 000000000..1342e1340 --- /dev/null +++ b/graphics/pokemon/furfrou/star/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +20 21 22 +101 102 107 +16 16 16 +66 66 68 +39 39 40 +33 86 122 +114 203 255 +64 130 170 +30 101 126 +179 181 180 +234 68 46 +255 255 255 +233 234 234 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/gallade/mega/overworld.png b/graphics/pokemon/gallade/mega/overworld.png new file mode 100644 index 000000000..7efa8f18b Binary files /dev/null and b/graphics/pokemon/gallade/mega/overworld.png differ diff --git a/graphics/pokemon/gallade/mega/overworld_normal.pal b/graphics/pokemon/gallade/mega/overworld_normal.pal new file mode 100644 index 000000000..6e6012ba4 --- /dev/null +++ b/graphics/pokemon/gallade/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +88 22 39 +0 72 16 +24 104 96 +72 72 80 +128 32 56 +184 48 72 +222 65 90 +24 144 48 +48 176 64 +23 175 192 +104 200 224 +136 136 152 +0 0 0 +208 208 224 +232 232 248 diff --git a/graphics/pokemon/gallade/mega/overworld_shiny.pal b/graphics/pokemon/gallade/mega/overworld_shiny.pal new file mode 100644 index 000000000..ba676df6c --- /dev/null +++ b/graphics/pokemon/gallade/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +110 43 28 +0 37 72 +54 69 73 +72 72 80 +174 69 44 +229 114 66 +242 135 82 +24 88 144 +48 125 176 +87 112 128 +149 164 178 +136 136 152 +0 0 0 +208 208 224 +232 232 248 diff --git a/graphics/pokemon/garchomp/mega/overworld.png b/graphics/pokemon/garchomp/mega/overworld.png new file mode 100644 index 000000000..47c06907f Binary files /dev/null and b/graphics/pokemon/garchomp/mega/overworld.png differ diff --git a/graphics/pokemon/garchomp/mega/overworld_normal.pal b/graphics/pokemon/garchomp/mega/overworld_normal.pal new file mode 100644 index 000000000..8cb1c3d56 --- /dev/null +++ b/graphics/pokemon/garchomp/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +48 48 80 +72 80 120 +104 104 104 +128 48 16 +184 64 24 +192 152 0 +248 224 8 +96 112 160 +120 152 200 +168 168 168 +0 0 0 +232 232 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/garchomp/mega/overworld_shiny.pal b/graphics/pokemon/garchomp/mega/overworld_shiny.pal new file mode 100644 index 000000000..7b8bc45d8 --- /dev/null +++ b/graphics/pokemon/garchomp/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +80 48 73 +120 72 118 +104 104 104 +122 35 93 +177 52 139 +192 152 0 +248 224 8 +157 96 160 +185 120 200 +168 168 168 +0 0 0 +232 232 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/gardevoir/mega/overworld.png b/graphics/pokemon/gardevoir/mega/overworld.png new file mode 100644 index 000000000..77fbfb4c4 Binary files /dev/null and b/graphics/pokemon/gardevoir/mega/overworld.png differ diff --git a/graphics/pokemon/gardevoir/mega/overworld_normal.pal b/graphics/pokemon/gardevoir/mega/overworld_normal.pal new file mode 100644 index 000000000..bad96ae0c --- /dev/null +++ b/graphics/pokemon/gardevoir/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +16 64 32 +72 72 80 +128 32 56 +184 48 72 +240 104 104 +40 128 56 +72 176 88 +104 200 128 +128 128 144 +168 168 176 +0 0 0 +200 200 216 +232 232 248 +200 200 216 +168 168 176 diff --git a/graphics/pokemon/gardevoir/mega/overworld_shiny.pal b/graphics/pokemon/gardevoir/mega/overworld_shiny.pal new file mode 100644 index 000000000..471722d4e --- /dev/null +++ b/graphics/pokemon/gardevoir/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +48 64 80 +48 48 48 +152 96 48 +216 136 64 +240 176 80 +72 166 198 +122 207 217 +158 217 241 +128 128 144 +208 192 216 +0 0 0 +232 216 248 +248 248 248 +96 104 120 +48 64 80 diff --git a/graphics/pokemon/gengar/mega/overworld.png b/graphics/pokemon/gengar/mega/overworld.png new file mode 100644 index 000000000..40390d4aa Binary files /dev/null and b/graphics/pokemon/gengar/mega/overworld.png differ diff --git a/graphics/pokemon/gengar/mega/overworld_normal.pal b/graphics/pokemon/gengar/mega/overworld_normal.pal new file mode 100644 index 000000000..baacd711d --- /dev/null +++ b/graphics/pokemon/gengar/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +57 42 72 +87 59 107 +96 66 116 +200 16 40 +179 124 91 +213 83 98 +230 160 26 +158 81 143 +130 97 153 +221 97 170 +177 155 189 +0 0 0 +216 202 224 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/gengar/mega/overworld_shiny.pal b/graphics/pokemon/gengar/mega/overworld_shiny.pal new file mode 100644 index 000000000..69259927f --- /dev/null +++ b/graphics/pokemon/gengar/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +108 108 108 +147 147 147 +178 178 178 +200 16 40 +179 124 91 +75 75 75 +230 160 26 +224 139 211 +231 231 231 +251 159 231 +205 183 216 +0 0 0 +236 226 241 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/geodude/alola/icon.png b/graphics/pokemon/geodude/alola/icon.png index 1a5f96997..6a4cbd515 100644 Binary files a/graphics/pokemon/geodude/alola/icon.png and b/graphics/pokemon/geodude/alola/icon.png differ diff --git a/graphics/pokemon/gigalith/overworld.png b/graphics/pokemon/gigalith/overworld.png index 8e5b2b7b3..d84932ece 100644 Binary files a/graphics/pokemon/gigalith/overworld.png and b/graphics/pokemon/gigalith/overworld.png differ diff --git a/graphics/pokemon/glalie/mega/overworld.png b/graphics/pokemon/glalie/mega/overworld.png new file mode 100644 index 000000000..a36606538 Binary files /dev/null and b/graphics/pokemon/glalie/mega/overworld.png differ diff --git a/graphics/pokemon/glalie/mega/overworld_normal.pal b/graphics/pokemon/glalie/mega/overworld_normal.pal new file mode 100644 index 000000000..e10d60b62 --- /dev/null +++ b/graphics/pokemon/glalie/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +29 29 33 +40 40 56 +57 57 65 +34 82 113 +86 86 90 +80 80 96 +218 21 21 +112 120 136 +40 129 192 +98 189 238 +152 160 176 +169 175 188 +0 0 0 +215 221 220 +197 205 230 diff --git a/graphics/pokemon/glalie/mega/overworld_shiny.pal b/graphics/pokemon/glalie/mega/overworld_shiny.pal new file mode 100644 index 000000000..da25f12f0 --- /dev/null +++ b/graphics/pokemon/glalie/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +29 29 33 +40 40 56 +57 57 65 +34 82 113 +86 86 90 +80 80 96 +218 21 21 +112 120 136 +186 98 71 +98 189 238 +152 160 176 +169 175 188 +0 0 0 +215 221 220 +197 205 230 diff --git a/graphics/pokemon/golem/alola/icon.png b/graphics/pokemon/golem/alola/icon.png index e796f8884..ccaa2714e 100644 Binary files a/graphics/pokemon/golem/alola/icon.png and b/graphics/pokemon/golem/alola/icon.png differ diff --git a/graphics/pokemon/golisopod/icon.png b/graphics/pokemon/golisopod/icon.png index 37ee08049..7ebe16a52 100644 Binary files a/graphics/pokemon/golisopod/icon.png and b/graphics/pokemon/golisopod/icon.png differ diff --git a/graphics/pokemon/graveler/alola/icon.png b/graphics/pokemon/graveler/alola/icon.png index c0a7557ca..da15318b9 100644 Binary files a/graphics/pokemon/graveler/alola/icon.png and b/graphics/pokemon/graveler/alola/icon.png differ diff --git a/graphics/pokemon/greninja/ash/icon.png b/graphics/pokemon/greninja/ash/icon.png index df9595619..dc10f4b59 100644 Binary files a/graphics/pokemon/greninja/ash/icon.png and b/graphics/pokemon/greninja/ash/icon.png differ diff --git a/graphics/pokemon/grimer/alola/icon.png b/graphics/pokemon/grimer/alola/icon.png index 09d83cb95..38ba79b2d 100644 Binary files a/graphics/pokemon/grimer/alola/icon.png and b/graphics/pokemon/grimer/alola/icon.png differ diff --git a/graphics/pokemon/grookey/back.png b/graphics/pokemon/grookey/back.png index b7f6c6076..bdcc5924d 100644 Binary files a/graphics/pokemon/grookey/back.png and b/graphics/pokemon/grookey/back.png differ diff --git a/graphics/pokemon/grookey/overworld.png b/graphics/pokemon/grookey/overworld.png index 2fb835295..928fd09bc 100644 Binary files a/graphics/pokemon/grookey/overworld.png and b/graphics/pokemon/grookey/overworld.png differ diff --git a/graphics/pokemon/groudon/primal/overworld.png b/graphics/pokemon/groudon/primal/overworld.png new file mode 100644 index 000000000..79dbede94 Binary files /dev/null and b/graphics/pokemon/groudon/primal/overworld.png differ diff --git a/graphics/pokemon/groudon/primal/overworld_normal.pal b/graphics/pokemon/groudon/primal/overworld_normal.pal new file mode 100644 index 000000000..95041cbb0 --- /dev/null +++ b/graphics/pokemon/groudon/primal/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +19 21 27 +32 40 56 +48 51 59 +114 10 16 +53 57 66 +61 67 72 +66 70 80 +98 98 106 +190 23 38 +234 48 77 +250 94 117 +238 102 102 +229 229 166 +184 200 216 +0 0 0 diff --git a/graphics/pokemon/groudon/primal/overworld_shiny.pal b/graphics/pokemon/groudon/primal/overworld_shiny.pal new file mode 100644 index 000000000..7f44addd1 --- /dev/null +++ b/graphics/pokemon/groudon/primal/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +19 21 27 +32 40 56 +48 51 59 +37 37 37 +53 57 66 +61 67 72 +66 70 80 +98 98 106 +64 64 64 +84 84 84 +103 103 103 +238 102 102 +229 229 166 +184 200 216 +0 0 0 diff --git a/graphics/pokemon/grubbin/icon.png b/graphics/pokemon/grubbin/icon.png index 96071bf8f..4ff57b87c 100644 Binary files a/graphics/pokemon/grubbin/icon.png and b/graphics/pokemon/grubbin/icon.png differ diff --git a/graphics/pokemon/gumshoos/icon.png b/graphics/pokemon/gumshoos/icon.png index ac2bd8392..6421d338e 100644 Binary files a/graphics/pokemon/gumshoos/icon.png and b/graphics/pokemon/gumshoos/icon.png differ diff --git a/graphics/pokemon/guzzlord/icon.png b/graphics/pokemon/guzzlord/icon.png index 25e862d78..94ef70d8a 100644 Binary files a/graphics/pokemon/guzzlord/icon.png and b/graphics/pokemon/guzzlord/icon.png differ diff --git a/graphics/pokemon/gyarados/mega/overworld.png b/graphics/pokemon/gyarados/mega/overworld.png new file mode 100644 index 000000000..e204b0602 Binary files /dev/null and b/graphics/pokemon/gyarados/mega/overworld.png differ diff --git a/graphics/pokemon/gyarados/mega/overworld_normal.pal b/graphics/pokemon/gyarados/mega/overworld_normal.pal new file mode 100644 index 000000000..88ab19a39 --- /dev/null +++ b/graphics/pokemon/gyarados/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +24 24 24 +48 48 48 +64 0 12 +88 63 20 +48 56 80 +80 72 72 +136 0 24 +190 74 114 +179 138 49 +252 218 116 +32 96 128 +64 120 152 +68 161 233 +0 0 0 +198 198 214 diff --git a/graphics/pokemon/gyarados/mega/overworld_shiny.pal b/graphics/pokemon/gyarados/mega/overworld_shiny.pal new file mode 100644 index 000000000..06527bc41 --- /dev/null +++ b/graphics/pokemon/gyarados/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +146 124 78 +220 202 148 +64 0 12 +88 63 20 +79 37 49 +239 57 106 +136 0 24 +190 74 114 +179 138 49 +252 218 116 +128 24 56 +159 53 84 +239 57 106 +0 0 0 +198 198 214 diff --git a/graphics/pokemon/hakamo_o/icon.png b/graphics/pokemon/hakamo_o/icon.png index 483677053..90986aa3d 100644 Binary files a/graphics/pokemon/hakamo_o/icon.png and b/graphics/pokemon/hakamo_o/icon.png differ diff --git a/graphics/pokemon/heracross/mega/overworld.png b/graphics/pokemon/heracross/mega/overworld.png new file mode 100644 index 000000000..dc10314d1 Binary files /dev/null and b/graphics/pokemon/heracross/mega/overworld.png differ diff --git a/graphics/pokemon/heracross/mega/overworld_normal.pal b/graphics/pokemon/heracross/mega/overworld_normal.pal new file mode 100644 index 000000000..f8e603f12 --- /dev/null +++ b/graphics/pokemon/heracross/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +16 16 16 +8 48 64 +16 72 96 +32 96 120 +176 40 48 +224 32 56 +152 88 0 +248 96 120 +216 136 8 +240 176 64 +56 120 144 +80 152 176 +128 192 200 +0 0 0 +248 248 248 diff --git a/graphics/pokemon/heracross/mega/overworld_shiny.pal b/graphics/pokemon/heracross/mega/overworld_shiny.pal new file mode 100644 index 000000000..520daaa6f --- /dev/null +++ b/graphics/pokemon/heracross/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +16 16 16 +70 15 58 +106 27 88 +133 47 115 +176 40 48 +224 32 56 +152 88 0 +248 96 120 +216 136 8 +240 176 64 +160 76 143 +194 104 178 +218 158 215 +0 0 0 +248 248 248 diff --git a/graphics/pokemon/herdier/overworld.png b/graphics/pokemon/herdier/overworld.png index 51e2a2207..de47a0ba7 100644 Binary files a/graphics/pokemon/herdier/overworld.png and b/graphics/pokemon/herdier/overworld.png differ diff --git a/graphics/pokemon/herdier/overworld_shiny.pal b/graphics/pokemon/herdier/overworld_shiny.pal index 4713003a7..0d9a69092 100644 --- a/graphics/pokemon/herdier/overworld_shiny.pal +++ b/graphics/pokemon/herdier/overworld_shiny.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 152 208 160 -54 54 78 +56 56 56 0 0 0 64 64 64 96 72 24 diff --git a/graphics/pokemon/honedge/anim_front.png b/graphics/pokemon/honedge/anim_front.png index 9a5dc7507..6376e2d1e 100644 Binary files a/graphics/pokemon/honedge/anim_front.png and b/graphics/pokemon/honedge/anim_front.png differ diff --git a/graphics/pokemon/honedge/back.png b/graphics/pokemon/honedge/back.png index d9092fa13..b1bc8634b 100644 Binary files a/graphics/pokemon/honedge/back.png and b/graphics/pokemon/honedge/back.png differ diff --git a/graphics/pokemon/honedge/normal.pal b/graphics/pokemon/honedge/normal.pal index 51f60119d..d6a8a5099 100644 --- a/graphics/pokemon/honedge/normal.pal +++ b/graphics/pokemon/honedge/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 8 48 56 -0 128 160 +36 103 149 16 16 16 80 64 40 -248 208 128 -176 152 88 +255 215 132 +181 158 90 136 104 56 -152 232 248 +102 225 253 96 192 216 80 88 88 168 168 168 216 216 216 -48 56 40 -152 128 80 -136 88 56 +99 84 80 +201 185 131 +167 139 110 diff --git a/graphics/pokemon/houndoom/mega/overworld.png b/graphics/pokemon/houndoom/mega/overworld.png new file mode 100644 index 000000000..7cf4de427 Binary files /dev/null and b/graphics/pokemon/houndoom/mega/overworld.png differ diff --git a/graphics/pokemon/houndoom/mega/overworld_normal.pal b/graphics/pokemon/houndoom/mega/overworld_normal.pal new file mode 100644 index 000000000..8471c56c2 --- /dev/null +++ b/graphics/pokemon/houndoom/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +40 40 48 +56 56 64 +72 56 80 +80 80 88 +104 112 112 +144 24 40 +136 96 64 +184 136 96 +136 128 144 +168 160 184 +224 184 160 +0 0 0 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/houndoom/mega/overworld_shiny.pal b/graphics/pokemon/houndoom/mega/overworld_shiny.pal new file mode 100644 index 000000000..cc0bf08c9 --- /dev/null +++ b/graphics/pokemon/houndoom/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +38 53 69 +56 56 64 +72 56 80 +45 75 105 +72 100 129 +144 24 40 +162 41 29 +215 68 52 +136 128 144 +168 160 184 +246 128 128 +0 0 0 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/incineroar/icon.png b/graphics/pokemon/incineroar/icon.png index 020c549ec..a82408242 100644 Binary files a/graphics/pokemon/incineroar/icon.png and b/graphics/pokemon/incineroar/icon.png differ diff --git a/graphics/pokemon/inteleon/gmax/icon.png b/graphics/pokemon/inteleon/gmax/icon.png index a27bf3f1c..334ce1544 100644 Binary files a/graphics/pokemon/inteleon/gmax/icon.png and b/graphics/pokemon/inteleon/gmax/icon.png differ diff --git a/graphics/pokemon/jangmo_o/icon.png b/graphics/pokemon/jangmo_o/icon.png index 0a8a2c2d0..bbc7db294 100644 Binary files a/graphics/pokemon/jangmo_o/icon.png and b/graphics/pokemon/jangmo_o/icon.png differ diff --git a/graphics/pokemon/kangaskhan/mega/overworld.png b/graphics/pokemon/kangaskhan/mega/overworld.png new file mode 100644 index 000000000..de152c74f Binary files /dev/null and b/graphics/pokemon/kangaskhan/mega/overworld.png differ diff --git a/graphics/pokemon/kangaskhan/mega/overworld_normal.pal b/graphics/pokemon/kangaskhan/mega/overworld_normal.pal new file mode 100644 index 000000000..1b696b176 --- /dev/null +++ b/graphics/pokemon/kangaskhan/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +40 39 45 +104 8 1 +88 72 40 +120 80 56 +56 56 64 +80 56 64 +72 72 72 +112 112 112 +160 120 40 +184 120 112 +208 168 96 +248 200 120 +0 0 0 +168 184 208 +232 232 248 diff --git a/graphics/pokemon/kangaskhan/mega/overworld_shiny.pal b/graphics/pokemon/kangaskhan/mega/overworld_shiny.pal new file mode 100644 index 000000000..ee394a6ea --- /dev/null +++ b/graphics/pokemon/kangaskhan/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +40 39 45 +104 8 1 +88 72 40 +136 120 128 +56 56 64 +80 56 64 +64 88 64 +120 144 96 +160 120 40 +176 168 144 +230 186 109 +230 186 109 +0 0 0 +234 170 223 +232 232 248 diff --git a/graphics/pokemon/kartana/icon.png b/graphics/pokemon/kartana/icon.png index 7d0b82499..bdf3ec3a5 100644 Binary files a/graphics/pokemon/kartana/icon.png and b/graphics/pokemon/kartana/icon.png differ diff --git a/graphics/pokemon/komala/icon.png b/graphics/pokemon/komala/icon.png index 6935e996c..96af23fe1 100644 Binary files a/graphics/pokemon/komala/icon.png and b/graphics/pokemon/komala/icon.png differ diff --git a/graphics/pokemon/kommo_o/icon.png b/graphics/pokemon/kommo_o/icon.png index 3acaf5329..2a0ba757f 100644 Binary files a/graphics/pokemon/kommo_o/icon.png and b/graphics/pokemon/kommo_o/icon.png differ diff --git a/graphics/pokemon/kyogre/primal/overworld.png b/graphics/pokemon/kyogre/primal/overworld.png new file mode 100644 index 000000000..a1da31fd6 Binary files /dev/null and b/graphics/pokemon/kyogre/primal/overworld.png differ diff --git a/graphics/pokemon/kyogre/primal/overworld_normal.pal b/graphics/pokemon/kyogre/primal/overworld_normal.pal new file mode 100644 index 000000000..7731a6b32 --- /dev/null +++ b/graphics/pokemon/kyogre/primal/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +56 56 56 +24 56 88 +18 82 110 +161 103 64 +227 88 88 +227 144 88 +250 229 87 +56 56 188 +80 80 198 +98 98 201 +75 75 227 +35 132 207 +62 167 255 +0 0 0 +253 254 255 diff --git a/graphics/pokemon/kyogre/primal/overworld_shiny.pal b/graphics/pokemon/kyogre/primal/overworld_shiny.pal new file mode 100644 index 000000000..b2a123d27 --- /dev/null +++ b/graphics/pokemon/kyogre/primal/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +56 56 56 +32 32 32 +87 74 40 +68 127 160 +118 180 196 +125 194 165 +236 225 154 +69 69 69 +79 79 79 +85 85 85 +86 86 86 +222 205 69 +252 245 121 +0 0 0 +253 254 255 diff --git a/graphics/pokemon/latias/mega/overworld.png b/graphics/pokemon/latias/mega/overworld.png new file mode 100644 index 000000000..5e768685d Binary files /dev/null and b/graphics/pokemon/latias/mega/overworld.png differ diff --git a/graphics/pokemon/latias/mega/overworld_normal.pal b/graphics/pokemon/latias/mega/overworld_normal.pal new file mode 100644 index 000000000..a6b47e99d --- /dev/null +++ b/graphics/pokemon/latias/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +32 40 40 +51 44 70 +75 61 110 +68 68 68 +168 124 28 +103 81 154 +120 100 169 +144 114 197 +124 142 150 +152 168 176 +0 0 0 +168 128 222 +184 200 208 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/latias/mega/overworld_shiny.pal b/graphics/pokemon/latias/mega/overworld_shiny.pal new file mode 100644 index 000000000..927ce5aec --- /dev/null +++ b/graphics/pokemon/latias/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +32 40 40 +51 44 70 +44 109 44 +68 68 68 +34 93 135 +63 152 63 +76 165 75 +90 164 92 +124 142 150 +152 168 176 +0 0 0 +98 205 100 +184 200 208 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/latios/mega/overworld.png b/graphics/pokemon/latios/mega/overworld.png new file mode 100644 index 000000000..cb781b85e Binary files /dev/null and b/graphics/pokemon/latios/mega/overworld.png differ diff --git a/graphics/pokemon/latios/mega/overworld_normal.pal b/graphics/pokemon/latios/mega/overworld_normal.pal new file mode 100644 index 000000000..babb8855d --- /dev/null +++ b/graphics/pokemon/latios/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +32 40 40 +51 44 70 +75 61 110 +68 68 68 +192 32 32 +103 81 154 +120 100 169 +144 114 197 +124 142 150 +152 168 176 +0 0 0 +168 128 222 +184 200 208 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/latios/mega/overworld_shiny.pal b/graphics/pokemon/latios/mega/overworld_shiny.pal new file mode 100644 index 000000000..016c1dc73 --- /dev/null +++ b/graphics/pokemon/latios/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +32 40 40 +51 44 70 +44 109 44 +68 68 68 +192 32 32 +63 152 63 +76 165 75 +90 164 92 +124 142 150 +152 168 176 +0 0 0 +98 205 100 +184 200 208 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/liepard/overworld.png b/graphics/pokemon/liepard/overworld.png index eb6611bf8..804cdb39d 100644 Binary files a/graphics/pokemon/liepard/overworld.png and b/graphics/pokemon/liepard/overworld.png differ diff --git a/graphics/pokemon/litten/icon.png b/graphics/pokemon/litten/icon.png index 5602732b4..7867b32c6 100644 Binary files a/graphics/pokemon/litten/icon.png and b/graphics/pokemon/litten/icon.png differ diff --git a/graphics/pokemon/lopunny/mega/overworld.png b/graphics/pokemon/lopunny/mega/overworld.png new file mode 100644 index 000000000..d87a196fa Binary files /dev/null and b/graphics/pokemon/lopunny/mega/overworld.png differ diff --git a/graphics/pokemon/lopunny/mega/overworld_normal.pal b/graphics/pokemon/lopunny/mega/overworld_normal.pal new file mode 100644 index 000000000..b5c8981ad --- /dev/null +++ b/graphics/pokemon/lopunny/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +35 27 18 +56 48 32 +60 60 53 +80 80 72 +96 80 64 +128 96 56 +144 120 64 +208 120 120 +168 128 88 +200 168 104 +232 216 168 +0 0 0 +253 199 199 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/lopunny/mega/overworld_shiny.pal b/graphics/pokemon/lopunny/mega/overworld_shiny.pal new file mode 100644 index 000000000..e86ff9598 --- /dev/null +++ b/graphics/pokemon/lopunny/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +35 27 18 +56 48 32 +60 60 53 +80 80 72 +96 80 64 +128 96 56 +144 120 64 +208 120 120 +168 128 88 +215 88 153 +242 157 194 +0 0 0 +253 199 199 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/lucario/mega/overworld.png b/graphics/pokemon/lucario/mega/overworld.png new file mode 100644 index 000000000..8ff2fdd47 Binary files /dev/null and b/graphics/pokemon/lucario/mega/overworld.png differ diff --git a/graphics/pokemon/lucario/mega/overworld_normal.pal b/graphics/pokemon/lucario/mega/overworld_normal.pal new file mode 100644 index 000000000..64a2ed191 --- /dev/null +++ b/graphics/pokemon/lucario/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +40 40 40 +68 11 21 +120 96 40 +48 56 88 +72 72 72 +96 96 96 +187 30 57 +176 136 56 +232 184 80 +56 104 144 +72 136 192 +112 184 240 +168 184 200 +0 0 0 +232 232 248 diff --git a/graphics/pokemon/lucario/mega/overworld_shiny.pal b/graphics/pokemon/lucario/mega/overworld_shiny.pal new file mode 100644 index 000000000..5f97d7165 --- /dev/null +++ b/graphics/pokemon/lucario/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +40 40 40 +68 11 21 +120 96 40 +66 80 55 +72 72 72 +96 96 96 +187 30 57 +176 136 56 +232 184 80 +116 127 72 +152 169 94 +200 215 136 +168 184 200 +0 0 0 +232 232 248 diff --git a/graphics/pokemon/lunala/icon.png b/graphics/pokemon/lunala/icon.png index 036b9b371..55002ed92 100644 Binary files a/graphics/pokemon/lunala/icon.png and b/graphics/pokemon/lunala/icon.png differ diff --git a/graphics/pokemon/lurantis/icon.png b/graphics/pokemon/lurantis/icon.png index 893f651b0..f77d4e1e4 100644 Binary files a/graphics/pokemon/lurantis/icon.png and b/graphics/pokemon/lurantis/icon.png differ diff --git a/graphics/pokemon/lycanroc/dusk/icon.png b/graphics/pokemon/lycanroc/dusk/icon.png index 65d8394f4..7b860c14c 100644 Binary files a/graphics/pokemon/lycanroc/dusk/icon.png and b/graphics/pokemon/lycanroc/dusk/icon.png differ diff --git a/graphics/pokemon/lycanroc/icon.png b/graphics/pokemon/lycanroc/icon.png index 8ae431337..50a6a2e9d 100644 Binary files a/graphics/pokemon/lycanroc/icon.png and b/graphics/pokemon/lycanroc/icon.png differ diff --git a/graphics/pokemon/lycanroc/midnight/icon.png b/graphics/pokemon/lycanroc/midnight/icon.png index f6b98c949..33bdba204 100644 Binary files a/graphics/pokemon/lycanroc/midnight/icon.png and b/graphics/pokemon/lycanroc/midnight/icon.png differ diff --git a/graphics/pokemon/magearna/icon.png b/graphics/pokemon/magearna/icon.png index cfb4c0664..6a421d6ad 100644 Binary files a/graphics/pokemon/magearna/icon.png and b/graphics/pokemon/magearna/icon.png differ diff --git a/graphics/pokemon/magearna/original_color/icon.png b/graphics/pokemon/magearna/original_color/icon.png index 5e97b3ccb..0f1b1e905 100644 Binary files a/graphics/pokemon/magearna/original_color/icon.png and b/graphics/pokemon/magearna/original_color/icon.png differ diff --git a/graphics/pokemon/manectric/mega/overworld.png b/graphics/pokemon/manectric/mega/overworld.png new file mode 100644 index 000000000..bc36a99f1 Binary files /dev/null and b/graphics/pokemon/manectric/mega/overworld.png differ diff --git a/graphics/pokemon/manectric/mega/overworld_normal.pal b/graphics/pokemon/manectric/mega/overworld_normal.pal new file mode 100644 index 000000000..1cfb140de --- /dev/null +++ b/graphics/pokemon/manectric/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +96 72 48 +24 48 88 +64 64 72 +152 0 0 +192 56 56 +192 144 32 +224 192 72 +32 120 152 +80 152 184 +248 248 144 +128 184 216 +136 216 248 +0 0 0 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/manectric/mega/overworld_shiny.pal b/graphics/pokemon/manectric/mega/overworld_shiny.pal new file mode 100644 index 000000000..648a273aa --- /dev/null +++ b/graphics/pokemon/manectric/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +96 72 48 +39 39 39 +64 64 72 +152 0 0 +192 56 56 +192 123 32 +224 171 72 +64 64 64 +92 92 92 +248 234 144 +121 121 121 +134 134 134 +0 0 0 +232 232 248 +0 0 0 diff --git a/graphics/pokemon/maractus/back.png b/graphics/pokemon/maractus/back.png index bc83adca5..66a652084 100644 Binary files a/graphics/pokemon/maractus/back.png and b/graphics/pokemon/maractus/back.png differ diff --git a/graphics/pokemon/mareanie/icon.png b/graphics/pokemon/mareanie/icon.png index 7b7dc44fb..7464483cf 100644 Binary files a/graphics/pokemon/mareanie/icon.png and b/graphics/pokemon/mareanie/icon.png differ diff --git a/graphics/pokemon/marowak/alola/icon.png b/graphics/pokemon/marowak/alola/icon.png index 3ea2a868c..d434c92fb 100644 Binary files a/graphics/pokemon/marowak/alola/icon.png and b/graphics/pokemon/marowak/alola/icon.png differ diff --git a/graphics/pokemon/marshadow/icon.png b/graphics/pokemon/marshadow/icon.png index e7fb5674d..b8d05ba29 100644 Binary files a/graphics/pokemon/marshadow/icon.png and b/graphics/pokemon/marshadow/icon.png differ diff --git a/graphics/pokemon/maschiff/back.png b/graphics/pokemon/maschiff/back.png index 6a6a45eb4..4891b2371 100644 Binary files a/graphics/pokemon/maschiff/back.png and b/graphics/pokemon/maschiff/back.png differ diff --git a/graphics/pokemon/maschiff/front.png b/graphics/pokemon/maschiff/front.png index 05f724ec6..c06b23028 100644 Binary files a/graphics/pokemon/maschiff/front.png and b/graphics/pokemon/maschiff/front.png differ diff --git a/graphics/pokemon/maschiff/normal.pal b/graphics/pokemon/maschiff/normal.pal index 3c397173c..7de2cd092 100644 --- a/graphics/pokemon/maschiff/normal.pal +++ b/graphics/pokemon/maschiff/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -255 255 255 -255 193 11 -180 178 180 -238 113 24 -255 157 90 -213 141 8 -106 36 32 -98 97 98 -213 117 106 -90 64 82 -172 85 74 -8 12 8 -65 44 57 -238 170 148 -164 97 49 +153 211 165 +36 30 33 +57 45 53 +71 37 41 +86 67 79 +121 117 100 +141 86 46 +199 121 35 +251 111 49 +129 67 75 +195 115 113 +253 201 67 +16 16 16 +253 242 223 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/maschiff/shiny.pal b/graphics/pokemon/maschiff/shiny.pal index 23f5bf0a7..cb13ff86a 100644 --- a/graphics/pokemon/maschiff/shiny.pal +++ b/graphics/pokemon/maschiff/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -255 255 255 -120 98 112 -180 178 180 -238 113 24 -255 157 90 -81 65 73 -92 77 102 -98 97 98 -173 157 191 -90 64 82 -129 114 142 -8 12 8 -65 44 57 -201 195 216 -63 47 59 +153 211 165 +36 30 33 +57 45 53 +62 55 70 +86 67 79 +121 117 100 +63 50 58 +87 70 82 +251 111 49 +102 92 114 +171 139 201 +119 96 110 +16 16 16 +253 242 223 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/mawile/mega/overworld.png b/graphics/pokemon/mawile/mega/overworld.png new file mode 100644 index 000000000..b65c2c37d Binary files /dev/null and b/graphics/pokemon/mawile/mega/overworld.png differ diff --git a/graphics/pokemon/mawile/mega/overworld_normal.pal b/graphics/pokemon/mawile/mega/overworld_normal.pal new file mode 100644 index 000000000..474b856da --- /dev/null +++ b/graphics/pokemon/mawile/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +40 40 40 +126 25 55 +80 72 56 +72 72 72 +118 118 118 +129 63 63 +161 33 71 +128 104 72 +200 168 88 +196 88 145 +242 135 158 +0 0 0 +248 216 128 +176 184 200 +232 232 248 diff --git a/graphics/pokemon/mawile/mega/overworld_shiny.pal b/graphics/pokemon/mawile/mega/overworld_shiny.pal new file mode 100644 index 000000000..21d02a3d3 --- /dev/null +++ b/graphics/pokemon/mawile/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +68 37 61 +63 35 115 +80 72 56 +113 66 99 +184 112 152 +66 45 105 +82 46 147 +128 104 72 +200 168 88 +109 99 185 +183 146 231 +0 0 0 +248 216 128 +176 184 200 +232 232 248 diff --git a/graphics/pokemon/medicham/mega/overworld.png b/graphics/pokemon/medicham/mega/overworld.png new file mode 100644 index 000000000..d3f0d04bf Binary files /dev/null and b/graphics/pokemon/medicham/mega/overworld.png differ diff --git a/graphics/pokemon/medicham/mega/overworld_normal.pal b/graphics/pokemon/medicham/mega/overworld_normal.pal new file mode 100644 index 000000000..dad60f896 --- /dev/null +++ b/graphics/pokemon/medicham/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +48 24 32 +56 56 64 +86 88 94 +144 56 88 +184 80 104 +185 159 44 +255 216 49 +200 96 128 +88 144 192 +136 136 152 +232 136 160 +0 0 0 +176 184 200 +216 224 232 +232 232 248 diff --git a/graphics/pokemon/medicham/mega/overworld_shiny.pal b/graphics/pokemon/medicham/mega/overworld_shiny.pal new file mode 100644 index 000000000..d163e9eff --- /dev/null +++ b/graphics/pokemon/medicham/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +24 32 48 +56 56 64 +86 88 94 +56 88 144 +80 104 184 +185 159 44 +255 216 49 +96 128 200 +88 144 192 +136 136 152 +136 160 232 +0 0 0 +208 195 168 +237 223 210 +232 232 248 diff --git a/graphics/pokemon/melmetal/icon.png b/graphics/pokemon/melmetal/icon.png index fa70c6b6b..20382c2d8 100644 Binary files a/graphics/pokemon/melmetal/icon.png and b/graphics/pokemon/melmetal/icon.png differ diff --git a/graphics/pokemon/melmetal/overworld.png b/graphics/pokemon/melmetal/overworld.png index 4be020a5c..e8097644a 100644 Binary files a/graphics/pokemon/melmetal/overworld.png and b/graphics/pokemon/melmetal/overworld.png differ diff --git a/graphics/pokemon/melmetal/overworld_normal.pal b/graphics/pokemon/melmetal/overworld_normal.pal index 28e459319..d9b329362 100644 --- a/graphics/pokemon/melmetal/overworld_normal.pal +++ b/graphics/pokemon/melmetal/overworld_normal.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -255 255 255 +120 255 255 254 235 185 220 220 218 235 192 100 @@ -16,4 +16,4 @@ JASC-PAL 64 64 64 45 43 43 8 8 8 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/melmetal/overworld_shiny.pal b/graphics/pokemon/melmetal/overworld_shiny.pal index 6d1c75c9b..4f5321a06 100644 --- a/graphics/pokemon/melmetal/overworld_shiny.pal +++ b/graphics/pokemon/melmetal/overworld_shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 64 64 64 45 43 43 8 8 8 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/meltan/icon.png b/graphics/pokemon/meltan/icon.png index 17fb4f96b..51da11256 100644 Binary files a/graphics/pokemon/meltan/icon.png and b/graphics/pokemon/meltan/icon.png differ diff --git a/graphics/pokemon/meowth/alola/icon.png b/graphics/pokemon/meowth/alola/icon.png index d4b80eb6b..f2b5d00cb 100644 Binary files a/graphics/pokemon/meowth/alola/icon.png and b/graphics/pokemon/meowth/alola/icon.png differ diff --git a/graphics/pokemon/metagross/mega/overworld.png b/graphics/pokemon/metagross/mega/overworld.png new file mode 100644 index 000000000..d0a6ae4fb Binary files /dev/null and b/graphics/pokemon/metagross/mega/overworld.png differ diff --git a/graphics/pokemon/metagross/mega/overworld_normal.pal b/graphics/pokemon/metagross/mega/overworld_normal.pal new file mode 100644 index 000000000..cfdfcb38e --- /dev/null +++ b/graphics/pokemon/metagross/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +39 44 55 +32 64 80 +72 80 96 +64 96 120 +152 40 40 +191 163 12 +227 202 32 +249 221 73 +112 120 136 +88 128 168 +104 144 208 +0 0 0 +144 192 232 +208 208 208 +232 232 248 diff --git a/graphics/pokemon/metagross/mega/overworld_shiny.pal b/graphics/pokemon/metagross/mega/overworld_shiny.pal new file mode 100644 index 000000000..ee4a5c601 --- /dev/null +++ b/graphics/pokemon/metagross/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +39 44 55 +72 72 72 +72 80 96 +118 118 118 +152 40 40 +8 107 183 +25 133 227 +55 147 227 +185 133 36 +162 162 162 +192 192 192 +0 0 0 +220 220 220 +245 191 84 +255 220 148 diff --git a/graphics/pokemon/mewtwo/mega_x/overworld.png b/graphics/pokemon/mewtwo/mega_x/overworld.png new file mode 100644 index 000000000..6adbe5652 Binary files /dev/null and b/graphics/pokemon/mewtwo/mega_x/overworld.png differ diff --git a/graphics/pokemon/mewtwo/mega_x/overworld_normal.pal b/graphics/pokemon/mewtwo/mega_x/overworld_normal.pal new file mode 100644 index 000000000..6ec07f796 --- /dev/null +++ b/graphics/pokemon/mewtwo/mega_x/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +50 42 55 +64 48 80 +68 68 68 +129 72 136 +128 120 152 +184 88 208 +176 152 192 +0 0 0 +216 200 216 +232 232 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/mewtwo/mega_x/overworld_shiny.pal b/graphics/pokemon/mewtwo/mega_x/overworld_shiny.pal new file mode 100644 index 000000000..b1353cc5b --- /dev/null +++ b/graphics/pokemon/mewtwo/mega_x/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +50 42 55 +58 80 48 +68 68 68 +72 136 75 +128 120 152 +92 208 88 +176 152 192 +0 0 0 +216 200 216 +232 232 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/mewtwo/mega_y/overworld.png b/graphics/pokemon/mewtwo/mega_y/overworld.png new file mode 100644 index 000000000..1119dc6ee Binary files /dev/null and b/graphics/pokemon/mewtwo/mega_y/overworld.png differ diff --git a/graphics/pokemon/mewtwo/mega_y/overworld_normal.pal b/graphics/pokemon/mewtwo/mega_y/overworld_normal.pal new file mode 100644 index 000000000..6d3f60530 --- /dev/null +++ b/graphics/pokemon/mewtwo/mega_y/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +94 12 15 +64 48 80 +64 64 64 +96 96 96 +193 98 104 +136 72 136 +128 120 152 +184 88 208 +230 128 132 +0 0 0 +176 152 192 +216 200 216 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/mewtwo/mega_y/overworld_shiny.pal b/graphics/pokemon/mewtwo/mega_y/overworld_shiny.pal new file mode 100644 index 000000000..6aca25458 --- /dev/null +++ b/graphics/pokemon/mewtwo/mega_y/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +94 12 15 +58 80 48 +64 64 64 +96 96 96 +193 98 104 +72 136 75 +128 120 152 +92 208 88 +230 128 132 +0 0 0 +176 152 192 +216 200 216 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/mimikyu/busted/icon.png b/graphics/pokemon/mimikyu/busted/icon.png index 46bc43005..58272ef8f 100644 Binary files a/graphics/pokemon/mimikyu/busted/icon.png and b/graphics/pokemon/mimikyu/busted/icon.png differ diff --git a/graphics/pokemon/mimikyu/icon.png b/graphics/pokemon/mimikyu/icon.png index 89c587683..73d110ca7 100644 Binary files a/graphics/pokemon/mimikyu/icon.png and b/graphics/pokemon/mimikyu/icon.png differ diff --git a/graphics/pokemon/minior/core/blue/icon.png b/graphics/pokemon/minior/core/blue/icon.png index 85ee89151..60f670a1a 100644 Binary files a/graphics/pokemon/minior/core/blue/icon.png and b/graphics/pokemon/minior/core/blue/icon.png differ diff --git a/graphics/pokemon/minior/core/green/icon.png b/graphics/pokemon/minior/core/green/icon.png index f724e86ae..cf24afb33 100644 Binary files a/graphics/pokemon/minior/core/green/icon.png and b/graphics/pokemon/minior/core/green/icon.png differ diff --git a/graphics/pokemon/minior/core/indigo/icon.png b/graphics/pokemon/minior/core/indigo/icon.png index 4f2e531ce..17a625ccd 100644 Binary files a/graphics/pokemon/minior/core/indigo/icon.png and b/graphics/pokemon/minior/core/indigo/icon.png differ diff --git a/graphics/pokemon/minior/core/orange/icon.png b/graphics/pokemon/minior/core/orange/icon.png index 40509d6b5..7418f1ec5 100644 Binary files a/graphics/pokemon/minior/core/orange/icon.png and b/graphics/pokemon/minior/core/orange/icon.png differ diff --git a/graphics/pokemon/minior/core/red/icon.png b/graphics/pokemon/minior/core/red/icon.png index 486dcdebd..3d3880d7c 100644 Binary files a/graphics/pokemon/minior/core/red/icon.png and b/graphics/pokemon/minior/core/red/icon.png differ diff --git a/graphics/pokemon/minior/core/violet/icon.png b/graphics/pokemon/minior/core/violet/icon.png index 4392bdf3b..afa558962 100644 Binary files a/graphics/pokemon/minior/core/violet/icon.png and b/graphics/pokemon/minior/core/violet/icon.png differ diff --git a/graphics/pokemon/minior/core/yellow/icon.png b/graphics/pokemon/minior/core/yellow/icon.png index f7dfb7336..ae71fd9a2 100644 Binary files a/graphics/pokemon/minior/core/yellow/icon.png and b/graphics/pokemon/minior/core/yellow/icon.png differ diff --git a/graphics/pokemon/morelull/icon.png b/graphics/pokemon/morelull/icon.png index 221ebe545..1c50141e1 100644 Binary files a/graphics/pokemon/morelull/icon.png and b/graphics/pokemon/morelull/icon.png differ diff --git a/graphics/pokemon/mudbray/icon.png b/graphics/pokemon/mudbray/icon.png index 0447096ec..92094f19e 100644 Binary files a/graphics/pokemon/mudbray/icon.png and b/graphics/pokemon/mudbray/icon.png differ diff --git a/graphics/pokemon/mudsdale/icon.png b/graphics/pokemon/mudsdale/icon.png index 3146346ea..8b2f118fb 100644 Binary files a/graphics/pokemon/mudsdale/icon.png and b/graphics/pokemon/mudsdale/icon.png differ diff --git a/graphics/pokemon/muk/alola/icon.png b/graphics/pokemon/muk/alola/icon.png index d598fd728..676a7999e 100644 Binary files a/graphics/pokemon/muk/alola/icon.png and b/graphics/pokemon/muk/alola/icon.png differ diff --git a/graphics/pokemon/munna/overworld.png b/graphics/pokemon/munna/overworld.png index 9dc203214..605379190 100644 Binary files a/graphics/pokemon/munna/overworld.png and b/graphics/pokemon/munna/overworld.png differ diff --git a/graphics/pokemon/munna/overworld_shiny.pal b/graphics/pokemon/munna/overworld_shiny.pal index 04fb73d16..876530865 100644 --- a/graphics/pokemon/munna/overworld_shiny.pal +++ b/graphics/pokemon/munna/overworld_shiny.pal @@ -10,7 +10,7 @@ JASC-PAL 248 248 248 24 40 16 238 238 247 -208 24 80 +168 56 136 240 136 208 144 40 112 145 83 106 diff --git a/graphics/pokemon/musharna/overworld.png b/graphics/pokemon/musharna/overworld.png index aef3207b7..081e4187e 100644 Binary files a/graphics/pokemon/musharna/overworld.png and b/graphics/pokemon/musharna/overworld.png differ diff --git a/graphics/pokemon/musharna/overworld_normal.pal b/graphics/pokemon/musharna/overworld_normal.pal index f1b11dd77..cfcbd413f 100644 --- a/graphics/pokemon/musharna/overworld_normal.pal +++ b/graphics/pokemon/musharna/overworld_normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -109 75 80 -145 83 106 +122 77 104 +145 74 100 225 112 161 -175 112 140 -97 66 145 +168 80 112 +83 62 115 42 47 74 -140 137 175 -134 96 184 +144 120 216 +104 96 160 252 188 219 -247 207 182 -207 150 111 +248 192 200 +200 152 144 0 0 0 160 175 128 -0 0 0 +152 88 96 0 0 0 diff --git a/graphics/pokemon/musharna/overworld_shiny.pal b/graphics/pokemon/musharna/overworld_shiny.pal index 6b5ab8219..01c9460d4 100644 --- a/graphics/pokemon/musharna/overworld_shiny.pal +++ b/graphics/pokemon/musharna/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -109 75 80 -112 56 128 +88 72 128 +92 52 128 152 112 200 -175 112 140 +119 87 158 48 72 96 42 47 74 80 152 192 -64 120 192 +72 112 144 152 208 160 248 176 192 208 128 152 0 0 0 152 208 160 -0 0 0 +136 88 104 0 0 0 diff --git a/graphics/pokemon/naganadel/icon.png b/graphics/pokemon/naganadel/icon.png index 23204c5d1..f1194b189 100644 Binary files a/graphics/pokemon/naganadel/icon.png and b/graphics/pokemon/naganadel/icon.png differ diff --git a/graphics/pokemon/necrozma/dawn_wings/icon.png b/graphics/pokemon/necrozma/dawn_wings/icon.png index 25d24cb02..5644f2302 100644 Binary files a/graphics/pokemon/necrozma/dawn_wings/icon.png and b/graphics/pokemon/necrozma/dawn_wings/icon.png differ diff --git a/graphics/pokemon/necrozma/dusk_mane/icon.png b/graphics/pokemon/necrozma/dusk_mane/icon.png index c188b1e3c..c60f222f7 100644 Binary files a/graphics/pokemon/necrozma/dusk_mane/icon.png and b/graphics/pokemon/necrozma/dusk_mane/icon.png differ diff --git a/graphics/pokemon/necrozma/icon.png b/graphics/pokemon/necrozma/icon.png index 1d4283fdd..603f1f4fa 100644 Binary files a/graphics/pokemon/necrozma/icon.png and b/graphics/pokemon/necrozma/icon.png differ diff --git a/graphics/pokemon/necrozma/ultra/icon.png b/graphics/pokemon/necrozma/ultra/icon.png index 1c63345bc..790be2e0c 100644 Binary files a/graphics/pokemon/necrozma/ultra/icon.png and b/graphics/pokemon/necrozma/ultra/icon.png differ diff --git a/graphics/pokemon/necrozma/ultra/overworld.png b/graphics/pokemon/necrozma/ultra/overworld.png new file mode 100644 index 000000000..85d2902df Binary files /dev/null and b/graphics/pokemon/necrozma/ultra/overworld.png differ diff --git a/graphics/pokemon/necrozma/ultra/overworld_normal.pal b/graphics/pokemon/necrozma/ultra/overworld_normal.pal new file mode 100644 index 000000000..28fabb96d --- /dev/null +++ b/graphics/pokemon/necrozma/ultra/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 233 127 +53 46 7 +121 109 57 +44 77 106 +194 54 54 +150 133 35 +230 207 53 +235 216 89 +219 199 118 +0 0 0 +125 52 134 +61 168 194 +250 237 207 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/necrozma/ultra/overworld_shiny.pal b/graphics/pokemon/necrozma/ultra/overworld_shiny.pal new file mode 100644 index 000000000..79f1fc8cd --- /dev/null +++ b/graphics/pokemon/necrozma/ultra/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 233 127 +53 46 7 +74 106 133 +151 163 36 +189 75 177 +54 107 159 +70 150 232 +115 188 246 +130 181 222 +0 0 0 +46 131 58 +255 214 46 +228 245 253 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/nihilego/icon.png b/graphics/pokemon/nihilego/icon.png index 6e8f855d5..3be83cab2 100644 Binary files a/graphics/pokemon/nihilego/icon.png and b/graphics/pokemon/nihilego/icon.png differ diff --git a/graphics/pokemon/ninetales/alola/icon.png b/graphics/pokemon/ninetales/alola/icon.png index 71ac99d5a..f43368988 100644 Binary files a/graphics/pokemon/ninetales/alola/icon.png and b/graphics/pokemon/ninetales/alola/icon.png differ diff --git a/graphics/pokemon/ogerpon/back.png b/graphics/pokemon/ogerpon/back.png index 75f309fd6..8cd9136f9 100644 Binary files a/graphics/pokemon/ogerpon/back.png and b/graphics/pokemon/ogerpon/back.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/back.png b/graphics/pokemon/ogerpon/cornerstone/back.png index 7e40fee55..ffface9d6 100644 Binary files a/graphics/pokemon/ogerpon/cornerstone/back.png and b/graphics/pokemon/ogerpon/cornerstone/back.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/front.png b/graphics/pokemon/ogerpon/cornerstone/front.png index 8e96be70e..9b7f27923 100644 Binary files a/graphics/pokemon/ogerpon/cornerstone/front.png and b/graphics/pokemon/ogerpon/cornerstone/front.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/normal.pal b/graphics/pokemon/ogerpon/cornerstone/normal.pal index 852898a6b..eb11f81f7 100644 --- a/graphics/pokemon/ogerpon/cornerstone/normal.pal +++ b/graphics/pokemon/ogerpon/cornerstone/normal.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -148 209 161 -0 0 0 -42 44 41 -21 158 7 -74 76 73 -61 113 53 -25 27 24 -109 99 108 -133 139 139 -53 134 168 -55 189 227 -194 139 62 -255 197 74 -212 230 247 -144 92 38 +16 +238 230 180 +49 49 49 +148 156 148 +16 16 16 +65 115 49 +90 172 49 +90 98 106 +41 41 41 +74 74 74 +0 213 255 +24 24 24 +0 148 180 +255 222 65 +255 255 255 +238 156 0 +139 98 57 diff --git a/graphics/pokemon/ogerpon/cornerstone/shiny.pal b/graphics/pokemon/ogerpon/cornerstone/shiny.pal index c4956ce77..71dd9d6e9 100644 --- a/graphics/pokemon/ogerpon/cornerstone/shiny.pal +++ b/graphics/pokemon/ogerpon/cornerstone/shiny.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -148 209 161 -0 0 0 -42 44 41 -21 158 7 -74 76 73 -61 113 53 -25 27 24 -109 99 108 -133 139 139 -53 134 168 -55 189 227 -194 139 62 -255 197 74 -212 230 247 -124 162 56 +16 +238 230 180 +49 49 49 +148 156 148 +16 16 16 +65 115 49 +90 172 49 +90 98 106 +41 41 41 +74 74 74 +0 213 255 +24 24 24 +0 148 180 +255 222 65 +255 255 255 +164 205 24 +139 98 57 diff --git a/graphics/pokemon/ogerpon/front.png b/graphics/pokemon/ogerpon/front.png index dec38ef0b..6c2a76908 100644 Binary files a/graphics/pokemon/ogerpon/front.png and b/graphics/pokemon/ogerpon/front.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/back.png b/graphics/pokemon/ogerpon/hearthflame/back.png index d6d927f19..73f95efbf 100644 Binary files a/graphics/pokemon/ogerpon/hearthflame/back.png and b/graphics/pokemon/ogerpon/hearthflame/back.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/front.png b/graphics/pokemon/ogerpon/hearthflame/front.png index d8b9cb7b2..098041cf7 100644 Binary files a/graphics/pokemon/ogerpon/hearthflame/front.png and b/graphics/pokemon/ogerpon/hearthflame/front.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/normal.pal b/graphics/pokemon/ogerpon/hearthflame/normal.pal index 3f478af8a..2ed9b8c05 100644 --- a/graphics/pokemon/ogerpon/hearthflame/normal.pal +++ b/graphics/pokemon/ogerpon/hearthflame/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -148 210 164 -0 0 0 -41 44 41 -16 157 0 -230 60 49 -57 113 49 -49 133 172 -131 28 24 -213 230 246 -255 198 74 -172 105 32 -156 153 172 -49 190 230 -164 52 49 -74 76 74 -189 137 90 +238 230 180 +74 74 74 +213 156 24 +255 222 65 +65 115 49 +90 172 49 +16 16 16 +41 41 41 +238 57 41 +156 16 16 +82 8 8 +255 255 255 +238 156 0 +123 106 49 +0 213 255 +139 98 57 diff --git a/graphics/pokemon/ogerpon/hearthflame/shiny.pal b/graphics/pokemon/ogerpon/hearthflame/shiny.pal index fee0f8de7..81f60abe8 100644 --- a/graphics/pokemon/ogerpon/hearthflame/shiny.pal +++ b/graphics/pokemon/ogerpon/hearthflame/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -148 210 164 -0 0 0 -41 44 41 -16 157 0 -230 60 49 -57 113 49 -49 133 172 -131 28 24 -213 230 246 -255 198 74 -124 162 56 -156 153 172 -49 190 230 -164 52 49 -74 76 74 -189 137 90 +238 230 180 +74 74 74 +213 156 24 +255 222 65 +65 115 49 +90 172 49 +16 16 16 +41 41 41 +238 57 41 +156 16 16 +82 8 8 +255 255 255 +164 205 24 +123 106 49 +0 213 255 +139 98 57 diff --git a/graphics/pokemon/ogerpon/normal.pal b/graphics/pokemon/ogerpon/normal.pal index a1ac4baf9..f578e2234 100644 --- a/graphics/pokemon/ogerpon/normal.pal +++ b/graphics/pokemon/ogerpon/normal.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -148 209 161 -0 1 0 -42 44 41 -21 158 7 -27 70 15 -61 113 53 -17 106 68 -83 133 90 -74 76 73 -175 216 159 -251 253 250 -139 99 57 -0 164 153 -120 81 39 -219 157 92 +16 +238 230 180 +41 41 41 +65 115 49 +74 74 74 +8 164 156 +90 172 49 +16 16 16 +8 106 65 +180 222 164 +255 255 255 +98 164 24 +82 180 98 +238 156 0 +139 98 57 +255 222 65 +222 156 90 diff --git a/graphics/pokemon/ogerpon/shiny.pal b/graphics/pokemon/ogerpon/shiny.pal index 08c751ebd..02b6d9c5a 100644 --- a/graphics/pokemon/ogerpon/shiny.pal +++ b/graphics/pokemon/ogerpon/shiny.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -148 209 161 -0 1 0 -42 44 41 -21 158 7 -27 70 15 -61 113 53 -17 106 68 -83 133 90 -74 76 73 -175 216 159 -251 253 250 -139 99 57 -0 164 153 -124 162 56 -219 157 92 +16 +238 230 180 +41 41 41 +65 115 49 +74 74 74 +8 164 156 +90 172 49 +16 16 16 +8 106 65 +180 222 164 +255 255 255 +98 164 24 +82 180 98 +164 205 24 +139 98 57 +255 222 65 +222 156 90 diff --git a/graphics/pokemon/ogerpon/wellspring/back.png b/graphics/pokemon/ogerpon/wellspring/back.png index 87d82032f..d90a8afe3 100644 Binary files a/graphics/pokemon/ogerpon/wellspring/back.png and b/graphics/pokemon/ogerpon/wellspring/back.png differ diff --git a/graphics/pokemon/ogerpon/wellspring/front.png b/graphics/pokemon/ogerpon/wellspring/front.png index 77ffb489a..556f9f268 100644 Binary files a/graphics/pokemon/ogerpon/wellspring/front.png and b/graphics/pokemon/ogerpon/wellspring/front.png differ diff --git a/graphics/pokemon/ogerpon/wellspring/normal.pal b/graphics/pokemon/ogerpon/wellspring/normal.pal index db40508a5..b91b6ee25 100644 --- a/graphics/pokemon/ogerpon/wellspring/normal.pal +++ b/graphics/pokemon/ogerpon/wellspring/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -148 209 161 -0 0 0 -42 44 41 -21 158 7 -11 64 121 -61 113 53 -74 76 73 -15 90 170 -0 126 229 -53 134 168 -71 85 100 -55 189 227 -212 230 247 -147 91 33 -169 122 74 -152 155 171 +238 230 180 +65 115 49 +90 172 49 +16 16 16 +8 65 131 +41 41 41 +0 131 230 +74 74 74 +139 98 57 +8 90 180 +57 213 255 +205 222 255 +238 156 0 +255 222 65 +255 255 255 +156 205 222 diff --git a/graphics/pokemon/ogerpon/wellspring/shiny.pal b/graphics/pokemon/ogerpon/wellspring/shiny.pal index 7c44d3352..4f4e60c15 100644 --- a/graphics/pokemon/ogerpon/wellspring/shiny.pal +++ b/graphics/pokemon/ogerpon/wellspring/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -148 209 161 -0 0 0 -42 44 41 -21 158 7 -11 64 121 -61 113 53 -74 76 73 -15 90 170 -0 126 229 -53 134 168 -71 85 100 -55 189 227 -212 230 247 -124 162 56 -169 122 74 -152 155 171 +238 230 180 +65 115 49 +90 172 49 +16 16 16 +8 65 131 +41 41 41 +0 131 230 +74 74 74 +139 98 57 +8 90 180 +57 213 255 +205 222 255 +164 205 24 +255 222 65 +255 255 255 +156 205 222 diff --git a/graphics/pokemon/oranguru/icon.png b/graphics/pokemon/oranguru/icon.png index da7abe984..99b8c13f8 100644 Binary files a/graphics/pokemon/oranguru/icon.png and b/graphics/pokemon/oranguru/icon.png differ diff --git a/graphics/pokemon/oricorio/icon.png b/graphics/pokemon/oricorio/icon.png index 80936904c..a5f53870f 100644 Binary files a/graphics/pokemon/oricorio/icon.png and b/graphics/pokemon/oricorio/icon.png differ diff --git a/graphics/pokemon/oricorio/pau/icon.png b/graphics/pokemon/oricorio/pau/icon.png index 98040bf38..72a009bd5 100644 Binary files a/graphics/pokemon/oricorio/pau/icon.png and b/graphics/pokemon/oricorio/pau/icon.png differ diff --git a/graphics/pokemon/oricorio/pom_pom/icon.png b/graphics/pokemon/oricorio/pom_pom/icon.png index b60855f91..d757b0564 100644 Binary files a/graphics/pokemon/oricorio/pom_pom/icon.png and b/graphics/pokemon/oricorio/pom_pom/icon.png differ diff --git a/graphics/pokemon/oricorio/sensu/icon.png b/graphics/pokemon/oricorio/sensu/icon.png index b8423c31f..3491f6ee0 100644 Binary files a/graphics/pokemon/oricorio/sensu/icon.png and b/graphics/pokemon/oricorio/sensu/icon.png differ diff --git a/graphics/pokemon/palossand/icon.png b/graphics/pokemon/palossand/icon.png index 3131f2c20..80f64f8b0 100644 Binary files a/graphics/pokemon/palossand/icon.png and b/graphics/pokemon/palossand/icon.png differ diff --git a/graphics/pokemon/palpitoad/overworld.png b/graphics/pokemon/palpitoad/overworld.png index 3be06ec27..dda419e27 100644 Binary files a/graphics/pokemon/palpitoad/overworld.png and b/graphics/pokemon/palpitoad/overworld.png differ diff --git a/graphics/pokemon/palpitoad/overworld_normal.pal b/graphics/pokemon/palpitoad/overworld_normal.pal index 4d5d03566..7116f735e 100644 --- a/graphics/pokemon/palpitoad/overworld_normal.pal +++ b/graphics/pokemon/palpitoad/overworld_normal.pal @@ -14,6 +14,6 @@ JASC-PAL 191 147 121 239 215 196 138 79 63 -0 0 0 +224 224 224 0 0 0 0 0 0 diff --git a/graphics/pokemon/palpitoad/overworld_shiny.pal b/graphics/pokemon/palpitoad/overworld_shiny.pal index 46d834cac..cfd54885c 100644 --- a/graphics/pokemon/palpitoad/overworld_shiny.pal +++ b/graphics/pokemon/palpitoad/overworld_shiny.pal @@ -5,15 +5,15 @@ JASC-PAL 0 0 0 96 96 94 65 65 65 -188 99 24 +248 168 16 15 87 72 38 39 41 40 168 168 8 192 208 -120 80 8 -222 196 194 +161 89 22 +176 136 128 222 196 194 96 96 94 -0 0 0 +224 224 224 0 0 0 0 0 0 diff --git a/graphics/pokemon/panpour/overworld.png b/graphics/pokemon/panpour/overworld.png index e02358cf2..698ec1737 100644 Binary files a/graphics/pokemon/panpour/overworld.png and b/graphics/pokemon/panpour/overworld.png differ diff --git a/graphics/pokemon/panpour/overworld_normal.pal b/graphics/pokemon/panpour/overworld_normal.pal index 99ad9dc50..31d63b727 100644 --- a/graphics/pokemon/panpour/overworld_normal.pal +++ b/graphics/pokemon/panpour/overworld_normal.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 152 208 160 -0 57 115 +26 54 82 24 139 172 41 180 222 0 0 0 diff --git a/graphics/pokemon/pansage/overworld.png b/graphics/pokemon/pansage/overworld.png index 6addd12e2..3e884320a 100644 Binary files a/graphics/pokemon/pansage/overworld.png and b/graphics/pokemon/pansage/overworld.png differ diff --git a/graphics/pokemon/pansear/overworld.png b/graphics/pokemon/pansear/overworld.png index 0962330b5..270f79180 100644 Binary files a/graphics/pokemon/pansear/overworld.png and b/graphics/pokemon/pansear/overworld.png differ diff --git a/graphics/pokemon/passimian/icon.png b/graphics/pokemon/passimian/icon.png index 6daf24ccb..1eed7c541 100644 Binary files a/graphics/pokemon/passimian/icon.png and b/graphics/pokemon/passimian/icon.png differ diff --git a/graphics/pokemon/patrat/overworld.png b/graphics/pokemon/patrat/overworld.png index ea2df04dc..8b6a34f19 100644 Binary files a/graphics/pokemon/patrat/overworld.png and b/graphics/pokemon/patrat/overworld.png differ diff --git a/graphics/pokemon/persian/alola/icon.png b/graphics/pokemon/persian/alola/icon.png index 75348250d..21ad48eb3 100644 Binary files a/graphics/pokemon/persian/alola/icon.png and b/graphics/pokemon/persian/alola/icon.png differ diff --git a/graphics/pokemon/pheromosa/icon.png b/graphics/pokemon/pheromosa/icon.png index 4ab3a02a4..0ff38de88 100644 Binary files a/graphics/pokemon/pheromosa/icon.png and b/graphics/pokemon/pheromosa/icon.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/icon.png b/graphics/pokemon/pichu/spiky_eared/icon.png index acd0234e0..dbb47c84d 100644 Binary files a/graphics/pokemon/pichu/spiky_eared/icon.png and b/graphics/pokemon/pichu/spiky_eared/icon.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/overworld.png b/graphics/pokemon/pichu/spiky_eared/overworld.png index 7208db510..36c104000 100644 Binary files a/graphics/pokemon/pichu/spiky_eared/overworld.png and b/graphics/pokemon/pichu/spiky_eared/overworld.png differ diff --git a/graphics/pokemon/pidgeot/mega/overworld.png b/graphics/pokemon/pidgeot/mega/overworld.png new file mode 100644 index 000000000..4364335af Binary files /dev/null and b/graphics/pokemon/pidgeot/mega/overworld.png differ diff --git a/graphics/pokemon/pidgeot/mega/overworld_normal.pal b/graphics/pokemon/pidgeot/mega/overworld_normal.pal new file mode 100644 index 000000000..c18feb0a7 --- /dev/null +++ b/graphics/pokemon/pidgeot/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +17 48 59 +80 56 24 +126 32 86 +149 91 50 +208 112 40 +242 57 71 +176 64 96 +184 176 99 +29 110 141 +48 150 203 +177 170 153 +244 138 140 +0 0 0 +235 237 171 +242 245 229 diff --git a/graphics/pokemon/pidgeot/mega/overworld_shiny.pal b/graphics/pokemon/pidgeot/mega/overworld_shiny.pal new file mode 100644 index 000000000..69da1cc4a --- /dev/null +++ b/graphics/pokemon/pidgeot/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +48 29 88 +76 70 27 +110 77 47 +149 91 50 +196 158 50 +211 208 87 +157 139 82 +184 176 99 +91 48 164 +126 59 215 +233 193 97 +224 226 155 +0 0 0 +235 237 171 +248 255 219 diff --git a/graphics/pokemon/pidove/overworld.png b/graphics/pokemon/pidove/overworld.png index b55a13e39..020027d44 100644 Binary files a/graphics/pokemon/pidove/overworld.png and b/graphics/pokemon/pidove/overworld.png differ diff --git a/graphics/pokemon/pidove/overworld_normal.pal b/graphics/pokemon/pidove/overworld_normal.pal index 704bb5f94..820bcb20c 100644 --- a/graphics/pokemon/pidove/overworld_normal.pal +++ b/graphics/pokemon/pidove/overworld_normal.pal @@ -14,6 +14,6 @@ JASC-PAL 248 184 40 184 96 96 128 128 128 -172 172 172 +150 150 150 0 0 0 0 0 0 diff --git a/graphics/pokemon/pignite/overworld.png b/graphics/pokemon/pignite/overworld.png index 9ea0862b2..b6b97736b 100644 Binary files a/graphics/pokemon/pignite/overworld.png and b/graphics/pokemon/pignite/overworld.png differ diff --git a/graphics/pokemon/pignite/overworld_normal.pal b/graphics/pokemon/pignite/overworld_normal.pal index 5cf1ee3ef..1454fac04 100644 --- a/graphics/pokemon/pignite/overworld_normal.pal +++ b/graphics/pokemon/pignite/overworld_normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 16 16 16 0 0 0 -82 49 41 +80 48 40 57 37 37 -189 90 49 +209 95 46 123 57 41 -232 106 43 -210 182 96 -24 32 40 -83 79 60 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +232 112 40 +232 192 56 +56 32 32 +80 48 40 +232 232 248 +200 64 56 +72 72 72 +41 41 41 0 0 0 diff --git a/graphics/pokemon/pignite/overworld_shiny.pal b/graphics/pokemon/pignite/overworld_shiny.pal index 21a321291..8d967d10b 100644 --- a/graphics/pokemon/pignite/overworld_shiny.pal +++ b/graphics/pokemon/pignite/overworld_shiny.pal @@ -6,14 +6,14 @@ JASC-PAL 0 0 0 48 56 72 42 48 55 -120 104 240 -101 69 51 +184 136 24 +120 88 40 232 160 32 -204 156 214 +160 144 232 42 48 55 48 56 72 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +232 232 248 +212 121 189 +88 48 40 +56 32 32 0 0 0 diff --git a/graphics/pokemon/pikachu/alola/icon.png b/graphics/pokemon/pikachu/alola/icon.png index b9ba5f757..0634df1ad 100644 Binary files a/graphics/pokemon/pikachu/alola/icon.png and b/graphics/pokemon/pikachu/alola/icon.png differ diff --git a/graphics/pokemon/pikachu/belle/icon.png b/graphics/pokemon/pikachu/belle/icon.png index b3c0f00b3..f19b28945 100644 Binary files a/graphics/pokemon/pikachu/belle/icon.png and b/graphics/pokemon/pikachu/belle/icon.png differ diff --git a/graphics/pokemon/pikachu/cosplay/icon.png b/graphics/pokemon/pikachu/cosplay/icon.png index c826dacab..21d9172a1 100644 Binary files a/graphics/pokemon/pikachu/cosplay/icon.png and b/graphics/pokemon/pikachu/cosplay/icon.png differ diff --git a/graphics/pokemon/pikachu/hoenn/icon.png b/graphics/pokemon/pikachu/hoenn/icon.png index e5f8bfe20..5b9cbb2ba 100644 Binary files a/graphics/pokemon/pikachu/hoenn/icon.png and b/graphics/pokemon/pikachu/hoenn/icon.png differ diff --git a/graphics/pokemon/pikachu/kalos/icon.png b/graphics/pokemon/pikachu/kalos/icon.png index c903ea9f3..2aae11d52 100644 Binary files a/graphics/pokemon/pikachu/kalos/icon.png and b/graphics/pokemon/pikachu/kalos/icon.png differ diff --git a/graphics/pokemon/pikachu/libre/icon.png b/graphics/pokemon/pikachu/libre/icon.png index c1163a161..ef6e8f155 100644 Binary files a/graphics/pokemon/pikachu/libre/icon.png and b/graphics/pokemon/pikachu/libre/icon.png differ diff --git a/graphics/pokemon/pikachu/original/icon.png b/graphics/pokemon/pikachu/original/icon.png index d84764b65..d4b80f3dc 100644 Binary files a/graphics/pokemon/pikachu/original/icon.png and b/graphics/pokemon/pikachu/original/icon.png differ diff --git a/graphics/pokemon/pikachu/phd/icon.png b/graphics/pokemon/pikachu/phd/icon.png index f0b66bccf..3d228c427 100644 Binary files a/graphics/pokemon/pikachu/phd/icon.png and b/graphics/pokemon/pikachu/phd/icon.png differ diff --git a/graphics/pokemon/pikachu/pop_star/icon.png b/graphics/pokemon/pikachu/pop_star/icon.png index eb9b49e70..1775f78db 100644 Binary files a/graphics/pokemon/pikachu/pop_star/icon.png and b/graphics/pokemon/pikachu/pop_star/icon.png differ diff --git a/graphics/pokemon/pikachu/rock_star/icon.png b/graphics/pokemon/pikachu/rock_star/icon.png index 2c8d144d6..89025f0f3 100644 Binary files a/graphics/pokemon/pikachu/rock_star/icon.png and b/graphics/pokemon/pikachu/rock_star/icon.png differ diff --git a/graphics/pokemon/pikachu/sinnoh/icon.png b/graphics/pokemon/pikachu/sinnoh/icon.png index 081ee6aae..fbd66b052 100644 Binary files a/graphics/pokemon/pikachu/sinnoh/icon.png and b/graphics/pokemon/pikachu/sinnoh/icon.png differ diff --git a/graphics/pokemon/pikachu/starter/icon.png b/graphics/pokemon/pikachu/starter/icon.png index 891f0d1b3..737fababd 100644 Binary files a/graphics/pokemon/pikachu/starter/icon.png and b/graphics/pokemon/pikachu/starter/icon.png differ diff --git a/graphics/pokemon/pikachu/unova/icon.png b/graphics/pokemon/pikachu/unova/icon.png index b6427a5ec..427a38c6d 100644 Binary files a/graphics/pokemon/pikachu/unova/icon.png and b/graphics/pokemon/pikachu/unova/icon.png differ diff --git a/graphics/pokemon/pikachu/world/icon.png b/graphics/pokemon/pikachu/world/icon.png index 260e29cda..58c4ed1f4 100644 Binary files a/graphics/pokemon/pikachu/world/icon.png and b/graphics/pokemon/pikachu/world/icon.png differ diff --git a/graphics/pokemon/pikipek/icon.png b/graphics/pokemon/pikipek/icon.png index 291e148f1..9a65234d8 100644 Binary files a/graphics/pokemon/pikipek/icon.png and b/graphics/pokemon/pikipek/icon.png differ diff --git a/graphics/pokemon/pincurchin/anim_front.png b/graphics/pokemon/pincurchin/anim_front.png index b8ed4964e..ffc6bb600 100644 Binary files a/graphics/pokemon/pincurchin/anim_front.png and b/graphics/pokemon/pincurchin/anim_front.png differ diff --git a/graphics/pokemon/pinsir/mega/overworld.png b/graphics/pokemon/pinsir/mega/overworld.png new file mode 100644 index 000000000..1c851f84f Binary files /dev/null and b/graphics/pokemon/pinsir/mega/overworld.png differ diff --git a/graphics/pokemon/pinsir/mega/overworld_normal.pal b/graphics/pokemon/pinsir/mega/overworld_normal.pal new file mode 100644 index 000000000..4a7eb110b --- /dev/null +++ b/graphics/pokemon/pinsir/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +48 48 48 +88 44 28 +80 64 48 +96 80 56 +120 104 80 +104 104 104 +142 64 34 +221 149 23 +152 128 96 +224 227 91 +144 144 144 +0 0 0 +192 192 208 +232 232 248 +221 149 23 diff --git a/graphics/pokemon/pinsir/mega/overworld_shiny.pal b/graphics/pokemon/pinsir/mega/overworld_shiny.pal new file mode 100644 index 000000000..4b03f94e5 --- /dev/null +++ b/graphics/pokemon/pinsir/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +48 48 48 +88 44 28 +50 54 93 +62 60 118 +95 93 154 +134 134 93 +142 64 34 +74 135 51 +118 119 194 +131 227 91 +173 173 132 +0 0 0 +217 217 175 +232 232 248 +221 142 23 diff --git a/graphics/pokemon/poipole/icon.png b/graphics/pokemon/poipole/icon.png index dce46b073..b1ab69e8f 100644 Binary files a/graphics/pokemon/poipole/icon.png and b/graphics/pokemon/poipole/icon.png differ diff --git a/graphics/pokemon/popplio/icon.png b/graphics/pokemon/popplio/icon.png index c35b74d2d..f2eb18465 100644 Binary files a/graphics/pokemon/popplio/icon.png and b/graphics/pokemon/popplio/icon.png differ diff --git a/graphics/pokemon/primarina/icon.png b/graphics/pokemon/primarina/icon.png index d642cf12b..1b56f7690 100644 Binary files a/graphics/pokemon/primarina/icon.png and b/graphics/pokemon/primarina/icon.png differ diff --git a/graphics/pokemon/purrloin/overworld.png b/graphics/pokemon/purrloin/overworld.png index dd0d58266..b751a7f8e 100644 Binary files a/graphics/pokemon/purrloin/overworld.png and b/graphics/pokemon/purrloin/overworld.png differ diff --git a/graphics/pokemon/purrloin/overworld_shiny.pal b/graphics/pokemon/purrloin/overworld_shiny.pal index f1c5b242d..92ba9739b 100644 --- a/graphics/pokemon/purrloin/overworld_shiny.pal +++ b/graphics/pokemon/purrloin/overworld_shiny.pal @@ -7,10 +7,10 @@ JASC-PAL 0 0 0 56 72 104 168 112 224 -216 216 56 -240 232 192 -232 232 248 +112 176 64 216 200 136 +232 232 248 +240 232 192 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/pyukumuku/icon.png b/graphics/pokemon/pyukumuku/icon.png index 2e3e04451..9ef614755 100644 Binary files a/graphics/pokemon/pyukumuku/icon.png and b/graphics/pokemon/pyukumuku/icon.png differ diff --git a/graphics/pokemon/raichu/alola/icon.png b/graphics/pokemon/raichu/alola/icon.png index d005cf7e1..2098d83f9 100644 Binary files a/graphics/pokemon/raichu/alola/icon.png and b/graphics/pokemon/raichu/alola/icon.png differ diff --git a/graphics/pokemon/raticate/alola/icon.png b/graphics/pokemon/raticate/alola/icon.png index 4acd9d040..072c5ca6e 100644 Binary files a/graphics/pokemon/raticate/alola/icon.png and b/graphics/pokemon/raticate/alola/icon.png differ diff --git a/graphics/pokemon/rattata/alola/icon.png b/graphics/pokemon/rattata/alola/icon.png index b13e1e9bb..87c40fa44 100644 Binary files a/graphics/pokemon/rattata/alola/icon.png and b/graphics/pokemon/rattata/alola/icon.png differ diff --git a/graphics/pokemon/rayquaza/mega/overworld.png b/graphics/pokemon/rayquaza/mega/overworld.png new file mode 100644 index 000000000..09bd6792d Binary files /dev/null and b/graphics/pokemon/rayquaza/mega/overworld.png differ diff --git a/graphics/pokemon/rayquaza/mega/overworld_normal.pal b/graphics/pokemon/rayquaza/mega/overworld_normal.pal new file mode 100644 index 000000000..59daaaf12 --- /dev/null +++ b/graphics/pokemon/rayquaza/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +48 48 48 +88 16 8 +11 72 54 +63 74 65 +43 111 79 +164 75 24 +255 123 101 +74 150 114 +192 160 40 +240 200 48 +104 190 140 +231 153 184 +152 224 144 +0 0 0 +173 190 198 diff --git a/graphics/pokemon/rayquaza/mega/overworld_shiny.pal b/graphics/pokemon/rayquaza/mega/overworld_shiny.pal new file mode 100644 index 000000000..82199ef8e --- /dev/null +++ b/graphics/pokemon/rayquaza/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +48 48 48 +88 16 8 +41 41 41 +63 74 65 +77 77 77 +148 40 39 +255 151 101 +112 112 112 +175 56 70 +255 89 89 +147 147 147 +231 153 184 +184 184 184 +0 0 0 +173 190 198 diff --git a/graphics/pokemon/ribombee/icon.png b/graphics/pokemon/ribombee/icon.png index 10117f123..46f0ba787 100644 Binary files a/graphics/pokemon/ribombee/icon.png and b/graphics/pokemon/ribombee/icon.png differ diff --git a/graphics/pokemon/rockruff/icon.png b/graphics/pokemon/rockruff/icon.png index 5df839ab5..6a7816898 100644 Binary files a/graphics/pokemon/rockruff/icon.png and b/graphics/pokemon/rockruff/icon.png differ diff --git a/graphics/pokemon/rowlet/icon.png b/graphics/pokemon/rowlet/icon.png index 433666f6e..725a5884f 100644 Binary files a/graphics/pokemon/rowlet/icon.png and b/graphics/pokemon/rowlet/icon.png differ diff --git a/graphics/pokemon/sableye/mega/overworld.png b/graphics/pokemon/sableye/mega/overworld.png new file mode 100644 index 000000000..0439ee404 Binary files /dev/null and b/graphics/pokemon/sableye/mega/overworld.png differ diff --git a/graphics/pokemon/sableye/mega/overworld_normal.pal b/graphics/pokemon/sableye/mega/overworld_normal.pal new file mode 100644 index 000000000..7479f563f --- /dev/null +++ b/graphics/pokemon/sableye/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +64 48 104 +179 15 55 +192 56 56 +216 24 64 +227 56 103 +232 88 112 +24 152 120 +88 64 144 +120 96 176 +255 121 160 +255 150 181 +255 176 181 +144 128 216 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/sableye/mega/overworld_shiny.pal b/graphics/pokemon/sableye/mega/overworld_shiny.pal new file mode 100644 index 000000000..3b03e34b9 --- /dev/null +++ b/graphics/pokemon/sableye/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +93 90 43 +12 148 31 +192 56 56 +19 187 47 +45 201 62 +232 88 112 +24 152 120 +144 141 64 +176 173 96 +98 255 111 +122 255 133 +145 255 172 +216 202 128 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/salamence/mega/overworld.png b/graphics/pokemon/salamence/mega/overworld.png new file mode 100644 index 000000000..65e63e502 Binary files /dev/null and b/graphics/pokemon/salamence/mega/overworld.png differ diff --git a/graphics/pokemon/salamence/mega/overworld_normal.pal b/graphics/pokemon/salamence/mega/overworld_normal.pal new file mode 100644 index 000000000..2f2762749 --- /dev/null +++ b/graphics/pokemon/salamence/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +96 32 32 +56 56 64 +48 72 112 +160 64 64 +192 80 96 +216 88 120 +40 144 168 +80 184 200 +128 128 144 +160 160 176 +0 0 0 +152 200 208 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/salamence/mega/overworld_shiny.pal b/graphics/pokemon/salamence/mega/overworld_shiny.pal new file mode 100644 index 000000000..2d9ae90a6 --- /dev/null +++ b/graphics/pokemon/salamence/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +74 48 24 +56 56 64 +40 88 40 +160 101 62 +193 114 78 +214 132 77 +48 168 64 +104 192 112 +128 128 144 +160 160 176 +0 0 0 +136 224 152 +232 232 248 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/salandit/icon.png b/graphics/pokemon/salandit/icon.png index e0c6309c7..37fe8d7e7 100644 Binary files a/graphics/pokemon/salandit/icon.png and b/graphics/pokemon/salandit/icon.png differ diff --git a/graphics/pokemon/salazzle/icon.png b/graphics/pokemon/salazzle/icon.png index db4edf2fc..e106d18c4 100644 Binary files a/graphics/pokemon/salazzle/icon.png and b/graphics/pokemon/salazzle/icon.png differ diff --git a/graphics/pokemon/sandshrew/alola/icon.png b/graphics/pokemon/sandshrew/alola/icon.png index a1cc049bd..ae93de08b 100644 Binary files a/graphics/pokemon/sandshrew/alola/icon.png and b/graphics/pokemon/sandshrew/alola/icon.png differ diff --git a/graphics/pokemon/sandslash/alola/icon.png b/graphics/pokemon/sandslash/alola/icon.png index 88cea6049..9df450d1e 100644 Binary files a/graphics/pokemon/sandslash/alola/icon.png and b/graphics/pokemon/sandslash/alola/icon.png differ diff --git a/graphics/pokemon/sandygast/icon.png b/graphics/pokemon/sandygast/icon.png index 46167f5ab..b40281094 100644 Binary files a/graphics/pokemon/sandygast/icon.png and b/graphics/pokemon/sandygast/icon.png differ diff --git a/graphics/pokemon/sceptile/mega/overworld.png b/graphics/pokemon/sceptile/mega/overworld.png new file mode 100644 index 000000000..fa9b6409c Binary files /dev/null and b/graphics/pokemon/sceptile/mega/overworld.png differ diff --git a/graphics/pokemon/sceptile/mega/overworld_normal.pal b/graphics/pokemon/sceptile/mega/overworld_normal.pal new file mode 100644 index 000000000..79c68cf85 --- /dev/null +++ b/graphics/pokemon/sceptile/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +0 34 17 +104 24 24 +40 80 16 +10 69 59 +0 116 58 +120 104 24 +165 43 43 +136 68 0 +204 102 0 +80 144 48 +200 160 56 +128 176 72 +160 208 104 +248 216 88 +0 0 0 diff --git a/graphics/pokemon/sceptile/mega/overworld_shiny.pal b/graphics/pokemon/sceptile/mega/overworld_shiny.pal new file mode 100644 index 000000000..0fa6a06d4 --- /dev/null +++ b/graphics/pokemon/sceptile/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +0 34 17 +124 77 3 +24 64 56 +10 69 59 +0 116 79 +120 104 24 +231 157 15 +136 68 0 +204 102 0 +72 120 112 +200 160 56 +96 152 128 +136 216 192 +206 53 49 +0 0 0 diff --git a/graphics/pokemon/scizor/mega/overworld.png b/graphics/pokemon/scizor/mega/overworld.png new file mode 100644 index 000000000..1a72458fc Binary files /dev/null and b/graphics/pokemon/scizor/mega/overworld.png differ diff --git a/graphics/pokemon/scizor/mega/overworld_normal.pal b/graphics/pokemon/scizor/mega/overworld_normal.pal new file mode 100644 index 000000000..d6c5a61f6 --- /dev/null +++ b/graphics/pokemon/scizor/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +27 32 44 +88 16 8 +40 48 64 +57 68 91 +80 88 112 +160 32 32 +208 56 56 +104 112 136 +58 128 152 +167 164 150 +144 152 176 +191 189 179 +0 0 0 +184 200 216 +232 232 248 diff --git a/graphics/pokemon/scizor/mega/overworld_shiny.pal b/graphics/pokemon/scizor/mega/overworld_shiny.pal new file mode 100644 index 000000000..b3c240401 --- /dev/null +++ b/graphics/pokemon/scizor/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +12 64 33 +48 93 8 +36 118 56 +71 154 57 +80 88 112 +110 170 34 +150 219 59 +104 112 136 +58 128 152 +167 164 150 +144 152 176 +191 189 179 +0 0 0 +184 200 216 +232 232 248 diff --git a/graphics/pokemon/sharpedo/mega/overworld.png b/graphics/pokemon/sharpedo/mega/overworld.png new file mode 100644 index 000000000..28409873c Binary files /dev/null and b/graphics/pokemon/sharpedo/mega/overworld.png differ diff --git a/graphics/pokemon/sharpedo/mega/overworld_normal.pal b/graphics/pokemon/sharpedo/mega/overworld_normal.pal new file mode 100644 index 000000000..a6e3ea418 --- /dev/null +++ b/graphics/pokemon/sharpedo/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +112 24 48 +96 80 16 +60 69 78 +32 64 104 +192 88 112 +208 168 48 +248 208 80 +32 88 136 +64 112 160 +88 144 192 +128 136 144 +160 168 176 +0 0 0 +184 200 240 +232 232 248 diff --git a/graphics/pokemon/sharpedo/mega/overworld_shiny.pal b/graphics/pokemon/sharpedo/mega/overworld_shiny.pal new file mode 100644 index 000000000..5fdd9eab6 --- /dev/null +++ b/graphics/pokemon/sharpedo/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +112 24 48 +96 80 16 +60 69 78 +104 32 92 +192 88 112 +208 168 48 +248 208 80 +136 32 129 +160 64 150 +192 88 185 +128 136 144 +160 168 176 +0 0 0 +184 200 240 +232 232 248 diff --git a/graphics/pokemon/shiinotic/icon.png b/graphics/pokemon/shiinotic/icon.png index 510d61a97..68adb4ff3 100644 Binary files a/graphics/pokemon/shiinotic/icon.png and b/graphics/pokemon/shiinotic/icon.png differ diff --git a/graphics/pokemon/silvally/icon.png b/graphics/pokemon/silvally/icon.png index 2ef6ae9ad..954a4362b 100644 Binary files a/graphics/pokemon/silvally/icon.png and b/graphics/pokemon/silvally/icon.png differ diff --git a/graphics/pokemon/sinistcha/back.png b/graphics/pokemon/sinistcha/back.png index dbb51bbf3..b9df7c5e4 100644 Binary files a/graphics/pokemon/sinistcha/back.png and b/graphics/pokemon/sinistcha/back.png differ diff --git a/graphics/pokemon/sinistcha/front.png b/graphics/pokemon/sinistcha/front.png index 4131a22b9..eeb1b7a71 100644 Binary files a/graphics/pokemon/sinistcha/front.png and b/graphics/pokemon/sinistcha/front.png differ diff --git a/graphics/pokemon/sinistcha/normal.pal b/graphics/pokemon/sinistcha/normal.pal index 16008ccdf..069764515 100644 --- a/graphics/pokemon/sinistcha/normal.pal +++ b/graphics/pokemon/sinistcha/normal.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -115 197 164 +16 +153 210 164 +37 27 27 76 58 58 +57 103 37 105 68 27 -147 138 68 -159 153 130 -219 210 145 -167 186 114 -45 33 33 -51 99 34 +106 91 32 93 158 74 120 196 99 -247 215 98 +160 151 80 +135 132 126 +167 186 114 +204 195 116 +247 218 103 +193 185 174 5 5 5 -208 210 193 -241 237 235 +230 225 219 diff --git a/graphics/pokemon/sinistcha/shiny.pal b/graphics/pokemon/sinistcha/shiny.pal index c769e9d1a..6b9d62ab8 100644 --- a/graphics/pokemon/sinistcha/shiny.pal +++ b/graphics/pokemon/sinistcha/shiny.pal @@ -1,18 +1,19 @@ JASC-PAL 0100 -15 -115 197 164 +16 +153 210 164 +10 48 0 32 88 15 -105 68 27 -147 138 68 -159 153 130 -219 210 145 -167 186 114 -45 33 33 -51 99 34 +57 103 37 +143 133 51 +106 91 32 93 158 74 120 196 99 -247 215 98 +160 151 80 +135 132 126 +167 186 114 +204 195 116 +247 218 103 +193 185 174 5 5 5 -208 210 193 -241 237 235 +230 225 219 diff --git a/graphics/pokemon/slowbro/mega/overworld.png b/graphics/pokemon/slowbro/mega/overworld.png new file mode 100644 index 000000000..156973787 Binary files /dev/null and b/graphics/pokemon/slowbro/mega/overworld.png differ diff --git a/graphics/pokemon/slowbro/mega/overworld_normal.pal b/graphics/pokemon/slowbro/mega/overworld_normal.pal new file mode 100644 index 000000000..f447c1383 --- /dev/null +++ b/graphics/pokemon/slowbro/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +34 34 34 +112 48 56 +68 68 68 +176 96 104 +216 192 88 +208 120 128 +152 152 152 +240 168 176 +0 0 0 +240 240 168 +192 200 208 +232 232 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/slowbro/mega/overworld_shiny.pal b/graphics/pokemon/slowbro/mega/overworld_shiny.pal new file mode 100644 index 000000000..14445e362 --- /dev/null +++ b/graphics/pokemon/slowbro/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +34 34 34 +75 48 112 +82 71 58 +132 96 176 +216 192 88 +149 121 187 +177 160 109 +200 168 240 +0 0 0 +240 240 168 +247 222 152 +232 232 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/solgaleo/icon.png b/graphics/pokemon/solgaleo/icon.png index e7520c9bc..62ed55d20 100644 Binary files a/graphics/pokemon/solgaleo/icon.png and b/graphics/pokemon/solgaleo/icon.png differ diff --git a/graphics/pokemon/stakataka/icon.png b/graphics/pokemon/stakataka/icon.png index ad79ba34d..359b1a248 100644 Binary files a/graphics/pokemon/stakataka/icon.png and b/graphics/pokemon/stakataka/icon.png differ diff --git a/graphics/pokemon/steelix/mega/overworld.png b/graphics/pokemon/steelix/mega/overworld.png new file mode 100644 index 000000000..d2c39bbd0 Binary files /dev/null and b/graphics/pokemon/steelix/mega/overworld.png differ diff --git a/graphics/pokemon/steelix/mega/overworld_normal.pal b/graphics/pokemon/steelix/mega/overworld_normal.pal new file mode 100644 index 000000000..98d4f25b8 --- /dev/null +++ b/graphics/pokemon/steelix/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +55 56 59 +60 65 72 +96 105 118 +86 171 190 +150 162 178 +220 174 232 +182 195 214 +152 221 234 +0 0 0 +239 245 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/steelix/mega/overworld_shiny.pal b/graphics/pokemon/steelix/mega/overworld_shiny.pal new file mode 100644 index 000000000..b319f73ee --- /dev/null +++ b/graphics/pokemon/steelix/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +55 56 59 +74 71 50 +131 126 83 +86 171 190 +202 193 116 +220 174 232 +223 218 157 +152 221 234 +0 0 0 +239 245 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/steenee/icon.png b/graphics/pokemon/steenee/icon.png index 80531a631..eea2c5a42 100644 Binary files a/graphics/pokemon/steenee/icon.png and b/graphics/pokemon/steenee/icon.png differ diff --git a/graphics/pokemon/stufful/icon.png b/graphics/pokemon/stufful/icon.png index de35247ae..357d860f6 100644 Binary files a/graphics/pokemon/stufful/icon.png and b/graphics/pokemon/stufful/icon.png differ diff --git a/graphics/pokemon/swampert/mega/overworld.png b/graphics/pokemon/swampert/mega/overworld.png new file mode 100644 index 000000000..5c958759c Binary files /dev/null and b/graphics/pokemon/swampert/mega/overworld.png differ diff --git a/graphics/pokemon/swampert/mega/overworld_normal.pal b/graphics/pokemon/swampert/mega/overworld_normal.pal new file mode 100644 index 000000000..b25f6a76d --- /dev/null +++ b/graphics/pokemon/swampert/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +28 36 40 +127 55 55 +48 64 72 +48 72 112 +67 78 90 +160 72 16 +167 71 71 +247 114 64 +240 128 16 +87 119 156 +74 156 210 +105 177 241 +0 0 0 +160 160 192 +200 200 224 diff --git a/graphics/pokemon/swampert/mega/overworld_shiny.pal b/graphics/pokemon/swampert/mega/overworld_shiny.pal new file mode 100644 index 000000000..fda8f013c --- /dev/null +++ b/graphics/pokemon/swampert/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +136 245 178 +28 36 40 +127 55 55 +48 64 72 +127 55 129 +67 78 90 +160 72 16 +167 71 71 +247 114 64 +240 128 16 +103 117 133 +198 86 229 +234 121 249 +0 0 0 +160 160 192 +200 200 224 diff --git a/graphics/pokemon/tapu_bulu/icon.png b/graphics/pokemon/tapu_bulu/icon.png index 69261acb3..9d329d825 100644 Binary files a/graphics/pokemon/tapu_bulu/icon.png and b/graphics/pokemon/tapu_bulu/icon.png differ diff --git a/graphics/pokemon/tapu_fini/icon.png b/graphics/pokemon/tapu_fini/icon.png index fcd74bbd1..623e1d428 100644 Binary files a/graphics/pokemon/tapu_fini/icon.png and b/graphics/pokemon/tapu_fini/icon.png differ diff --git a/graphics/pokemon/tapu_koko/icon.png b/graphics/pokemon/tapu_koko/icon.png index 73470d55a..2c857e5aa 100644 Binary files a/graphics/pokemon/tapu_koko/icon.png and b/graphics/pokemon/tapu_koko/icon.png differ diff --git a/graphics/pokemon/tapu_lele/icon.png b/graphics/pokemon/tapu_lele/icon.png index e92e3fd3f..960eee6e1 100644 Binary files a/graphics/pokemon/tapu_lele/icon.png and b/graphics/pokemon/tapu_lele/icon.png differ diff --git a/graphics/pokemon/tepig/overworld.png b/graphics/pokemon/tepig/overworld.png index b600bd7e7..c78cfebc5 100644 Binary files a/graphics/pokemon/tepig/overworld.png and b/graphics/pokemon/tepig/overworld.png differ diff --git a/graphics/pokemon/togedemaru/icon.png b/graphics/pokemon/togedemaru/icon.png index 2ccf7d60d..8aab88788 100644 Binary files a/graphics/pokemon/togedemaru/icon.png and b/graphics/pokemon/togedemaru/icon.png differ diff --git a/graphics/pokemon/torracat/icon.png b/graphics/pokemon/torracat/icon.png index b266274f5..0b5f7a12e 100644 Binary files a/graphics/pokemon/torracat/icon.png and b/graphics/pokemon/torracat/icon.png differ diff --git a/graphics/pokemon/toucannon/icon.png b/graphics/pokemon/toucannon/icon.png index 349c72376..ba9740d29 100644 Binary files a/graphics/pokemon/toucannon/icon.png and b/graphics/pokemon/toucannon/icon.png differ diff --git a/graphics/pokemon/toxapex/icon.png b/graphics/pokemon/toxapex/icon.png index 5de471d4f..eed4abe4f 100644 Binary files a/graphics/pokemon/toxapex/icon.png and b/graphics/pokemon/toxapex/icon.png differ diff --git a/graphics/pokemon/trumbeak/icon.png b/graphics/pokemon/trumbeak/icon.png index 7f13c97ae..708e68f86 100644 Binary files a/graphics/pokemon/trumbeak/icon.png and b/graphics/pokemon/trumbeak/icon.png differ diff --git a/graphics/pokemon/tsareena/icon.png b/graphics/pokemon/tsareena/icon.png index f44119562..b436e30a2 100644 Binary files a/graphics/pokemon/tsareena/icon.png and b/graphics/pokemon/tsareena/icon.png differ diff --git a/graphics/pokemon/turtonator/icon.png b/graphics/pokemon/turtonator/icon.png index 4e1b8dbfa..2ee4c8952 100644 Binary files a/graphics/pokemon/turtonator/icon.png and b/graphics/pokemon/turtonator/icon.png differ diff --git a/graphics/pokemon/tympole/overworld.png b/graphics/pokemon/tympole/overworld.png index 9f9778553..320809dc2 100644 Binary files a/graphics/pokemon/tympole/overworld.png and b/graphics/pokemon/tympole/overworld.png differ diff --git a/graphics/pokemon/type_null/icon.png b/graphics/pokemon/type_null/icon.png index e00748e13..ac03c60d4 100644 Binary files a/graphics/pokemon/type_null/icon.png and b/graphics/pokemon/type_null/icon.png differ diff --git a/graphics/pokemon/tyranitar/mega/overworld.png b/graphics/pokemon/tyranitar/mega/overworld.png new file mode 100644 index 000000000..9452e416b Binary files /dev/null and b/graphics/pokemon/tyranitar/mega/overworld.png differ diff --git a/graphics/pokemon/tyranitar/mega/overworld_normal.pal b/graphics/pokemon/tyranitar/mega/overworld_normal.pal new file mode 100644 index 000000000..2c15c90a7 --- /dev/null +++ b/graphics/pokemon/tyranitar/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +32 40 40 +120 32 32 +40 72 48 +88 120 80 +184 48 48 +112 160 88 +136 184 104 +176 216 120 +120 136 144 +160 184 200 +0 0 0 +232 232 248 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/tyranitar/mega/overworld_shiny.pal b/graphics/pokemon/tyranitar/mega/overworld_shiny.pal new file mode 100644 index 000000000..c4a90c104 --- /dev/null +++ b/graphics/pokemon/tyranitar/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +34 42 42 +84 28 131 +74 65 43 +124 119 85 +143 93 186 +169 151 98 +191 164 113 +222 198 130 +126 143 152 +169 194 210 +0 0 0 +239 239 250 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/venusaur/mega/overworld.png b/graphics/pokemon/venusaur/mega/overworld.png new file mode 100644 index 000000000..45ddccb40 Binary files /dev/null and b/graphics/pokemon/venusaur/mega/overworld.png differ diff --git a/graphics/pokemon/venusaur/mega/overworld_normal.pal b/graphics/pokemon/venusaur/mega/overworld_normal.pal new file mode 100644 index 000000000..5092c7a73 --- /dev/null +++ b/graphics/pokemon/venusaur/mega/overworld_normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +35 59 35 +104 32 40 +64 96 48 +144 64 32 +96 168 16 +64 152 96 +192 128 40 +136 224 32 +248 224 8 +232 192 112 +200 72 128 +240 120 160 +104 216 192 +0 0 0 +232 232 248 diff --git a/graphics/pokemon/venusaur/mega/overworld_shiny.pal b/graphics/pokemon/venusaur/mega/overworld_shiny.pal new file mode 100644 index 000000000..938d06157 --- /dev/null +++ b/graphics/pokemon/venusaur/mega/overworld_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +179 226 255 +35 59 35 +104 77 32 +50 96 49 +144 64 32 +96 168 16 +135 152 64 +192 128 40 +136 224 32 +248 224 8 +232 192 112 +182 160 42 +240 219 120 +147 216 104 +0 0 0 +232 232 248 diff --git a/graphics/pokemon/vikavolt/icon.png b/graphics/pokemon/vikavolt/icon.png index 7a8f2cff4..eff23d50a 100644 Binary files a/graphics/pokemon/vikavolt/icon.png and b/graphics/pokemon/vikavolt/icon.png differ diff --git a/graphics/pokemon/vivillon/archipelago/icon.png b/graphics/pokemon/vivillon/archipelago/icon.png index 5dfb32bb6..82d275758 100644 Binary files a/graphics/pokemon/vivillon/archipelago/icon.png and b/graphics/pokemon/vivillon/archipelago/icon.png differ diff --git a/graphics/pokemon/vivillon/continental/icon.png b/graphics/pokemon/vivillon/continental/icon.png index 482c27feb..725b181c8 100644 Binary files a/graphics/pokemon/vivillon/continental/icon.png and b/graphics/pokemon/vivillon/continental/icon.png differ diff --git a/graphics/pokemon/vivillon/elegant/icon.png b/graphics/pokemon/vivillon/elegant/icon.png index fc23f4335..bf2c9a50b 100644 Binary files a/graphics/pokemon/vivillon/elegant/icon.png and b/graphics/pokemon/vivillon/elegant/icon.png differ diff --git a/graphics/pokemon/vivillon/fancy/icon.png b/graphics/pokemon/vivillon/fancy/icon.png index 2e75d4c34..1fa55125e 100644 Binary files a/graphics/pokemon/vivillon/fancy/icon.png and b/graphics/pokemon/vivillon/fancy/icon.png differ diff --git a/graphics/pokemon/vivillon/garden/icon.png b/graphics/pokemon/vivillon/garden/icon.png index bcf56d0ef..e487901f9 100644 Binary files a/graphics/pokemon/vivillon/garden/icon.png and b/graphics/pokemon/vivillon/garden/icon.png differ diff --git a/graphics/pokemon/vivillon/high_plains/icon.png b/graphics/pokemon/vivillon/high_plains/icon.png index 6e2313e90..d68ff6df4 100644 Binary files a/graphics/pokemon/vivillon/high_plains/icon.png and b/graphics/pokemon/vivillon/high_plains/icon.png differ diff --git a/graphics/pokemon/vivillon/icon.png b/graphics/pokemon/vivillon/icon.png index b9d27d02e..1c5015e07 100644 Binary files a/graphics/pokemon/vivillon/icon.png and b/graphics/pokemon/vivillon/icon.png differ diff --git a/graphics/pokemon/vivillon/jungle/icon.png b/graphics/pokemon/vivillon/jungle/icon.png index e759b4f78..9b2923d54 100644 Binary files a/graphics/pokemon/vivillon/jungle/icon.png and b/graphics/pokemon/vivillon/jungle/icon.png differ diff --git a/graphics/pokemon/vivillon/marine/icon.png b/graphics/pokemon/vivillon/marine/icon.png index 69b2eab4d..b3673e557 100644 Binary files a/graphics/pokemon/vivillon/marine/icon.png and b/graphics/pokemon/vivillon/marine/icon.png differ diff --git a/graphics/pokemon/vivillon/modern/icon.png b/graphics/pokemon/vivillon/modern/icon.png index dedc1aa19..a28216c15 100644 Binary files a/graphics/pokemon/vivillon/modern/icon.png and b/graphics/pokemon/vivillon/modern/icon.png differ diff --git a/graphics/pokemon/vivillon/monsoon/icon.png b/graphics/pokemon/vivillon/monsoon/icon.png index 22fcc286d..277798f86 100644 Binary files a/graphics/pokemon/vivillon/monsoon/icon.png and b/graphics/pokemon/vivillon/monsoon/icon.png differ diff --git a/graphics/pokemon/vivillon/ocean/icon.png b/graphics/pokemon/vivillon/ocean/icon.png index 47609a6b5..764a8cdce 100644 Binary files a/graphics/pokemon/vivillon/ocean/icon.png and b/graphics/pokemon/vivillon/ocean/icon.png differ diff --git a/graphics/pokemon/vivillon/poke_ball/icon.png b/graphics/pokemon/vivillon/poke_ball/icon.png index 1ca199b96..7be708eb9 100644 Binary files a/graphics/pokemon/vivillon/poke_ball/icon.png and b/graphics/pokemon/vivillon/poke_ball/icon.png differ diff --git a/graphics/pokemon/vivillon/polar/icon.png b/graphics/pokemon/vivillon/polar/icon.png index e52390387..5fc161cca 100644 Binary files a/graphics/pokemon/vivillon/polar/icon.png and b/graphics/pokemon/vivillon/polar/icon.png differ diff --git a/graphics/pokemon/vivillon/river/icon.png b/graphics/pokemon/vivillon/river/icon.png index 5cb09d29b..475ae4e9d 100644 Binary files a/graphics/pokemon/vivillon/river/icon.png and b/graphics/pokemon/vivillon/river/icon.png differ diff --git a/graphics/pokemon/vivillon/sandstorm/icon.png b/graphics/pokemon/vivillon/sandstorm/icon.png index 40822af86..b428bf6e9 100644 Binary files a/graphics/pokemon/vivillon/sandstorm/icon.png and b/graphics/pokemon/vivillon/sandstorm/icon.png differ diff --git a/graphics/pokemon/vivillon/savanna/icon.png b/graphics/pokemon/vivillon/savanna/icon.png index cc12705dd..7c58f606e 100644 Binary files a/graphics/pokemon/vivillon/savanna/icon.png and b/graphics/pokemon/vivillon/savanna/icon.png differ diff --git a/graphics/pokemon/vivillon/sun/icon.png b/graphics/pokemon/vivillon/sun/icon.png index 95d3c84e5..e14a22faa 100644 Binary files a/graphics/pokemon/vivillon/sun/icon.png and b/graphics/pokemon/vivillon/sun/icon.png differ diff --git a/graphics/pokemon/vivillon/tundra/icon.png b/graphics/pokemon/vivillon/tundra/icon.png index fa937ff7c..6347455e8 100644 Binary files a/graphics/pokemon/vivillon/tundra/icon.png and b/graphics/pokemon/vivillon/tundra/icon.png differ diff --git a/graphics/pokemon/vulpix/alola/icon.png b/graphics/pokemon/vulpix/alola/icon.png index f49562751..ccf5bbfcc 100644 Binary files a/graphics/pokemon/vulpix/alola/icon.png and b/graphics/pokemon/vulpix/alola/icon.png differ diff --git a/graphics/pokemon/watchog/overworld.png b/graphics/pokemon/watchog/overworld.png index f2e9ff473..e9184c737 100644 Binary files a/graphics/pokemon/watchog/overworld.png and b/graphics/pokemon/watchog/overworld.png differ diff --git a/graphics/pokemon/watchog/overworld_normal.pal b/graphics/pokemon/watchog/overworld_normal.pal index 3e75b9e98..0bc0feda6 100644 --- a/graphics/pokemon/watchog/overworld_normal.pal +++ b/graphics/pokemon/watchog/overworld_normal.pal @@ -2,8 +2,8 @@ JASC-PAL 0100 16 152 208 160 -90 41 57 -115 49 65 +88 40 56 +112 48 64 0 0 0 148 57 57 47 46 47 @@ -11,7 +11,7 @@ JASC-PAL 218 85 79 230 222 210 212 157 60 -16 16 16 +208 184 144 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/watchog/overworld_shiny.pal b/graphics/pokemon/watchog/overworld_shiny.pal index 0a5ae605c..dba33393d 100644 --- a/graphics/pokemon/watchog/overworld_shiny.pal +++ b/graphics/pokemon/watchog/overworld_shiny.pal @@ -3,15 +3,15 @@ JASC-PAL 16 152 208 160 90 41 57 -112 48 86 +112 40 88 0 0 0 -144 56 96 +160 56 104 47 46 47 -152 152 152 -212 118 77 +125 125 125 +240 72 72 193 223 190 -91 169 85 -16 16 16 +120 232 144 +216 192 128 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/whimsicott/overworld.png b/graphics/pokemon/whimsicott/overworld.png index 62057ff6f..ed1c4db2c 100644 Binary files a/graphics/pokemon/whimsicott/overworld.png and b/graphics/pokemon/whimsicott/overworld.png differ diff --git a/graphics/pokemon/whimsicott/overworld_normal.pal b/graphics/pokemon/whimsicott/overworld_normal.pal index c9e2ef3b0..8e9638c30 100644 --- a/graphics/pokemon/whimsicott/overworld_normal.pal +++ b/graphics/pokemon/whimsicott/overworld_normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 168 151 83 -106 84 64 +148 106 65 226 218 202 -41 66 22 -194 178 137 +82 57 41 194 178 137 +106 90 65 12 12 12 41 66 22 66 119 65 237 237 247 -106 84 64 -226 218 202 -0 0 0 -0 0 0 -0 0 0 +70 47 35 +201 189 165 +115 82 65 +230 131 0 +194 114 2 diff --git a/graphics/pokemon/whimsicott/overworld_shiny.pal b/graphics/pokemon/whimsicott/overworld_shiny.pal index 1e09d1a78..ad2e0b454 100644 --- a/graphics/pokemon/whimsicott/overworld_shiny.pal +++ b/graphics/pokemon/whimsicott/overworld_shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -110 94 94 -105 89 68 +152 152 128 +112 96 88 248 240 232 56 50 50 192 192 184 -194 178 137 +120 104 104 9 9 9 -35 86 194 -107 154 170 +40 97 130 +63 151 209 237 237 247 -82 57 41 +56 45 39 230 222 205 -0 0 0 -0 0 0 -0 0 0 +80 64 64 +232 168 0 +176 104 16 diff --git a/graphics/pokemon/wimpod/icon.png b/graphics/pokemon/wimpod/icon.png index 77a804889..732b7b9ac 100644 Binary files a/graphics/pokemon/wimpod/icon.png and b/graphics/pokemon/wimpod/icon.png differ diff --git a/graphics/pokemon/wishiwashi/icon.png b/graphics/pokemon/wishiwashi/icon.png index 0b9df6baf..2e2778650 100644 Binary files a/graphics/pokemon/wishiwashi/icon.png and b/graphics/pokemon/wishiwashi/icon.png differ diff --git a/graphics/pokemon/wishiwashi/school/icon.png b/graphics/pokemon/wishiwashi/school/icon.png index 2cf411fd1..a756cc555 100644 Binary files a/graphics/pokemon/wishiwashi/school/icon.png and b/graphics/pokemon/wishiwashi/school/icon.png differ diff --git a/graphics/pokemon/woobat/overworld.png b/graphics/pokemon/woobat/overworld.png index 1d14a5c43..18bff8d5c 100644 Binary files a/graphics/pokemon/woobat/overworld.png and b/graphics/pokemon/woobat/overworld.png differ diff --git a/graphics/pokemon/xerneas/icon.png b/graphics/pokemon/xerneas/icon.png index 6d0b56b3b..8e2a8cc8f 100644 Binary files a/graphics/pokemon/xerneas/icon.png and b/graphics/pokemon/xerneas/icon.png differ diff --git a/graphics/pokemon/xurkitree/icon.png b/graphics/pokemon/xurkitree/icon.png index 26cce62f0..4c044631d 100644 Binary files a/graphics/pokemon/xurkitree/icon.png and b/graphics/pokemon/xurkitree/icon.png differ diff --git a/graphics/pokemon/yungoos/icon.png b/graphics/pokemon/yungoos/icon.png index 657e0b676..3001e64f1 100644 Binary files a/graphics/pokemon/yungoos/icon.png and b/graphics/pokemon/yungoos/icon.png differ diff --git a/graphics/pokemon/zeraora/icon.png b/graphics/pokemon/zeraora/icon.png index b8dadd7ba..7df134703 100644 Binary files a/graphics/pokemon/zeraora/icon.png and b/graphics/pokemon/zeraora/icon.png differ diff --git a/graphics/pokemon/zygarde/10_percent/icon.png b/graphics/pokemon/zygarde/10_percent/icon.png index c1fd25153..ab6354c98 100644 Binary files a/graphics/pokemon/zygarde/10_percent/icon.png and b/graphics/pokemon/zygarde/10_percent/icon.png differ diff --git a/graphics/pokemon/zygarde/complete/icon.png b/graphics/pokemon/zygarde/complete/icon.png index 454af5dca..c7d6c8d01 100644 Binary files a/graphics/pokemon/zygarde/complete/icon.png and b/graphics/pokemon/zygarde/complete/icon.png differ diff --git a/include/config/overworld.h b/include/config/overworld.h index 086c7ac86..bb81f364a 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -55,8 +55,13 @@ #define OW_MON_WANDER_WALK TRUE // If true, OW pokemon with MOVEMENT_TYPE_WANDER will walk-in-place in between steps. // Follower Pokémon #define OW_FOLLOWERS_ENABLED TRUE // Enables follower Pokémon, HGSS style. Requires OW_POKEMON_OBJECT_EVENTS. Note that additional scripting may be required for them to be fully supported! -#define OW_FOLLOWERS_BOBBING TRUE // If true, follower pokemon will bob up and down during their idle & walking animations -#define OW_FOLLOWERS_POKEBALLS TRUE // Followers will emerge from the pokeball they are stored in, instead of a normal pokeball +#define OW_FOLLOWERS_BOBBING TRUE // If TRUE, follower Pokémon will bob up and down during their idle & walking animations +#define OW_FOLLOWERS_POKEBALLS TRUE // If TRUE, follower Pokémon will emerge from the Poké Ball they are stored in, instead of a normal Poké Ball +#define OW_FOLLOWERS_WEATHER_FORMS TRUE // If TRUE, Castform and Cherrim gain FORM_CHANGE_OVERWORLD_WEATHER, which will make them transform in the overworld based on the weather. +#define OW_FOLLOWERS_COPY_WILD_PKMN TRUE // If TRUE, follower Pokémon that know Transform or have Illusion/Imposter will copy wild Pokémon at random. +#define OW_BATTLE_ONLY_FORMS TRUE // If TRUE, loads overworld sprites for battle-only forms like Mega Evos. Requires OW_POKEMON_OBJECT_EVENTS. +#define B_FLAG_FOLLOWERS_DISABLED 0 // Enables / Disables followers by using a flag. Helpful to disable followers for a period of time. + // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8+, if a Pokémon with Synchronize leads the party, wild Pokémon will always have their same Nature as opposed to the 50% chance in previous games. Gift Pokémon excluded. diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 101d4d592..d7b34d2c2 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -182,19 +182,23 @@ #define OBJ_EVENT_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE) #define OBJ_EVENT_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255 -#define OBJ_EVENT_GFX_MON_BASE 0x200 // 512 -#define OBJ_EVENT_GFX_SPECIES_BITS 12 // This will need to be updated when NUM_SPECIES is > ~3.5k -#define OBJ_EVENT_GFX_SPECIES_MASK ((1 << OBJ_EVENT_GFX_SPECIES_BITS) - 1) +#define OBJ_EVENT_MON (1u << 15) +#define OBJ_EVENT_MON_SHINY (1u << 14) +#define OBJ_EVENT_MON_FEMALE (1u << 13) +#define OBJ_EVENT_MON_SPECIES_MASK (~(7u << 13)) // Used to call a specific species' follower graphics. Useful for static encounters. -#define OBJ_EVENT_GFX_SPECIES(name) (SPECIES_##name + OBJ_EVENT_GFX_MON_BASE) -#define OBJ_EVENT_GFX_SPECIES_SHINY(name) (SPECIES_##name + OBJ_EVENT_GFX_MON_BASE + SPECIES_SHINY_TAG) +#define OBJ_EVENT_GFX_SPECIES(name) (SPECIES_##name + OBJ_EVENT_MON) +#define OBJ_EVENT_GFX_SPECIES_SHINY(name) (SPECIES_##name + OBJ_EVENT_MON + OBJ_EVENT_MON_SHINY) +#define OBJ_EVENT_GFX_SPECIES_FEMALE(name) (SPECIES_##name + OBJ_EVENT_MON + OBJ_EVENT_MON_FEMALE) +#define OBJ_EVENT_GFX_SPECIES_SHINY_FEMALE(name) (SPECIES_##name + OBJ_EVENT_MON + OBJ_EVENT_MON_SHINY + OBJ_EVENT_MON_FEMALE) -#define OW_SPECIES(x) (((x)->graphicsId & OBJ_EVENT_GFX_SPECIES_MASK) - OBJ_EVENT_GFX_MON_BASE) -#define OW_FORM(x) ((x)->graphicsId >> OBJ_EVENT_GFX_SPECIES_BITS) +#define OW_SPECIES(x) ((x)->graphicsId & OBJ_EVENT_MON_SPECIES_MASK) +#define OW_SHINY(x) ((x)->graphicsId & OBJ_EVENT_MON_SHINY) +#define OW_FEMALE(x) ((x)->graphicsId & OBJ_EVENT_MON_FEMALE) // Whether Object Event is an OW pokemon -#define IS_OW_MON_OBJ(obj) ((obj)->graphicsId >= OBJ_EVENT_GFX_MON_BASE) +#define IS_OW_MON_OBJ(obj) ((obj)->graphicsId & OBJ_EVENT_MON) #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 diff --git a/include/decompress.h b/include/decompress.h index 898db9185..5c9849121 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -13,12 +13,12 @@ void LZDecompressVram(const void *src, void *dest); u32 IsLZ77Data(const void *ptr, u32 minSize, u32 maxSize); u16 LoadCompressedSpriteSheet(const struct CompressedSpriteSheet *src); -u16 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s32 offset); +u32 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s32 offset); void LoadCompressedSpriteSheetOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer); bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src); -void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src); -void LoadCompressedSpritePaletteWithTag(const u32 *pal, u16 tag); +u32 LoadCompressedSpritePalette(const struct CompressedSpritePalette *src); +u32 LoadCompressedSpritePaletteWithTag(const u32 *pal, u16 tag); void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer); bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src); bool8 LoadCompressedSpritePaletteUsingHeapWithTag(const u32 *pal, u16 tag); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index d637c2d12..88415683a 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -142,7 +142,6 @@ void RemoveFollowingPokemon(void); struct ObjectEvent *GetFollowerObject(void); u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 elevation, u8 direction); u8 CreateObjectGraphicsSprite(u16 graphicsId, SpriteCallback callback, s16 x, s16 y, u8 subpriority); -u8 CreateObjectGraphicsFollowerSpriteForVisualizer(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority, struct FollowerSpriteVisualizerData *data); u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup); u32 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 elevation); u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); @@ -252,6 +251,7 @@ u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); u8 GetMoveDirectionAnimNum(u8 direction); u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); void FieldEffectFreeTilesIfUnused(u16 tileStart); +u16 GetOverworldWeatherSpecies(u16 species); // Exported data declarations extern const struct OamData gObjectEventBaseOam_32x32; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index d25dbb970..709586374 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -114,13 +114,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz"); const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz"); const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/venusaur/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_VenusaurMega[] = INCBIN_COMP("graphics/pokemon/venusaur/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_VenusaurMega[] = INCBIN_COMP("graphics/pokemon/venusaur/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -227,26 +227,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CharizardMegaX[] = INCBIN_COMP("graphics/pokemon/charizard/mega_x/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_CharizardMegaX[] = INCBIN_COMP("graphics/pokemon/charizard/mega_x/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/front.4bpp.lz"); const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/normal.gbapal.lz"); const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/back.4bpp.lz"); const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/shiny.gbapal.lz"); const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/charizard/mega_y/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CharizardMegaY[] = INCBIN_COMP("graphics/pokemon/charizard/mega_y/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_CharizardMegaY[] = INCBIN_COMP("graphics/pokemon/charizard/mega_y/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -353,13 +353,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/shiny.gbapal.lz"); const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/blastoise/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_BlastoiseMega[] = INCBIN_COMP("graphics/pokemon/blastoise/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_BlastoiseMega[] = INCBIN_COMP("graphics/pokemon/blastoise/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -568,13 +568,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/shiny.gbapal.lz"); const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/beedrill/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_BeedrillMega[] = INCBIN_COMP("graphics/pokemon/beedrill/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_BeedrillMega[] = INCBIN_COMP("graphics/pokemon/beedrill/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_WEEDLE @@ -666,13 +666,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/back.4bpp.lz"); const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/shiny.gbapal.lz"); const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/pidgeot/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_PidgeotMega[] = INCBIN_COMP("graphics/pokemon/pidgeot/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_PidgeotMega[] = INCBIN_COMP("graphics/pokemon/pidgeot/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PIDGEY @@ -2642,13 +2642,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/shiny.gbapal.lz"); const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/alakazam/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AlakazamMega[] = INCBIN_COMP("graphics/pokemon/alakazam/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AlakazamMega[] = INCBIN_COMP("graphics/pokemon/alakazam/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABRA @@ -3191,13 +3191,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/shiny.gbapal.lz"); const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/slowbro/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SlowbroMega[] = INCBIN_COMP("graphics/pokemon/slowbro/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SlowbroMega[] = INCBIN_COMP("graphics/pokemon/slowbro/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS @@ -3734,13 +3734,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/shiny.gbapal.lz"); const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/gengar/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GengarMega[] = INCBIN_COMP("graphics/pokemon/gengar/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GengarMega[] = INCBIN_COMP("graphics/pokemon/gengar/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -3829,13 +3829,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/shiny.gbapal.lz"); const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/steelix/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SteelixMega[] = INCBIN_COMP("graphics/pokemon/steelix/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SteelixMega[] = INCBIN_COMP("graphics/pokemon/steelix/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ONIX @@ -4695,13 +4695,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/back.4bpp.lz"); const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/shiny.gbapal.lz"); const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/kangaskhan/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_KangaskhanMega[] = INCBIN_COMP("graphics/pokemon/kangaskhan/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_KangaskhanMega[] = INCBIN_COMP("graphics/pokemon/kangaskhan/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN @@ -5072,13 +5072,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/back.4bpp.lz"); const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/shiny.gbapal.lz"); const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/scizor/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_ScizorMega[] = INCBIN_COMP("graphics/pokemon/scizor/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_ScizorMega[] = INCBIN_COMP("graphics/pokemon/scizor/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS @@ -5345,13 +5345,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/back.4bpp.lz"); const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/shiny.gbapal.lz"); const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/pinsir/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_PinsirMega[] = INCBIN_COMP("graphics/pokemon/pinsir/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_PinsirMega[] = INCBIN_COMP("graphics/pokemon/pinsir/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PINSIR @@ -5495,13 +5495,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/shiny.gbapal.lz"); const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/gyarados/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GyaradosMega[] = INCBIN_COMP("graphics/pokemon/gyarados/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GyaradosMega[] = INCBIN_COMP("graphics/pokemon/gyarados/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAGIKARP @@ -6046,13 +6046,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/shiny.gbapal.lz"); const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/aerodactyl/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AerodactylMega[] = INCBIN_COMP("graphics/pokemon/aerodactyl/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AerodactylMega[] = INCBIN_COMP("graphics/pokemon/aerodactyl/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AERODACTYL @@ -6367,26 +6367,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/back.4bpp.lz"); const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/shiny.gbapal.lz"); const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_x/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MewtwoMegaX[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_x/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_MewtwoMegaX[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_x/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/front.4bpp.lz"); const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/normal.gbapal.lz"); const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/back.4bpp.lz"); const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/shiny.gbapal.lz"); const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_y/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MewtwoMegaY[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_y/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_MewtwoMegaY[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_y/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO @@ -7212,13 +7212,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/shiny.gbapal.lz"); const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/ampharos/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AmpharosMega[] = INCBIN_COMP("graphics/pokemon/ampharos/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AmpharosMega[] = INCBIN_COMP("graphics/pokemon/ampharos/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAREEP @@ -7696,7 +7696,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/front.4bpp.lz"); + const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/anim_front.4bpp.lz"); const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/normal.gbapal.lz"); const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/back.4bpp.lz"); const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/shiny.gbapal.lz"); @@ -8447,13 +8447,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/back.4bpp.lz"); const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/shiny.gbapal.lz"); const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/heracross/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_HeracrossMega[] = INCBIN_COMP("graphics/pokemon/heracross/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_HeracrossMega[] = INCBIN_COMP("graphics/pokemon/heracross/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HERACROSS @@ -9097,13 +9097,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/back.4bpp.lz"); const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/shiny.gbapal.lz"); const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/houndoom/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_HoundoomMega[] = INCBIN_COMP("graphics/pokemon/houndoom/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_HoundoomMega[] = INCBIN_COMP("graphics/pokemon/houndoom/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HOUNDOUR @@ -9451,13 +9451,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/back.4bpp.lz"); const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/shiny.gbapal.lz"); const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/tyranitar/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_TyranitarMega[] = INCBIN_COMP("graphics/pokemon/tyranitar/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_TyranitarMega[] = INCBIN_COMP("graphics/pokemon/tyranitar/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LARVITAR @@ -9636,13 +9636,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/shiny.gbapal.lz"); const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/sceptile/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SceptileMega[] = INCBIN_COMP("graphics/pokemon/sceptile/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SceptileMega[] = INCBIN_COMP("graphics/pokemon/sceptile/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TREECKO @@ -9757,13 +9757,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/shiny.gbapal.lz"); const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/blaziken/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_BlazikenMega[] = INCBIN_COMP("graphics/pokemon/blaziken/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_BlazikenMega[] = INCBIN_COMP("graphics/pokemon/blaziken/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TORCHIC @@ -9855,13 +9855,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/shiny.gbapal.lz"); const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/swampert/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SwampertMega[] = INCBIN_COMP("graphics/pokemon/swampert/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SwampertMega[] = INCBIN_COMP("graphics/pokemon/swampert/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MUDKIP @@ -10568,13 +10568,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/shiny.gbapal.lz"); const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/gardevoir/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GardevoirMega[] = INCBIN_COMP("graphics/pokemon/gardevoir/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GardevoirMega[] = INCBIN_COMP("graphics/pokemon/gardevoir/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS @@ -10600,13 +10600,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/shiny.gbapal.lz"); const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gallade/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GalladeMega[] = INCBIN_COMP("graphics/pokemon/gallade/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GalladeMega[] = INCBIN_COMP("graphics/pokemon/gallade/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RALTS @@ -11169,13 +11169,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/shiny.gbapal.lz"); const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/sableye/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SableyeMega[] = INCBIN_COMP("graphics/pokemon/sableye/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SableyeMega[] = INCBIN_COMP("graphics/pokemon/sableye/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SABLEYE @@ -11217,13 +11217,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/back.4bpp.lz"); const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/shiny.gbapal.lz"); const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/mawile/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MawileMega[] = INCBIN_COMP("graphics/pokemon/mawile/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_MawileMega[] = INCBIN_COMP("graphics/pokemon/mawile/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAWILE @@ -11315,13 +11315,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/shiny.gbapal.lz"); const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/aggron/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AggronMega[] = INCBIN_COMP("graphics/pokemon/aggron/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AggronMega[] = INCBIN_COMP("graphics/pokemon/aggron/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ARON @@ -11402,13 +11402,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/back.4bpp.lz"); const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/shiny.gbapal.lz"); const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/medicham/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MedichamMega[] = INCBIN_COMP("graphics/pokemon/medicham/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_MedichamMega[] = INCBIN_COMP("graphics/pokemon/medicham/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEDITITE @@ -11473,13 +11473,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/back.4bpp.lz"); const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/shiny.gbapal.lz"); const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/manectric/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_ManectricMega[] = INCBIN_COMP("graphics/pokemon/manectric/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_ManectricMega[] = INCBIN_COMP("graphics/pokemon/manectric/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ELECTRIKE @@ -11811,13 +11811,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/shiny.gbapal.lz"); const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/sharpedo/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SharpedoMega[] = INCBIN_COMP("graphics/pokemon/sharpedo/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SharpedoMega[] = INCBIN_COMP("graphics/pokemon/sharpedo/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_CARVANHA @@ -11954,13 +11954,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/back.4bpp.lz"); const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/shiny.gbapal.lz"); const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/camerupt/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CameruptMega[] = INCBIN_COMP("graphics/pokemon/camerupt/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_CameruptMega[] = INCBIN_COMP("graphics/pokemon/camerupt/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_NUMEL @@ -12274,13 +12274,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/shiny.gbapal.lz"); const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/altaria/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AltariaMega[] = INCBIN_COMP("graphics/pokemon/altaria/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AltariaMega[] = INCBIN_COMP("graphics/pokemon/altaria/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SWABLU @@ -12880,13 +12880,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/shiny.gbapal.lz"); const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/banette/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_BanetteMega[] = INCBIN_COMP("graphics/pokemon/banette/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_BanetteMega[] = INCBIN_COMP("graphics/pokemon/banette/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SHUPPET @@ -13074,13 +13074,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/shiny.gbapal.lz"); const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/absol/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AbsolMega[] = INCBIN_COMP("graphics/pokemon/absol/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AbsolMega[] = INCBIN_COMP("graphics/pokemon/absol/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABSOL @@ -13145,13 +13145,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/shiny.gbapal.lz"); const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/glalie/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GlalieMega[] = INCBIN_COMP("graphics/pokemon/glalie/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GlalieMega[] = INCBIN_COMP("graphics/pokemon/glalie/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS @@ -13493,13 +13493,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/shiny.gbapal.lz"); const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/salamence/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SalamenceMega[] = INCBIN_COMP("graphics/pokemon/salamence/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_SalamenceMega[] = INCBIN_COMP("graphics/pokemon/salamence/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BAGON @@ -13591,13 +13591,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/back.4bpp.lz"); const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/shiny.gbapal.lz"); const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/metagross/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MetagrossMega[] = INCBIN_COMP("graphics/pokemon/metagross/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_MetagrossMega[] = INCBIN_COMP("graphics/pokemon/metagross/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BELDUM @@ -13722,13 +13722,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/shiny.gbapal.lz"); const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/latias/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_LatiasMega[] = INCBIN_COMP("graphics/pokemon/latias/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_LatiasMega[] = INCBIN_COMP("graphics/pokemon/latias/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIAS @@ -13766,13 +13766,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/shiny.gbapal.lz"); const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/latios/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_LatiosMega[] = INCBIN_COMP("graphics/pokemon/latios/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_LatiosMega[] = INCBIN_COMP("graphics/pokemon/latios/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIOS @@ -13810,13 +13810,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/back.4bpp.lz"); const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/shiny.gbapal.lz"); const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/kyogre/primal/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_KyogrePrimal[] = INCBIN_COMP("graphics/pokemon/kyogre/primal/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_KyogrePrimal[] = INCBIN_COMP("graphics/pokemon/kyogre/primal/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_KYOGRE @@ -13854,13 +13854,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/back.4bpp.lz"); const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/shiny.gbapal.lz"); const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/groudon/primal/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GroudonPrimal[] = INCBIN_COMP("graphics/pokemon/groudon/primal/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GroudonPrimal[] = INCBIN_COMP("graphics/pokemon/groudon/primal/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_GROUDON @@ -13898,13 +13898,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/back.4bpp.lz"); const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/shiny.gbapal.lz"); const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/rayquaza/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_RayquazaMega[] = INCBIN_COMP("graphics/pokemon/rayquaza/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_RayquazaMega[] = INCBIN_COMP("graphics/pokemon/rayquaza/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RAYQUAZA @@ -14831,13 +14831,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/shiny.gbapal.lz"); const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/lopunny/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_LopunnyMega[] = INCBIN_COMP("graphics/pokemon/lopunny/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_LopunnyMega[] = INCBIN_COMP("graphics/pokemon/lopunny/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BUNEARY @@ -15057,13 +15057,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/shiny.gbapal.lz"); const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/garchomp/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GarchompMega[] = INCBIN_COMP("graphics/pokemon/garchomp/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_GarchompMega[] = INCBIN_COMP("graphics/pokemon/garchomp/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_GIBLE @@ -15106,13 +15106,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/shiny.gbapal.lz"); const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/lucario/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_LucarioMega[] = INCBIN_COMP("graphics/pokemon/lucario/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_LucarioMega[] = INCBIN_COMP("graphics/pokemon/lucario/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RIOLU @@ -15381,13 +15381,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/shiny.gbapal.lz"); const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/abomasnow/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AbomasnowMega[] = INCBIN_COMP("graphics/pokemon/abomasnow/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_AbomasnowMega[] = INCBIN_COMP("graphics/pokemon/abomasnow/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SNOVER @@ -16561,12 +16561,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/shiny.gbapal.lz"); const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/audino/mega/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AudinoMega[] = INCBIN_COMP("graphics/pokemon/audino/mega/overworld.4bpp"); + const u32 gObjectEventPic_AudinoMega[] = INCBIN_COMP("graphics/pokemon/audino/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AUDINO @@ -18880,7 +18880,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_LANDORUS #if P_FAMILY_ENAMORUS - const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); + const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/anim_front.4bpp.lz"); const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); @@ -19787,92 +19787,92 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouHeart[] = INCBIN_U8("graphics/pokemon/furfrou/heart_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouHeart[] = INCBIN_U8("graphics/pokemon/furfrou/heart/icon.4bpp"); - const u32 gMonFrontPic_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouStar[] = INCBIN_U8("graphics/pokemon/furfrou/star_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouStar[] = INCBIN_U8("graphics/pokemon/furfrou/star/icon.4bpp"); - const u32 gMonFrontPic_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouDiamond[] = INCBIN_U8("graphics/pokemon/furfrou/diamond_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouDiamond[] = INCBIN_U8("graphics/pokemon/furfrou/diamond/icon.4bpp"); - const u32 gMonFrontPic_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouDebutante[] = INCBIN_U8("graphics/pokemon/furfrou/debutante_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouDebutante[] = INCBIN_U8("graphics/pokemon/furfrou/debutante/icon.4bpp"); - const u32 gMonFrontPic_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouMatron[] = INCBIN_U8("graphics/pokemon/furfrou/matron_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouMatron[] = INCBIN_U8("graphics/pokemon/furfrou/matron/icon.4bpp"); - const u32 gMonFrontPic_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouDandy[] = INCBIN_U8("graphics/pokemon/furfrou/dandy_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouDandy[] = INCBIN_U8("graphics/pokemon/furfrou/dandy/icon.4bpp"); - const u32 gMonFrontPic_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouLaReine[] = INCBIN_U8("graphics/pokemon/furfrou/la_reine_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouLaReine[] = INCBIN_U8("graphics/pokemon/furfrou/la_reine/icon.4bpp"); - const u32 gMonFrontPic_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouKabuki[] = INCBIN_U8("graphics/pokemon/furfrou/kabuki_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouKabuki[] = INCBIN_U8("graphics/pokemon/furfrou/kabuki/icon.4bpp"); - const u32 gMonFrontPic_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouPharaoh[] = INCBIN_U8("graphics/pokemon/furfrou/pharaoh_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouPharaoh[] = INCBIN_U8("graphics/pokemon/furfrou/pharaoh/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_FurfrouNatural[] = INCBIN_COMP("graphics/pokemon/furfrou/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouHeart[] = INCBIN_COMP("graphics/pokemon/furfrou/heart_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouStar[] = INCBIN_COMP("graphics/pokemon/furfrou/star_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouDiamond[] = INCBIN_COMP("graphics/pokemon/furfrou/diamond_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouDebutante[] = INCBIN_COMP("graphics/pokemon/furfrou/debutante_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouMatron[] = INCBIN_COMP("graphics/pokemon/furfrou/matron_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouDandy[] = INCBIN_COMP("graphics/pokemon/furfrou/dandy_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouLaReine[] = INCBIN_COMP("graphics/pokemon/furfrou/la_reine_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouKabuki[] = INCBIN_COMP("graphics/pokemon/furfrou/kabuki_trim/overworld.4bpp"); - const u32 gObjectEventPic_FurfrouPharaoh[] = INCBIN_COMP("graphics/pokemon/furfrou/pharaoh_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouHeart[] = INCBIN_COMP("graphics/pokemon/furfrou/heart/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouStar[] = INCBIN_COMP("graphics/pokemon/furfrou/star/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouDiamond[] = INCBIN_COMP("graphics/pokemon/furfrou/diamond/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouDebutante[] = INCBIN_COMP("graphics/pokemon/furfrou/debutante/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouMatron[] = INCBIN_COMP("graphics/pokemon/furfrou/matron/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouDandy[] = INCBIN_COMP("graphics/pokemon/furfrou/dandy/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouLaReine[] = INCBIN_COMP("graphics/pokemon/furfrou/la_reine/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouKabuki[] = INCBIN_COMP("graphics/pokemon/furfrou/kabuki/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouPharaoh[] = INCBIN_COMP("graphics/pokemon/furfrou/pharaoh/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/overworld_normal.gbapal.lz"); const u32 gShinyOverworldPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FURFROU @@ -20743,13 +20743,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/back.4bpp.lz"); const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/shiny.gbapal.lz"); const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/diancie/mega/icon.4bpp"); -#if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_DiancieMega[] = INCBIN_COMP("graphics/pokemon/diancie/mega/overworld.4bpp"); +#if OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS + const u32 gObjectEventPic_DiancieMega[] = INCBIN_COMP("graphics/pokemon/diancie/mega/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#endif //OW_POKEMON_OBJECT_EVENTS +#endif //OW_POKEMON_OBJECT_EVENTS && OW_BATTLE_ONLY_FORMS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_DIANCIE @@ -22379,10 +22379,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/shiny.gbapal.lz"); const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_NecrozmaUltra[] = INCBIN_COMP("graphics/pokemon/necrozma/ultra/overworld.4bpp"); + const u32 gObjectEventPic_NecrozmaUltra[] = INCBIN_COMP("graphics/pokemon/necrozma/ultra/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ULTRA_BURST_FORMS @@ -24186,7 +24186,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_ARCTOVISH #if P_FAMILY_DURALUDON - const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/front.4bpp.lz"); + const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/anim_front.4bpp.lz"); const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/normal.gbapal.lz"); const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back.4bpp.lz"); const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/shiny.gbapal.lz"); diff --git a/src/decompress.c b/src/decompress.c index ae3959218..1ba67f9fe 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -49,7 +49,7 @@ u16 LoadCompressedSpriteSheet(const struct CompressedSpriteSheet *src) } // This can be used for either compressed or uncompressed sprite sheets -u16 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s32 offset) +u32 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s32 offset) { struct SpriteTemplate myTemplate; struct SpriteFrameImage myImage; @@ -79,24 +79,21 @@ void LoadCompressedSpriteSheetOverrideBuffer(const struct CompressedSpriteSheet LoadSpriteSheet(&dest); } -void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src) +u32 LoadCompressedSpritePalette(const struct CompressedSpritePalette *src) { - struct SpritePalette dest; - - LZ77UnCompWram(src->data, gDecompressionBuffer); - dest.data = (void *) gDecompressionBuffer; - dest.tag = src->tag; - LoadSpritePalette(&dest); + return LoadCompressedSpritePaletteWithTag(src->data, src->tag); } -void LoadCompressedSpritePaletteWithTag(const u32 *pal, u16 tag) +u32 LoadCompressedSpritePaletteWithTag(const u32 *pal, u16 tag) { + u32 index; struct SpritePalette dest; LZ77UnCompWram(pal, gDecompressionBuffer); dest.data = (void *) gDecompressionBuffer; dest.tag = tag; - LoadSpritePalette(&dest); + index = LoadSpritePalette(&dest); + return index; } void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 786753845..66b6799a7 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -19,6 +19,7 @@ #include "follower_helper.h" #include "metatile_behavior.h" #include "overworld.h" +#include "party_menu.h" #include "pokeball.h" #include "quest_log.h" #include "random.h" @@ -104,7 +105,7 @@ static void CameraObject_2(struct Sprite *); static const struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, const struct ObjectEventTemplate *templates, u8 count); static void ObjectEventSetSingleMovement(struct ObjectEvent *, struct Sprite *, u8); u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2); -static void FollowerSetGraphics(struct ObjectEvent *, u16, u8, bool8); +static void FollowerSetGraphics(struct ObjectEvent * objectEvent, u32 species, bool32 shiny, bool32 female); static void ObjectEventSetGraphics(struct ObjectEvent *, const struct ObjectEventGraphicsInfo *); static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *); static bool8 MovementType_Buried_Callback(struct ObjectEvent *, struct Sprite *); @@ -113,9 +114,12 @@ static u8 MovementType_RaiseHandAndJump_Callback(struct ObjectEvent *, struct Sp static u8 MovementType_RaiseHandAndSwim_Callback(struct ObjectEvent *, struct Sprite *); static void QuestLogObjectEventExecHeldMovementAction(struct ObjectEvent *, struct Sprite *); static void VirtualObject_UpdateAnim(struct Sprite *sprite); -static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny); +static u32 LoadDynamicFollowerPalette(u32 species, bool32 shiny, bool32 female); static void CopyObjectGraphicsInfoToSpriteTemplate_WithMovementType(u16 graphicsId, u16 movementType, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); +static u16 GetGraphicsIdForMon(u32 species, bool32 shiny, bool32 female); +static u16 GetUnownSpecies(struct Pokemon *mon); + static void MovementType_None(struct Sprite *); static void MovementType_LookAround(struct Sprite *); static void MovementType_WanderAround(struct Sprite *); @@ -1742,11 +1746,6 @@ static u8 TrySetupObjectEventSprite(const struct ObjectEventTemplate *objectEven return OBJECT_EVENTS_COUNT; objectEvent = &gObjectEvents[objectEventId]; - if (objectEvent->graphicsId >= OBJ_EVENT_GFX_MON_BASE + SPECIES_SHINY_TAG) - { - objectEvent->shiny = TRUE; - objectEvent->graphicsId -= SPECIES_SHINY_TAG; - } graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (spriteTemplate->paletteTag != TAG_NONE && spriteTemplate->paletteTag != OBJ_EVENT_PAL_TAG_DYNAMIC) LoadObjectEventPalette(spriteTemplate->paletteTag); @@ -1757,6 +1756,9 @@ static u8 TrySetupObjectEventSprite(const struct ObjectEventTemplate *objectEven if (OW_GFX_COMPRESS) spriteTemplate->tileTag = LoadSheetGraphicsInfo(graphicsInfo, objectEvent->graphicsId, NULL); + if (objectEvent->graphicsId & OBJ_EVENT_MON && objectEvent->graphicsId & OBJ_EVENT_MON_SHINY) + objectEvent->shiny = TRUE; + spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { @@ -1767,7 +1769,7 @@ static u8 TrySetupObjectEventSprite(const struct ObjectEventTemplate *objectEven sprite = &gSprites[spriteId]; // Use palette from species palette table if (spriteTemplate->paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) - sprite->oam.paletteNum = LoadDynamicFollowerPalette(OW_SPECIES(objectEvent), OW_FORM(objectEvent), objectEvent->shiny); + sprite->oam.paletteNum = LoadDynamicFollowerPalette(OW_SPECIES(objectEvent), OW_SHINY(objectEvent), OW_FEMALE(objectEvent)); if (OW_GFX_COMPRESS && sprite->usingSheet) sprite->sheetSpan = GetSpanPerImage(sprite->oam.shape, sprite->oam.size); GetMapCoordsFromSpritePos(objectEvent->currentCoords.x + cameraX, objectEvent->currentCoords.y + cameraY, &sprite->x, &sprite->y); @@ -1879,13 +1881,20 @@ static void CopyObjectGraphicsInfoToSpriteTemplate_WithMovementType(u16 graphics // Loads information from graphicsId, with shininess separate // also can write palette tag to the template -static u8 LoadDynamicFollowerPaletteFromGraphicsId(u16 graphicsId, bool8 shiny, struct SpriteTemplate *template) +static u32 LoadDynamicFollowerPaletteFromGraphicsId(u16 graphicsId, struct SpriteTemplate *template) { - u16 species = ((graphicsId & OBJ_EVENT_GFX_SPECIES_MASK) - OBJ_EVENT_GFX_MON_BASE); - u8 form = (graphicsId >> OBJ_EVENT_GFX_SPECIES_BITS); - u8 paletteNum = LoadDynamicFollowerPalette(species, form, shiny); + u16 species = graphicsId & OBJ_EVENT_MON_SPECIES_MASK; + bool32 shiny = graphicsId & OBJ_EVENT_MON_SHINY; + bool32 female = graphicsId & OBJ_EVENT_MON_FEMALE; + u8 paletteNum = LoadDynamicFollowerPalette(species, shiny, female); if (template) - template->paletteTag = species; + { + template->paletteTag = species + OBJ_EVENT_MON; + if (shiny) + template->paletteTag += OBJ_EVENT_MON_SHINY; + if (female) + template->paletteTag += OBJ_EVENT_MON_FEMALE; + } return paletteNum; } @@ -1894,62 +1903,17 @@ u8 CreateObjectGraphicsSprite(u16 graphicsId, void (*callback)(struct Sprite *), { struct SpriteTemplate *spriteTemplate; const struct SubspriteTable *subspriteTables; - const struct ObjectEventGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); struct Sprite *sprite; u8 spriteId; - bool32 isShiny = graphicsId >= SPECIES_SHINY_TAG + OBJ_EVENT_GFX_MON_BASE; + bool32 isShiny = graphicsId & OBJ_EVENT_MON_SHINY; + + spriteTemplate = Alloc(sizeof(struct SpriteTemplate)); + CopyObjectGraphicsInfoToSpriteTemplate(graphicsId, callback, spriteTemplate, &subspriteTables); if (isShiny) graphicsId -= SPECIES_SHINY_TAG; - spriteTemplate = Alloc(sizeof(struct SpriteTemplate)); - CopyObjectGraphicsInfoToSpriteTemplate(graphicsId, callback, spriteTemplate, &subspriteTables); - - if (spriteTemplate->paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) - { - u32 paletteNum = LoadDynamicFollowerPaletteFromGraphicsId(graphicsId, isShiny, spriteTemplate); - spriteTemplate->paletteTag = GetSpritePaletteTagByPaletteNum(paletteNum); - } - else if (spriteTemplate->paletteTag != TAG_NONE) - { - LoadObjectEventPalette(spriteTemplate->paletteTag); - } - - if (OW_GFX_COMPRESS) - { - graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); - // Checking only for compressed here so as not to mess with decorations - if (graphicsInfo->compressed) - spriteTemplate->tileTag = LoadSheetGraphicsInfo(graphicsInfo, graphicsId, NULL); - } - spriteId = CreateSprite(spriteTemplate, x, y, subpriority); - - Free(spriteTemplate); - - if (spriteId != MAX_SPRITES && subspriteTables != NULL) - { - sprite = &gSprites[spriteId]; - if (OW_GFX_COMPRESS && graphicsInfo->compressed) - sprite->sheetSpan = GetSpanPerImage(sprite->oam.shape, sprite->oam.size); - SetSubspriteTables(sprite, subspriteTables); - sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY; - } - return spriteId; -} - -// Horrible workaround for sprite the visualizer, this should probably be reworked later -u8 CreateObjectGraphicsFollowerSpriteForVisualizer(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, struct FollowerSpriteVisualizerData *data) -{ - struct SpriteTemplate *spriteTemplate; - const struct SubspriteTable *subspriteTables; - const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); - struct Sprite *sprite; - u8 spriteId; - bool32 isShiny = data->isShiny; - - spriteTemplate = Alloc(sizeof(struct SpriteTemplate)); - CopyObjectGraphicsInfoToSpriteTemplate(graphicsId, callback, spriteTemplate, &subspriteTables); - if (OW_GFX_COMPRESS) { // Checking only for compressed here so as not to mess with decorations @@ -1959,7 +1923,7 @@ u8 CreateObjectGraphicsFollowerSpriteForVisualizer(u16 graphicsId, void (*callba if (spriteTemplate->paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) { - u32 paletteNum = LoadDynamicFollowerPaletteFromGraphicsId(graphicsId, isShiny, spriteTemplate); + u32 paletteNum = LoadDynamicFollowerPaletteFromGraphicsId(graphicsId, spriteTemplate); spriteTemplate->paletteTag = GetSpritePaletteTagByPaletteNum(paletteNum); } else if (spriteTemplate->paletteTag != TAG_NONE) @@ -2058,19 +2022,18 @@ struct ObjectEvent *GetFollowerObject(void) } // Return graphicsInfo for a pokemon species & form -static const struct ObjectEventGraphicsInfo *SpeciesToGraphicsInfo(u16 species, u8 form) +static const struct ObjectEventGraphicsInfo *SpeciesToGraphicsInfo(u32 species, bool32 shiny, bool32 female) { const struct ObjectEventGraphicsInfo *graphicsInfo = NULL; #if OW_POKEMON_OBJECT_EVENTS switch (species) { - case SPECIES_UNOWN: // Letters >A are defined as species >= NUM_SPECIES, so are not contiguous with A - form %= NUM_UNOWN_FORMS; - graphicsInfo = &gSpeciesInfo[form ? SPECIES_UNOWN_B + form - 1 : species].overworldData; + case SPECIES_UNOWN: // Deal with Unown forms later + graphicsInfo = &gSpeciesInfo[species].overworldData; break; default: #if P_GENDER_DIFFERENCES - if (form == 1 && gSpeciesInfo[species].overworldDataFemale.paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) + if (female && gSpeciesInfo[species].overworldDataFemale.paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) { graphicsInfo = &gSpeciesInfo[species].overworldDataFemale; } @@ -2094,17 +2057,20 @@ static const struct ObjectEventGraphicsInfo *SpeciesToGraphicsInfo(u16 species, } // Find, or load, the palette for the specified pokemon info -static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) +static u32 LoadDynamicFollowerPalette(u32 species, bool32 shiny, bool32 female) { u32 paletteNum; - bool32 female = (form == 1); // Use standalone palette, unless entry is OOB or NULL (fallback to front-sprite-based) #if OW_POKEMON_OBJECT_EVENTS == TRUE && OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE if ((shiny && gSpeciesInfo[species].overworldPalette) || (!shiny && gSpeciesInfo[species].overworldShinyPalette)) { struct SpritePalette spritePalette; - u16 palTag = shiny ? (species + SPECIES_SHINY_TAG + OBJ_EVENT_PAL_TAG_DYNAMIC) : (species + OBJ_EVENT_PAL_TAG_DYNAMIC); + u16 palTag = species + OBJ_EVENT_MON + (shiny ? OBJ_EVENT_MON_SHINY : 0); + #if P_GENDER_DIFFERENCES + if (female && gSpeciesInfo[species].overworldShinyPaletteFemale != NULL) + palTag += OBJ_EVENT_MON_FEMALE; + #endif // palette already loaded if ((paletteNum = IndexOfSpritePaletteTag(palTag)) < 16) return paletteNum; @@ -2125,23 +2091,27 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) else spritePalette.data = gSpeciesInfo[species].overworldPalette; } - + // Check if pal data must be decompressed if (IsLZ77Data(spritePalette.data, PLTT_SIZE_4BPP, PLTT_SIZE_4BPP)) { - // IsLZ77Data guarantees word-alignment, so casting this is safe - LZ77UnCompWram((u32*)spritePalette.data, gDecompressionBuffer); - spritePalette.data = (void*)gDecompressionBuffer; + struct CompressedSpritePalette compSpritePalette; + + compSpritePalette.data = (const void *) spritePalette.data; + compSpritePalette.tag = spritePalette.tag; + paletteNum = LoadCompressedSpritePalette(&compSpritePalette); + } + else + { + paletteNum = LoadSpritePalette(&spritePalette); } - paletteNum = LoadSpritePalette(&spritePalette); - ApplyGlobalFieldPaletteTint(paletteNum); } else #endif //OW_POKEMON_OBJECT_EVENTS == TRUE && OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE { // Note that the shiny palette tag is `species + SPECIES_SHINY_TAG`, which must be increased with more pokemon // so that palette tags do not overlap - const u32 *palette = GetMonSpritePalFromSpecies(species, shiny, FALSE); //ETODO + const u32 *palette = GetMonSpritePalFromSpecies(species, shiny, female); //ETODO // palette already loaded if ((paletteNum = IndexOfSpritePaletteTag(species)) < 16) return paletteNum; @@ -2149,7 +2119,6 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) // Load compressed palette LoadCompressedSpritePaletteWithTag(palette, species); paletteNum = IndexOfSpritePaletteTag(species); // Tag is always present - ApplyGlobalFieldPaletteTint(paletteNum); } if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL) // don't want to weather blend in fog @@ -2158,13 +2127,11 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) } // Set graphics & sprite for a follower object event by species & shininess. -static void FollowerSetGraphics(struct ObjectEvent *objEvent, u16 species, u8 form, bool8 shiny) +static void FollowerSetGraphics(struct ObjectEvent *objEvent, u32 species, bool32 shiny, bool32 female) { - const struct ObjectEventGraphicsInfo *graphicsInfo = SpeciesToGraphicsInfo(species, form); + const struct ObjectEventGraphicsInfo *graphicsInfo = SpeciesToGraphicsInfo(species, shiny, female); ObjectEventSetGraphics(objEvent, graphicsInfo); - objEvent->graphicsId = (OBJ_EVENT_GFX_MON_BASE + species) & OBJ_EVENT_GFX_SPECIES_MASK; - objEvent->graphicsId |= form << OBJ_EVENT_GFX_SPECIES_BITS; - objEvent->shiny = shiny; + objEvent->graphicsId = GetGraphicsIdForMon(species, shiny, female); if (graphicsInfo->paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) // Use palette from species palette table { struct Sprite *sprite = &gSprites[objEvent->spriteId]; @@ -2172,7 +2139,7 @@ static void FollowerSetGraphics(struct ObjectEvent *objEvent, u16 species, u8 fo sprite->inUse = FALSE; FieldEffectFreePaletteIfUnused(sprite->oam.paletteNum); sprite->inUse = TRUE; - sprite->oam.paletteNum = LoadDynamicFollowerPalette(species, form, shiny); + sprite->oam.paletteNum = LoadDynamicFollowerPalette(species, shiny, female); } else if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL) // don't want to weather blend in fog { @@ -2185,9 +2152,9 @@ static void FollowerSetGraphics(struct ObjectEvent *objEvent, u16 species, u8 fo static void RefreshFollowerGraphics(struct ObjectEvent *objEvent) { u32 species = OW_SPECIES(objEvent); - u32 form = OW_FORM(objEvent); - u32 shiny = objEvent->shiny; - const struct ObjectEventGraphicsInfo *graphicsInfo = SpeciesToGraphicsInfo(species, form); + bool32 shiny = OW_SHINY(objEvent); + bool32 female = OW_FEMALE(objEvent); + const struct ObjectEventGraphicsInfo *graphicsInfo = SpeciesToGraphicsInfo(species, shiny, female); struct Sprite *sprite = &gSprites[objEvent->spriteId]; u32 i = FindObjectEventPaletteIndexByTag(graphicsInfo->paletteTag); @@ -2216,7 +2183,7 @@ static void RefreshFollowerGraphics(struct ObjectEvent *objEvent) sprite->inUse = FALSE; FieldEffectFreePaletteIfUnused(sprite->oam.paletteNum); sprite->inUse = TRUE; - sprite->oam.paletteNum = LoadDynamicFollowerPalette(species, form, shiny); + sprite->oam.paletteNum = LoadDynamicFollowerPalette(species, shiny, female); } else if (i != 0xFF) { @@ -2226,52 +2193,54 @@ static void RefreshFollowerGraphics(struct ObjectEvent *objEvent) } } -static u16 GetOverworldCastformSpecies(void) +u16 GetOverworldWeatherSpecies(u16 species) { - switch (GetCurrentWeather()) + u32 i; + u32 weather = GetCurrentWeather(); + const struct FormChange *formChanges = GetSpeciesFormChanges(species); + + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { - case WEATHER_SUNNY_CLOUDS: - case WEATHER_DROUGHT: - return SPECIES_CASTFORM_SUNNY; - case WEATHER_RAIN: - case WEATHER_RAIN_THUNDERSTORM: - case WEATHER_DOWNPOUR: - return SPECIES_CASTFORM_RAINY; - case WEATHER_SNOW: - return SPECIES_CASTFORM_SNOWY; + // Unlike other form change checks, we don't do the "species != formChanges[i].targetSpecies" check + if (formChanges[i].method == FORM_CHANGE_OVERWORLD_WEATHER) + { + if (formChanges[i].param1 == weather) + return formChanges[i].targetSpecies; + else if (formChanges[i].param1 == WEATHER_NONE) // Set the default form for weather not defined in form change table + species = formChanges[i].targetSpecies; + } } - return SPECIES_CASTFORM_NORMAL; + return species; } -static bool8 GetMonInfo(struct Pokemon *mon, u16 *species, u8 *form, u8 *shiny) +static bool8 GetMonInfo(struct Pokemon *mon, u32 *species, bool32 *shiny, bool32 *female) { - *form = 0; // default if (!mon) { *species = SPECIES_NONE; - *form = 0; - *shiny = 0; + *shiny = FALSE; + *female = FALSE; return FALSE; } *species = GetMonData(mon, MON_DATA_SPECIES); - *form = GetMonGender(mon) == MON_FEMALE; - *shiny = IsMonShiny(mon); + *shiny = IsMonShiny(mon) ? OBJ_EVENT_MON_SHINY : 0; + *female = GetMonGender(mon) == MON_FEMALE ? OBJ_EVENT_MON_FEMALE : 0; switch (*species) { case SPECIES_UNOWN: - *form = GET_UNOWN_LETTER(mon->box.personality); + *species = GetUnownSpecies(mon); break; - case SPECIES_CASTFORM: // form is based on overworld weather - *species = GetOverworldCastformSpecies(); + default: + *species = GetOverworldWeatherSpecies(*species); break; } return TRUE; } // Retrieve graphic information about the following pokemon, if any -static bool8 GetFollowerInfo(u16 *species, u8 *form, u8 *shiny) +static bool8 GetFollowerInfo(u32 *species, bool32 *shiny, bool32 *female) { - return GetMonInfo(GetFirstLiveMon(), species, form, shiny); + return GetMonInfo(GetFirstLiveMon(), species, shiny, female); } // Update following pokemon if any @@ -2279,18 +2248,19 @@ void UpdateFollowingPokemon(void) { struct ObjectEvent *objEvent = GetFollowerObject(); struct Sprite *sprite; - u16 species; - bool8 shiny; - u8 form; + u32 species; + bool32 shiny; + bool32 female; // Don't spawn follower if: // 1. GetFollowerInfo returns FALSE // 2. Map is indoors and gfx is larger than 32x32 // 3. flag is set if (OW_POKEMON_OBJECT_EVENTS == FALSE || OW_FOLLOWERS_ENABLED == FALSE - || !GetFollowerInfo(&species, &form, &shiny) - || SpeciesToGraphicsInfo(species, form) == NULL - || (gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, form)->oam->size > ST_OAM_SIZE_2) + || FlagGet(B_FLAG_FOLLOWERS_DISABLED) + || !GetFollowerInfo(&species, &shiny, &female) + || SpeciesToGraphicsInfo(species, shiny, female) == NULL + || (gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, shiny, female)->oam->size > ST_OAM_SIZE_2) || FlagGet(FLAG_TEMP_HIDE_FOLLOWER)) { RemoveFollowingPokemon(); @@ -2304,7 +2274,7 @@ void UpdateFollowingPokemon(void) struct ObjectEventTemplate template = { .localId = OBJ_EVENT_ID_FOLLOWER, - .graphicsId = OBJ_EVENT_GFX_MON_BASE + species, + .graphicsId = GetGraphicsIdForMon(species, shiny, female), .flagId = 0, .x = gSaveBlock1Ptr->pos.x, .y = gSaveBlock1Ptr->pos.y, @@ -2312,7 +2282,7 @@ void UpdateFollowingPokemon(void) .elevation = gObjectEvents[objId].active ? gObjectEvents[objId].currentElevation : 3, .movementType = MOVEMENT_TYPE_FOLLOW_PLAYER, // store form info in template - .trainerRange_berryTreeId = (form & 0x1F) | (shiny << 5), + //.trainerRange_berryTreeId = (form & 0x1F) | (shiny << 5), // ???? what? }; if ((objId = SpawnSpecialObjectEvent(&template)) >= OBJECT_EVENTS_COUNT) return; @@ -2321,12 +2291,12 @@ void UpdateFollowingPokemon(void) } sprite = &gSprites[objEvent->spriteId]; // Follower appearance changed; move to player and set invisible - if (species != OW_SPECIES(objEvent) || shiny != objEvent->shiny || form != OW_FORM(objEvent)) + if (species != OW_SPECIES(objEvent) || shiny != OW_SHINY(objEvent) || female != OW_FEMALE(objEvent)) { MoveObjectEventToMapCoords(objEvent, gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x, gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y); - FollowerSetGraphics(objEvent, species, form, shiny); + FollowerSetGraphics(objEvent, species, shiny, female); objEvent->invisible = TRUE; } sprite->data[6] = 0; // set animation data @@ -2795,7 +2765,7 @@ static void SpawnObjectEventOnReturnToField(u8 objectEventId, s16 x, s16 y) if (spriteTemplate.paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) { - u32 paletteNum = LoadDynamicFollowerPalette(OW_SPECIES(objectEvent), OW_FORM(objectEvent), objectEvent->shiny); + u32 paletteNum = LoadDynamicFollowerPalette(OW_SPECIES(objectEvent), OW_SHINY(objectEvent), OW_FEMALE(objectEvent)); spriteTemplate.paletteTag = GetSpritePaletteTagByPaletteNum(paletteNum); } else if (spriteTemplate.paletteTag != TAG_NONE) @@ -3001,19 +2971,12 @@ static void SetBerryTreeGraphics(struct ObjectEvent *objectEvent, struct Sprite const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u16 graphicsId) { - u32 form = 0; if (graphicsId >= OBJ_EVENT_GFX_VARS && graphicsId <= OBJ_EVENT_GFX_VAR_F) graphicsId = VarGetObjectEventGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS); - if (graphicsId > OBJ_EVENT_GFX_SPECIES_MASK) - { - form = graphicsId >> OBJ_EVENT_GFX_SPECIES_BITS; - graphicsId = graphicsId & OBJ_EVENT_GFX_SPECIES_MASK; - } - - if (graphicsId >= OBJ_EVENT_GFX_MON_BASE) - return SpeciesToGraphicsInfo(graphicsId - OBJ_EVENT_GFX_MON_BASE, form); + if (graphicsId & OBJ_EVENT_MON) + return SpeciesToGraphicsInfo(graphicsId & OBJ_EVENT_MON_SPECIES_MASK, graphicsId & OBJ_EVENT_MON_SHINY, graphicsId & OBJ_EVENT_MON_FEMALE); if (graphicsId >= NUM_OBJ_EVENT_GFX) graphicsId = OBJ_EVENT_GFX_LITTLE_BOY; @@ -5521,14 +5484,20 @@ static bool32 EndFollowerTransformEffect(struct ObjectEvent *objectEvent, struct static bool32 TryStartFollowerTransformEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u32 multi; - if (GET_BASE_SPECIES_ID(OW_SPECIES(objectEvent)) == SPECIES_CASTFORM - && OW_SPECIES(objectEvent) != (multi = GetOverworldCastformSpecies())) + struct Pokemon *mon; + u32 ability; + if (DoesSpeciesHaveFormChangeMethod(OW_SPECIES(objectEvent), FORM_CHANGE_OVERWORLD_WEATHER) + && OW_SPECIES(objectEvent) != (multi = GetOverworldWeatherSpecies(OW_SPECIES(objectEvent)))) { sprite->data[7] = TRANSFORM_TYPE_WEATHER << 8; + PlaySE(SE_M_MINIMIZE); return TRUE; } - else if ((Random() & 0xFFFF) < 18 && GetLocalWildMon(FALSE) - && (OW_SPECIES(objectEvent) == SPECIES_MEW || OW_SPECIES(objectEvent) == SPECIES_DITTO)) + + if (OW_FOLLOWERS_COPY_WILD_PKMN + && (MonKnowsMove(mon = GetFirstLiveMon(), MOVE_TRANSFORM) + || (ability = GetMonAbility(mon)) == ABILITY_IMPOSTER || ability == ABILITY_ILLUSION) + && (Random() & 0xFFFF) < 18 && GetLocalWildMon(FALSE)) { sprite->data[7] = TRANSFORM_TYPE_RANDOM_WILD << 8; PlaySE(SE_M_MINIMIZE); @@ -5562,13 +5531,13 @@ static bool8 UpdateFollowerTransformEffect(struct ObjectEvent *objectEvent, stru break; case TRANSFORM_TYPE_WEATHER: multi = objectEvent->graphicsId; - objectEvent->graphicsId = GetOverworldCastformSpecies(); + objectEvent->graphicsId = GetOverworldWeatherSpecies(OW_SPECIES(objectEvent)); if (!objectEvent->graphicsId) { objectEvent->graphicsId = multi; break; } - objectEvent->graphicsId += OBJ_EVENT_GFX_MON_BASE; + objectEvent->graphicsId += OBJ_EVENT_MON; RefreshFollowerGraphics(objectEvent); break; case TRANSFORM_TYPE_RANDOM_WILD: @@ -5579,7 +5548,7 @@ static bool8 UpdateFollowerTransformEffect(struct ObjectEvent *objectEvent, stru objectEvent->graphicsId = multi; break; } - objectEvent->graphicsId += OBJ_EVENT_GFX_MON_BASE; + objectEvent->graphicsId += OBJ_EVENT_MON; RefreshFollowerGraphics(objectEvent); objectEvent->graphicsId = multi; break; @@ -7821,7 +7790,7 @@ static bool8 MovementAction_ExitPokeball_Step1(struct ObjectEvent *objectEvent, // Set graphics, palette, and affine animation else if (sprite->sDuration == animStepFrame) { - FollowerSetGraphics(objectEvent, OW_SPECIES(objectEvent), OW_FORM(objectEvent), objectEvent->shiny); + FollowerSetGraphics(objectEvent, OW_SPECIES(objectEvent), OW_SHINY(objectEvent), OW_FEMALE(objectEvent)); LoadFillColorPalette(RGB_WHITE, OBJ_EVENT_PAL_TAG_WHITE, sprite); // Initialize affine animation sprite->affineAnims = sAffineAnims_PokeballFollower; @@ -7838,7 +7807,7 @@ static bool8 MovementAction_ExitPokeball_Step1(struct ObjectEvent *objectEvent, sprite->affineAnimEnded = TRUE; FreeSpriteOamMatrix(sprite); sprite->oam.affineMode = ST_OAM_AFFINE_OFF; - FollowerSetGraphics(objectEvent, OW_SPECIES(objectEvent), OW_FORM(objectEvent), objectEvent->shiny); + FollowerSetGraphics(objectEvent, OW_SPECIES(objectEvent), OW_SHINY(objectEvent), OW_FEMALE(objectEvent)); } return FALSE; } @@ -7895,7 +7864,7 @@ static bool8 MovementAction_EnterPokeball_Step1(struct ObjectEvent *objectEvent, static bool8 MovementAction_EnterPokeball_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FollowerSetGraphics(objectEvent, OW_SPECIES(objectEvent), OW_FORM(objectEvent), objectEvent->shiny); + FollowerSetGraphics(objectEvent, OW_SPECIES(objectEvent), OW_SHINY(objectEvent), OW_FEMALE(objectEvent)); objectEvent->invisible = TRUE; sprite->sTypeFuncId = 0; sprite->sSpeedFlip = 0; @@ -11324,3 +11293,21 @@ static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite * gFieldEffectArguments[3] = 3; FieldEffectStart(FLDEFF_RIPPLE); } + +static u16 GetGraphicsIdForMon(u32 species, bool32 shiny, bool32 female) +{ + u16 graphicsId = species + OBJ_EVENT_MON; + if (shiny) + graphicsId += OBJ_EVENT_MON_SHINY; + if (female) + graphicsId += OBJ_EVENT_MON_FEMALE; + return graphicsId; +} + +static u16 GetUnownSpecies(struct Pokemon *mon) +{ + u32 form = GET_UNOWN_LETTER(mon->box.personality); + if (form == 0) + return SPECIES_UNOWN; + return SPECIES_UNOWN_B + form - 1; +} diff --git a/src/field_specials.c b/src/field_specials.c index 84b57310e..b2ea3629e 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1642,7 +1642,7 @@ u8 ContextNpcGetTextColor(void) else gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId; - if (gfxId >= OBJ_EVENT_GFX_MON_BASE) + if (gfxId & OBJ_EVENT_MON) return GetFollowerTextColor(); if (gfxId >= OBJ_EVENT_GFX_VAR_0) diff --git a/src/field_weather.c b/src/field_weather.c index 81956eb06..7fa7f0186 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -1,5 +1,6 @@ #include "global.h" #include "gflib.h" +#include "event_object_movement.h" #include "field_camera.h" #include "field_effect.h" #include "field_weather.h" @@ -235,12 +236,28 @@ void SetNextWeather(u8 weather) gWeatherPtr->finishStep = 0; } +static void UpdateWeatherForms(void) +{ + s32 i; + for (i = 0; i < PARTY_SIZE; i++) + { + struct Pokemon *mon = &gPlayerParty[i]; + u16 species = GetMonData(mon, MON_DATA_SPECIES); + u16 targetSpecies = GetOverworldWeatherSpecies(species); + if (species != targetSpecies) + { + SetMonData(mon, MON_DATA_SPECIES, &targetSpecies); + CalculateMonStats(mon); + } + } +} void SetCurrentAndNextWeather(u8 weather) { PlayRainStoppingSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; + UpdateWeatherForms(); } static void UNUSED SetCurrentAndNextWeatherNoDelay(u8 weather) @@ -250,6 +267,7 @@ static void UNUSED SetCurrentAndNextWeatherNoDelay(u8 weather) gWeatherPtr->nextWeather = weather; // Overrides the normal delay during screen fading. gWeatherPtr->readyForInit = TRUE; + UpdateWeatherForms(); } static void Task_WeatherInit(u8 taskId) @@ -277,6 +295,7 @@ static void Task_WeatherMain(u8 taskId) gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; gWeatherPtr->currWeather = gWeatherPtr->nextWeather; gWeatherPtr->weatherChangeComplete = TRUE; + UpdateWeatherForms(); } } else diff --git a/src/load_save.c b/src/load_save.c index a7e1cbf2f..47b24576c 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -215,7 +215,7 @@ void LoadObjectEvents(void) // Try to restore saved inactive follower if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER && !gObjectEvents[i].active && - gObjectEvents[i].graphicsId >= OBJ_EVENT_GFX_MON_BASE) + gObjectEvents[i].graphicsId & OBJ_EVENT_MON) gObjectEvents[i].active = TRUE; } } diff --git a/src/pokemon_sprite_visualizer.c b/src/pokemon_sprite_visualizer.c index 192cbe207..9e10bd4ad 100644 --- a/src/pokemon_sprite_visualizer.c +++ b/src/pokemon_sprite_visualizer.c @@ -1273,7 +1273,7 @@ void CB2_Pokemon_Sprite_Visualizer(void) gSprites[data->iconspriteId].oam.priority = 0; //Follower Sprite - data->followerspriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_MON_BASE + species, SpriteCB_Follower, VISUALIZER_FOLLOWER_X, VISUALIZER_FOLLOWER_Y, 0); + data->followerspriteId = CreateObjectGraphicsSprite(OBJ_EVENT_MON + species, SpriteCB_Follower, VISUALIZER_FOLLOWER_X, VISUALIZER_FOLLOWER_Y, 0); gSprites[data->followerspriteId].oam.priority = 0; gSprites[data->followerspriteId].anims = sAnims_Follower; @@ -1964,18 +1964,16 @@ static void ReloadPokemonSprites(struct PokemonSpriteVisualizer *data) gSprites[data->iconspriteId].oam.priority = 0; //Follower Sprite - u16 graphicsId = (OBJ_EVENT_GFX_MON_BASE + species) & OBJ_EVENT_GFX_SPECIES_MASK; - struct FollowerSpriteVisualizerData followerData; - followerData.currentmonId = graphicsId; - followerData.isFemale = data->isFemale; - followerData.isShiny = data->isShiny; - graphicsId |= data->isFemale << OBJ_EVENT_GFX_SPECIES_BITS; - data->followerspriteId = CreateObjectGraphicsFollowerSpriteForVisualizer(graphicsId, + u16 graphicsId = species + OBJ_EVENT_MON; + if (data->isShiny) + graphicsId += OBJ_EVENT_MON_SHINY; + if (data->isFemale) + graphicsId += OBJ_EVENT_MON_FEMALE; + data->followerspriteId = CreateObjectGraphicsSprite(graphicsId, SpriteCB_Follower, VISUALIZER_FOLLOWER_X, VISUALIZER_FOLLOWER_Y, - 0, - &followerData); + 0); gSprites[data->followerspriteId].oam.priority = 0; gSprites[data->followerspriteId].anims = sAnims_Follower;