diff --git a/graphics/pokemon/annihilape/icon.png b/graphics/pokemon/annihilape/icon.png old mode 100644 new mode 100755 index 21601c5c7c..a516d2d5e9 Binary files a/graphics/pokemon/annihilape/icon.png and b/graphics/pokemon/annihilape/icon.png differ diff --git a/graphics/pokemon/arboliva/icon.png b/graphics/pokemon/arboliva/icon.png new file mode 100755 index 0000000000..039efb5489 Binary files /dev/null and b/graphics/pokemon/arboliva/icon.png differ diff --git a/graphics/pokemon/arctibax/icon.png b/graphics/pokemon/arctibax/icon.png new file mode 100755 index 0000000000..f9fcaecf43 Binary files /dev/null and b/graphics/pokemon/arctibax/icon.png differ diff --git a/graphics/pokemon/armarouge/icon.png b/graphics/pokemon/armarouge/icon.png old mode 100644 new mode 100755 index f16a77b1f2..a1b9e9b90f Binary files a/graphics/pokemon/armarouge/icon.png and b/graphics/pokemon/armarouge/icon.png differ diff --git a/graphics/pokemon/baxcalibur/back.png b/graphics/pokemon/baxcalibur/back.png index 82840f106b..241e048d7a 100755 Binary files a/graphics/pokemon/baxcalibur/back.png and b/graphics/pokemon/baxcalibur/back.png differ diff --git a/graphics/pokemon/baxcalibur/front.png b/graphics/pokemon/baxcalibur/front.png index d0047ffc75..e706fa393c 100755 Binary files a/graphics/pokemon/baxcalibur/front.png and b/graphics/pokemon/baxcalibur/front.png differ diff --git a/graphics/pokemon/baxcalibur/icon.png b/graphics/pokemon/baxcalibur/icon.png new file mode 100755 index 0000000000..1aee317d5c Binary files /dev/null and b/graphics/pokemon/baxcalibur/icon.png differ diff --git a/graphics/pokemon/bellibolt/icon.png b/graphics/pokemon/bellibolt/icon.png new file mode 100755 index 0000000000..865c18ad0e Binary files /dev/null and b/graphics/pokemon/bellibolt/icon.png differ diff --git a/graphics/pokemon/bombirdier/icon.png b/graphics/pokemon/bombirdier/icon.png new file mode 100755 index 0000000000..06bcf71c86 Binary files /dev/null and b/graphics/pokemon/bombirdier/icon.png differ diff --git a/graphics/pokemon/brambleghast/icon.png b/graphics/pokemon/brambleghast/icon.png new file mode 100755 index 0000000000..e8f273b095 Binary files /dev/null and b/graphics/pokemon/brambleghast/icon.png differ diff --git a/graphics/pokemon/bramblin/icon.png b/graphics/pokemon/bramblin/icon.png old mode 100644 new mode 100755 index 80531a6315..ff2d15599e Binary files a/graphics/pokemon/bramblin/icon.png and b/graphics/pokemon/bramblin/icon.png differ diff --git a/graphics/pokemon/brute_bonnet/icon.png b/graphics/pokemon/brute_bonnet/icon.png old mode 100644 new mode 100755 index 41c60cc036..052517c12d Binary files a/graphics/pokemon/brute_bonnet/icon.png and b/graphics/pokemon/brute_bonnet/icon.png differ diff --git a/graphics/pokemon/capsakid/back.png b/graphics/pokemon/capsakid/back.png index 4323c7afa1..8b04dd8245 100755 Binary files a/graphics/pokemon/capsakid/back.png and b/graphics/pokemon/capsakid/back.png differ diff --git a/graphics/pokemon/capsakid/front.png b/graphics/pokemon/capsakid/front.png index a3883cbacf..011ba881ad 100755 Binary files a/graphics/pokemon/capsakid/front.png and b/graphics/pokemon/capsakid/front.png differ diff --git a/graphics/pokemon/capsakid/icon.png b/graphics/pokemon/capsakid/icon.png new file mode 100755 index 0000000000..ede6dc9c0c Binary files /dev/null and b/graphics/pokemon/capsakid/icon.png differ diff --git a/graphics/pokemon/ceruledge/1005.png b/graphics/pokemon/ceruledge/1005.png deleted file mode 100644 index 06c30dbad5..0000000000 Binary files a/graphics/pokemon/ceruledge/1005.png and /dev/null differ diff --git a/graphics/pokemon/ceruledge/icon.png b/graphics/pokemon/ceruledge/icon.png new file mode 100755 index 0000000000..7687030bd7 Binary files /dev/null and b/graphics/pokemon/ceruledge/icon.png differ diff --git a/graphics/pokemon/cetitan/icon.png b/graphics/pokemon/cetitan/icon.png new file mode 100755 index 0000000000..81cf0a3e24 Binary files /dev/null and b/graphics/pokemon/cetitan/icon.png differ diff --git a/graphics/pokemon/cetoddle/icon.png b/graphics/pokemon/cetoddle/icon.png new file mode 100755 index 0000000000..330b5c56d2 Binary files /dev/null and b/graphics/pokemon/cetoddle/icon.png differ diff --git a/graphics/pokemon/charcadet/icon.png b/graphics/pokemon/charcadet/icon.png old mode 100644 new mode 100755 index 488bfc074d..f62d09e918 Binary files a/graphics/pokemon/charcadet/icon.png and b/graphics/pokemon/charcadet/icon.png differ diff --git a/graphics/pokemon/chi_yu/icon.png b/graphics/pokemon/chi_yu/icon.png old mode 100644 new mode 100755 index 7749317001..1b922e696e Binary files a/graphics/pokemon/chi_yu/icon.png and b/graphics/pokemon/chi_yu/icon.png differ diff --git a/graphics/pokemon/chien_pao/icon.png b/graphics/pokemon/chien_pao/icon.png old mode 100644 new mode 100755 index 80531a6315..02d7bbe93d Binary files a/graphics/pokemon/chien_pao/icon.png and b/graphics/pokemon/chien_pao/icon.png differ diff --git a/graphics/pokemon/clodsire/icon.png b/graphics/pokemon/clodsire/icon.png old mode 100644 new mode 100755 index 6b6605ba38..09fa007c68 Binary files a/graphics/pokemon/clodsire/icon.png and b/graphics/pokemon/clodsire/icon.png differ diff --git a/graphics/pokemon/crocalor/icon.png b/graphics/pokemon/crocalor/icon.png new file mode 100755 index 0000000000..5ca0ee3f46 Binary files /dev/null and b/graphics/pokemon/crocalor/icon.png differ diff --git a/graphics/pokemon/cyclizar/icon.png b/graphics/pokemon/cyclizar/icon.png new file mode 100755 index 0000000000..64eba81963 Binary files /dev/null and b/graphics/pokemon/cyclizar/icon.png differ diff --git a/graphics/pokemon/dolliv/icon.png b/graphics/pokemon/dolliv/icon.png new file mode 100755 index 0000000000..37bd0eb19f Binary files /dev/null and b/graphics/pokemon/dolliv/icon.png differ diff --git a/graphics/pokemon/dondozo/back.png b/graphics/pokemon/dondozo/back.png index 0e58368273..d0d6ce3fd6 100755 Binary files a/graphics/pokemon/dondozo/back.png and b/graphics/pokemon/dondozo/back.png differ diff --git a/graphics/pokemon/dondozo/front.png b/graphics/pokemon/dondozo/front.png index 5808bd3f7f..c49c250348 100755 Binary files a/graphics/pokemon/dondozo/front.png and b/graphics/pokemon/dondozo/front.png differ diff --git a/graphics/pokemon/dondozo/icon.png b/graphics/pokemon/dondozo/icon.png new file mode 100755 index 0000000000..066128e0d4 Binary files /dev/null and b/graphics/pokemon/dondozo/icon.png differ diff --git a/graphics/pokemon/dudunsparce/back.png b/graphics/pokemon/dudunsparce/back.png index 23ffe9cff6..79136391b5 100755 Binary files a/graphics/pokemon/dudunsparce/back.png and b/graphics/pokemon/dudunsparce/back.png differ diff --git a/graphics/pokemon/dudunsparce/front.png b/graphics/pokemon/dudunsparce/front.png index 2d660034e5..2f618e5691 100755 Binary files a/graphics/pokemon/dudunsparce/front.png and b/graphics/pokemon/dudunsparce/front.png differ diff --git a/graphics/pokemon/dudunsparce/icon.png b/graphics/pokemon/dudunsparce/icon.png new file mode 100755 index 0000000000..e2a375ebf8 Binary files /dev/null and b/graphics/pokemon/dudunsparce/icon.png differ diff --git a/graphics/pokemon/dudunsparce/back_three_segment.png b/graphics/pokemon/dudunsparce/three_segment/back.png similarity index 100% rename from graphics/pokemon/dudunsparce/back_three_segment.png rename to graphics/pokemon/dudunsparce/three_segment/back.png diff --git a/graphics/pokemon/dudunsparce/front_three_segment.png b/graphics/pokemon/dudunsparce/three_segment/front.png similarity index 100% rename from graphics/pokemon/dudunsparce/front_three_segment.png rename to graphics/pokemon/dudunsparce/three_segment/front.png diff --git a/graphics/pokemon/dunsparce/icon.png b/graphics/pokemon/dunsparce/icon.png old mode 100644 new mode 100755 diff --git a/graphics/pokemon/espathra/back.png b/graphics/pokemon/espathra/back.png new file mode 100644 index 0000000000..bc66b9fa98 Binary files /dev/null and b/graphics/pokemon/espathra/back.png differ diff --git a/graphics/pokemon/espathra/front.png b/graphics/pokemon/espathra/front.png new file mode 100644 index 0000000000..7d3d405e2d Binary files /dev/null and b/graphics/pokemon/espathra/front.png differ diff --git a/graphics/pokemon/espathra/icon.png b/graphics/pokemon/espathra/icon.png new file mode 100755 index 0000000000..b82af0c6e2 Binary files /dev/null and b/graphics/pokemon/espathra/icon.png differ diff --git a/graphics/pokemon/espathra/normal.pal b/graphics/pokemon/espathra/normal.pal new file mode 100644 index 0000000000..6101d88550 --- /dev/null +++ b/graphics/pokemon/espathra/normal.pal @@ -0,0 +1,15 @@ +JASC-PAL +0100 +12 +153 211 165 +100 89 115 +249 249 249 +211 196 208 +15 15 15 +0 236 184 +170 144 162 +255 189 99 +197 138 82 +109 84 27 +188 166 20 +255 252 96 diff --git a/graphics/pokemon/espathra/shiny.pal b/graphics/pokemon/espathra/shiny.pal new file mode 100644 index 0000000000..2fb2eb4182 --- /dev/null +++ b/graphics/pokemon/espathra/shiny.pal @@ -0,0 +1,15 @@ +JASC-PAL +0100 +12 +153 211 165 +100 89 115 +249 249 249 +211 196 208 +15 15 15 +0 236 184 +170 144 162 +123 103 98 +106 86 81 +80 64 58 +123 103 98 +170 144 162 diff --git a/graphics/pokemon/farigiraf/icon.png b/graphics/pokemon/farigiraf/icon.png new file mode 100755 index 0000000000..e5e268534a Binary files /dev/null and b/graphics/pokemon/farigiraf/icon.png differ diff --git a/graphics/pokemon/fidough/icon.png b/graphics/pokemon/fidough/icon.png old mode 100644 new mode 100755 index d2c5f6ff78..2a6c4b15f5 Binary files a/graphics/pokemon/fidough/icon.png and b/graphics/pokemon/fidough/icon.png differ diff --git a/graphics/pokemon/finizen/back.png b/graphics/pokemon/finizen/back.png index d4983788b6..77432e6367 100755 Binary files a/graphics/pokemon/finizen/back.png and b/graphics/pokemon/finizen/back.png differ diff --git a/graphics/pokemon/finizen/front.png b/graphics/pokemon/finizen/front.png index cb85c26a4a..ea547fbe51 100755 Binary files a/graphics/pokemon/finizen/front.png and b/graphics/pokemon/finizen/front.png differ diff --git a/graphics/pokemon/finizen/icon.png b/graphics/pokemon/finizen/icon.png new file mode 100755 index 0000000000..b82b4c673f Binary files /dev/null and b/graphics/pokemon/finizen/icon.png differ diff --git a/graphics/pokemon/flamigo/back.png b/graphics/pokemon/flamigo/back.png index fbe5b95523..0fa825aae0 100755 Binary files a/graphics/pokemon/flamigo/back.png and b/graphics/pokemon/flamigo/back.png differ diff --git a/graphics/pokemon/flamigo/front.png b/graphics/pokemon/flamigo/front.png index d93928d2d8..d8033f368f 100755 Binary files a/graphics/pokemon/flamigo/front.png and b/graphics/pokemon/flamigo/front.png differ diff --git a/graphics/pokemon/flamigo/icon.png b/graphics/pokemon/flamigo/icon.png new file mode 100755 index 0000000000..0f0381579c Binary files /dev/null and b/graphics/pokemon/flamigo/icon.png differ diff --git a/graphics/pokemon/flittle/icon.png b/graphics/pokemon/flittle/icon.png old mode 100644 new mode 100755 index 80531a6315..f588d537ef Binary files a/graphics/pokemon/flittle/icon.png and b/graphics/pokemon/flittle/icon.png differ diff --git a/graphics/pokemon/floragato/front.png b/graphics/pokemon/floragato/front.png index 827f8ab133..78efe003c9 100755 Binary files a/graphics/pokemon/floragato/front.png and b/graphics/pokemon/floragato/front.png differ diff --git a/graphics/pokemon/flutter_mane/back.png b/graphics/pokemon/flutter_mane/back.png index a16779fc73..8052cafc19 100644 Binary files a/graphics/pokemon/flutter_mane/back.png and b/graphics/pokemon/flutter_mane/back.png differ diff --git a/graphics/pokemon/flutter_mane/front.png b/graphics/pokemon/flutter_mane/front.png index 41f6a63ad6..ce45a4b923 100644 Binary files a/graphics/pokemon/flutter_mane/front.png and b/graphics/pokemon/flutter_mane/front.png differ diff --git a/graphics/pokemon/flutter_mane/icon.png b/graphics/pokemon/flutter_mane/icon.png old mode 100644 new mode 100755 index f7655398ff..2b65fc048f Binary files a/graphics/pokemon/flutter_mane/icon.png and b/graphics/pokemon/flutter_mane/icon.png differ diff --git a/graphics/pokemon/flutter_mane/normal.pal b/graphics/pokemon/flutter_mane/normal.pal index d7c8ddfed0..a2b19738a6 100644 --- a/graphics/pokemon/flutter_mane/normal.pal +++ b/graphics/pokemon/flutter_mane/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 156 210 164 -90 117 115 -197 101 164 -57 72 82 -205 202 172 -255 218 98 -139 56 24 -148 28 106 -90 174 139 -255 68 65 -148 186 180 +148 30 104 16 16 16 -180 24 65 -139 214 189 -255 161 164 -106 149 164 +196 102 161 +230 162 205 +56 73 80 +109 149 164 +90 116 117 +136 56 24 +92 172 142 +255 162 162 +255 68 68 +136 214 185 +148 184 177 +180 26 65 +248 216 96 diff --git a/graphics/pokemon/flutter_mane/shiny.pal b/graphics/pokemon/flutter_mane/shiny.pal index 30895158bd..2db4e621e2 100644 --- a/graphics/pokemon/flutter_mane/shiny.pal +++ b/graphics/pokemon/flutter_mane/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -208 248 184 -8 88 8 -56 168 32 +156 210 164 +180 79 0 16 16 16 -8 128 40 -112 216 72 -56 96 40 -120 160 64 -200 240 104 -80 128 40 -160 208 88 -184 56 48 -248 248 248 -248 128 120 -184 56 48 +216 152 64 +248 184 64 +56 73 80 +181 203 123 +105 141 69 +136 56 24 200 200 200 +255 162 162 +255 68 68 +248 248 248 +222 232 154 +180 26 65 +248 216 96 diff --git a/graphics/pokemon/frigibax/icon.png b/graphics/pokemon/frigibax/icon.png new file mode 100755 index 0000000000..b50575cd47 Binary files /dev/null and b/graphics/pokemon/frigibax/icon.png differ diff --git a/graphics/pokemon/fuecoco/icon.png b/graphics/pokemon/fuecoco/icon.png new file mode 100755 index 0000000000..923e5f03fd Binary files /dev/null and b/graphics/pokemon/fuecoco/icon.png differ diff --git a/graphics/pokemon/garganacl/icon.png b/graphics/pokemon/garganacl/icon.png new file mode 100755 index 0000000000..bc2d038478 Binary files /dev/null and b/graphics/pokemon/garganacl/icon.png differ diff --git a/graphics/pokemon/gholdengo/back.png b/graphics/pokemon/gholdengo/back.png new file mode 100644 index 0000000000..3abf6c3abb Binary files /dev/null and b/graphics/pokemon/gholdengo/back.png differ diff --git a/graphics/pokemon/gholdengo/front.png b/graphics/pokemon/gholdengo/front.png new file mode 100644 index 0000000000..c65db2b150 Binary files /dev/null and b/graphics/pokemon/gholdengo/front.png differ diff --git a/graphics/pokemon/gholdengo/icon.png b/graphics/pokemon/gholdengo/icon.png new file mode 100755 index 0000000000..99d0e122f2 Binary files /dev/null and b/graphics/pokemon/gholdengo/icon.png differ diff --git a/graphics/pokemon/gholdengo/normal.pal b/graphics/pokemon/gholdengo/normal.pal new file mode 100644 index 0000000000..833a7aef9f --- /dev/null +++ b/graphics/pokemon/gholdengo/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 212 159 +212 118 0 +255 223 160 +255 217 0 +0 0 0 +255 174 0 +255 140 0 +78 60 0 +255 171 0 +25 36 42 +186 108 74 +255 17 96 +253 171 0 +44 91 111 +127 147 167 +177 194 213 diff --git a/graphics/pokemon/gholdengo/shiny.pal b/graphics/pokemon/gholdengo/shiny.pal new file mode 100644 index 0000000000..833a7aef9f --- /dev/null +++ b/graphics/pokemon/gholdengo/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 212 159 +212 118 0 +255 223 160 +255 217 0 +0 0 0 +255 174 0 +255 140 0 +78 60 0 +255 171 0 +25 36 42 +186 108 74 +255 17 96 +253 171 0 +44 91 111 +127 147 167 +177 194 213 diff --git a/graphics/pokemon/gimmighoul/icon.png b/graphics/pokemon/gimmighoul/icon.png old mode 100644 new mode 100755 index d8e5935d93..80364e752b Binary files a/graphics/pokemon/gimmighoul/icon.png and b/graphics/pokemon/gimmighoul/icon.png differ diff --git a/graphics/pokemon/gimmighoul/roaming/back.png b/graphics/pokemon/gimmighoul/roaming/back.png new file mode 100644 index 0000000000..ad90dc8a10 Binary files /dev/null and b/graphics/pokemon/gimmighoul/roaming/back.png differ diff --git a/graphics/pokemon/gimmighoul/roaming/front.png b/graphics/pokemon/gimmighoul/roaming/front.png new file mode 100644 index 0000000000..c8f6f3a935 Binary files /dev/null and b/graphics/pokemon/gimmighoul/roaming/front.png differ diff --git a/graphics/pokemon/gimmighoul/roaming/normal.pal b/graphics/pokemon/gimmighoul/roaming/normal.pal new file mode 100644 index 0000000000..8c71fadd94 --- /dev/null +++ b/graphics/pokemon/gimmighoul/roaming/normal.pal @@ -0,0 +1,16 @@ +JASC-PAL +0100 +13 +114 214 163 +0 214 160 +0 212 159 +0 0 0 +31 44 56 +132 153 195 +65 108 140 +199 229 248 +161 200 224 +255 197 0 +221 124 0 +255 160 0 +128 57 0 diff --git a/graphics/pokemon/gimmighoul/roaming/shiny.pal b/graphics/pokemon/gimmighoul/roaming/shiny.pal new file mode 100644 index 0000000000..7ece225d51 --- /dev/null +++ b/graphics/pokemon/gimmighoul/roaming/shiny.pal @@ -0,0 +1,16 @@ +JASC-PAL +0100 +13 +114 214 163 +0 214 160 +0 212 159 +0 0 0 +31 44 56 +170 163 126 +135 131 102 +199 229 248 +228 209 183 +255 197 0 +221 124 0 +255 160 0 +128 57 0 diff --git a/graphics/pokemon/glimmet/back.png b/graphics/pokemon/glimmet/back.png index 76b3e6d87a..ae7f5f2903 100755 Binary files a/graphics/pokemon/glimmet/back.png and b/graphics/pokemon/glimmet/back.png differ diff --git a/graphics/pokemon/glimmet/front.png b/graphics/pokemon/glimmet/front.png index f3d9f6fde5..c403aefa04 100755 Binary files a/graphics/pokemon/glimmet/front.png and b/graphics/pokemon/glimmet/front.png differ diff --git a/graphics/pokemon/glimmet/icon.png b/graphics/pokemon/glimmet/icon.png new file mode 100755 index 0000000000..1bc74def32 Binary files /dev/null and b/graphics/pokemon/glimmet/icon.png differ diff --git a/graphics/pokemon/glimmora/back.png b/graphics/pokemon/glimmora/back.png index ba4ec31a20..f11e202262 100755 Binary files a/graphics/pokemon/glimmora/back.png and b/graphics/pokemon/glimmora/back.png differ diff --git a/graphics/pokemon/glimmora/front.png b/graphics/pokemon/glimmora/front.png index 7a72277af5..6862760a8d 100755 Binary files a/graphics/pokemon/glimmora/front.png and b/graphics/pokemon/glimmora/front.png differ diff --git a/graphics/pokemon/glimmora/icon.png b/graphics/pokemon/glimmora/icon.png new file mode 100755 index 0000000000..12e50f0cbc Binary files /dev/null and b/graphics/pokemon/glimmora/icon.png differ diff --git a/graphics/pokemon/grafaiai/back.png b/graphics/pokemon/grafaiai/back.png index 544ad83ef6..bf256f1ae6 100755 Binary files a/graphics/pokemon/grafaiai/back.png and b/graphics/pokemon/grafaiai/back.png differ diff --git a/graphics/pokemon/grafaiai/front.png b/graphics/pokemon/grafaiai/front.png index e5c31f40ed..55635a3861 100755 Binary files a/graphics/pokemon/grafaiai/front.png and b/graphics/pokemon/grafaiai/front.png differ diff --git a/graphics/pokemon/grafaiai/icon.png b/graphics/pokemon/grafaiai/icon.png new file mode 100755 index 0000000000..9e027481aa Binary files /dev/null and b/graphics/pokemon/grafaiai/icon.png differ diff --git a/graphics/pokemon/great_tusk/back.png b/graphics/pokemon/great_tusk/back.png index de5c416caf..cb4447ae32 100644 Binary files a/graphics/pokemon/great_tusk/back.png and b/graphics/pokemon/great_tusk/back.png differ diff --git a/graphics/pokemon/great_tusk/front.png b/graphics/pokemon/great_tusk/front.png index 0c555e4be6..06cce178c9 100644 Binary files a/graphics/pokemon/great_tusk/front.png and b/graphics/pokemon/great_tusk/front.png differ diff --git a/graphics/pokemon/great_tusk/icon.png b/graphics/pokemon/great_tusk/icon.png old mode 100644 new mode 100755 index 8fead5c80a..30384d570d Binary files a/graphics/pokemon/great_tusk/icon.png and b/graphics/pokemon/great_tusk/icon.png differ diff --git a/graphics/pokemon/great_tusk/normal.pal b/graphics/pokemon/great_tusk/normal.pal index 8443f74115..534c788638 100644 --- a/graphics/pokemon/great_tusk/normal.pal +++ b/graphics/pokemon/great_tusk/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -123 85 65 -57 48 90 -172 194 222 -98 93 164 -238 52 123 -238 52 124 -255 242 90 -189 170 164 +120 208 160 +104 24 40 +176 32 88 +232 64 128 16 16 16 -131 141 164 +96 80 144 +56 48 88 +168 152 152 +240 240 216 +128 136 160 +168 192 216 +104 88 168 +248 240 88 8 8 8 -181 36 90 -246 242 222 -115 24 49 -106 24 41 +216 40 48 +0 0 0 diff --git a/graphics/pokemon/great_tusk/shiny.pal b/graphics/pokemon/great_tusk/shiny.pal index 662c94f14a..dcb7a87c2f 100644 --- a/graphics/pokemon/great_tusk/shiny.pal +++ b/graphics/pokemon/great_tusk/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -123 85 65 -120 64 56 -40 184 144 -192 112 96 -224 232 0 -216 40 48 -255 242 90 -189 170 164 -16 16 16 -56 128 104 -8 8 8 +120 208 160 +104 24 40 136 152 0 -246 242 222 +224 232 0 +16 16 16 +192 112 96 +120 64 56 +168 152 152 +240 240 216 +56 128 104 +40 184 144 80 88 16 -106 24 41 +248 240 88 +8 8 8 +216 40 48 +0 0 0 diff --git a/graphics/pokemon/greavard/back.png b/graphics/pokemon/greavard/back.png index 69afc904d8..3fef905434 100755 Binary files a/graphics/pokemon/greavard/back.png and b/graphics/pokemon/greavard/back.png differ diff --git a/graphics/pokemon/greavard/front.png b/graphics/pokemon/greavard/front.png index 16e921d846..1fde607510 100755 Binary files a/graphics/pokemon/greavard/front.png and b/graphics/pokemon/greavard/front.png differ diff --git a/graphics/pokemon/greavard/icon.png b/graphics/pokemon/greavard/icon.png new file mode 100755 index 0000000000..a43e9a3875 Binary files /dev/null and b/graphics/pokemon/greavard/icon.png differ diff --git a/graphics/pokemon/houndstone/icon.png b/graphics/pokemon/houndstone/icon.png new file mode 100755 index 0000000000..51d26434c8 Binary files /dev/null and b/graphics/pokemon/houndstone/icon.png differ diff --git a/graphics/pokemon/iron_bundle/icon.png b/graphics/pokemon/iron_bundle/icon.png old mode 100644 new mode 100755 index 2b097b7b2d..99b380a543 Binary files a/graphics/pokemon/iron_bundle/icon.png and b/graphics/pokemon/iron_bundle/icon.png differ diff --git a/graphics/pokemon/iron_hands/icon.png b/graphics/pokemon/iron_hands/icon.png old mode 100644 new mode 100755 index 50f3ab431d..d28b62a6d0 Binary files a/graphics/pokemon/iron_hands/icon.png and b/graphics/pokemon/iron_hands/icon.png differ diff --git a/graphics/pokemon/iron_jugulis/front.png b/graphics/pokemon/iron_jugulis/front.png index 67aad16f32..c2c4095654 100644 Binary files a/graphics/pokemon/iron_jugulis/front.png and b/graphics/pokemon/iron_jugulis/front.png differ diff --git a/graphics/pokemon/iron_jugulis/icon.png b/graphics/pokemon/iron_jugulis/icon.png old mode 100644 new mode 100755 index 80531a6315..14ae400dfd Binary files a/graphics/pokemon/iron_jugulis/icon.png and b/graphics/pokemon/iron_jugulis/icon.png differ diff --git a/graphics/pokemon/iron_moth/icon.png b/graphics/pokemon/iron_moth/icon.png old mode 100644 new mode 100755 index 28cca80a86..ac43ad66ea Binary files a/graphics/pokemon/iron_moth/icon.png and b/graphics/pokemon/iron_moth/icon.png differ diff --git a/graphics/pokemon/iron_thorns/icon.png b/graphics/pokemon/iron_thorns/icon.png new file mode 100755 index 0000000000..48391a50c7 Binary files /dev/null and b/graphics/pokemon/iron_thorns/icon.png differ diff --git a/graphics/pokemon/iron_treads/icon.png b/graphics/pokemon/iron_treads/icon.png new file mode 100755 index 0000000000..a75d7f93c9 Binary files /dev/null and b/graphics/pokemon/iron_treads/icon.png differ diff --git a/graphics/pokemon/iron_valiant/icon.png b/graphics/pokemon/iron_valiant/icon.png old mode 100644 new mode 100755 index 58ca6ec34e..c1441e5dd5 Binary files a/graphics/pokemon/iron_valiant/icon.png and b/graphics/pokemon/iron_valiant/icon.png differ diff --git a/graphics/pokemon/kilowattrel/back.png b/graphics/pokemon/kilowattrel/back.png index 79ea2d42d1..26eb440b6a 100755 Binary files a/graphics/pokemon/kilowattrel/back.png and b/graphics/pokemon/kilowattrel/back.png differ diff --git a/graphics/pokemon/kilowattrel/front.png b/graphics/pokemon/kilowattrel/front.png index 628f509ff8..3a8e971644 100755 Binary files a/graphics/pokemon/kilowattrel/front.png and b/graphics/pokemon/kilowattrel/front.png differ diff --git a/graphics/pokemon/kilowattrel/icon.png b/graphics/pokemon/kilowattrel/icon.png new file mode 100755 index 0000000000..d4e5f7211b Binary files /dev/null and b/graphics/pokemon/kilowattrel/icon.png differ diff --git a/graphics/pokemon/kingambit/icon.png b/graphics/pokemon/kingambit/icon.png new file mode 100755 index 0000000000..ce85b3c190 Binary files /dev/null and b/graphics/pokemon/kingambit/icon.png differ diff --git a/graphics/pokemon/klawf/back.png b/graphics/pokemon/klawf/back.png index 993575f65a..7ec60ac1ea 100755 Binary files a/graphics/pokemon/klawf/back.png and b/graphics/pokemon/klawf/back.png differ diff --git a/graphics/pokemon/klawf/front.png b/graphics/pokemon/klawf/front.png index f3e6cfe434..5de8f70249 100755 Binary files a/graphics/pokemon/klawf/front.png and b/graphics/pokemon/klawf/front.png differ diff --git a/graphics/pokemon/klawf/icon.png b/graphics/pokemon/klawf/icon.png new file mode 100755 index 0000000000..e7c232f130 Binary files /dev/null and b/graphics/pokemon/klawf/icon.png differ diff --git a/graphics/pokemon/koraidon/icon.png b/graphics/pokemon/koraidon/icon.png new file mode 100755 index 0000000000..127a03e5d7 Binary files /dev/null and b/graphics/pokemon/koraidon/icon.png differ diff --git a/graphics/pokemon/lechonk/back.png b/graphics/pokemon/lechonk/back.png index 4939ff1f13..608fbe03cb 100755 Binary files a/graphics/pokemon/lechonk/back.png and b/graphics/pokemon/lechonk/back.png differ diff --git a/graphics/pokemon/lechonk/front.png b/graphics/pokemon/lechonk/front.png index cab061a335..4f7e7a7597 100755 Binary files a/graphics/pokemon/lechonk/front.png and b/graphics/pokemon/lechonk/front.png differ diff --git a/graphics/pokemon/lechonk/icon.png b/graphics/pokemon/lechonk/icon.png new file mode 100755 index 0000000000..d368c427be Binary files /dev/null and b/graphics/pokemon/lechonk/icon.png differ diff --git a/graphics/pokemon/lokix/back.png b/graphics/pokemon/lokix/back.png index 3c9fa5ffb2..25d62835c1 100755 Binary files a/graphics/pokemon/lokix/back.png and b/graphics/pokemon/lokix/back.png differ diff --git a/graphics/pokemon/lokix/front.png b/graphics/pokemon/lokix/front.png index 8c29573c3f..f617e5a41b 100755 Binary files a/graphics/pokemon/lokix/front.png and b/graphics/pokemon/lokix/front.png differ diff --git a/graphics/pokemon/lokix/icon.png b/graphics/pokemon/lokix/icon.png new file mode 100755 index 0000000000..205de36a02 Binary files /dev/null and b/graphics/pokemon/lokix/icon.png differ diff --git a/graphics/pokemon/mabosstiff/icon.png b/graphics/pokemon/mabosstiff/icon.png new file mode 100755 index 0000000000..3b99df2d4a Binary files /dev/null and b/graphics/pokemon/mabosstiff/icon.png differ diff --git a/graphics/pokemon/maschiff/icon.png b/graphics/pokemon/maschiff/icon.png new file mode 100755 index 0000000000..f5127dcc42 Binary files /dev/null and b/graphics/pokemon/maschiff/icon.png differ diff --git a/graphics/pokemon/maushold/back.png b/graphics/pokemon/maushold/back.png index dd93b1d732..5f78e7c959 100644 Binary files a/graphics/pokemon/maushold/back.png and b/graphics/pokemon/maushold/back.png differ diff --git a/graphics/pokemon/maushold/front.png b/graphics/pokemon/maushold/front.png index 9f751d78a8..b5813df9f2 100644 Binary files a/graphics/pokemon/maushold/front.png and b/graphics/pokemon/maushold/front.png differ diff --git a/graphics/pokemon/maushold/icon.png b/graphics/pokemon/maushold/icon.png new file mode 100755 index 0000000000..728aca58a1 Binary files /dev/null and b/graphics/pokemon/maushold/icon.png differ diff --git a/graphics/pokemon/maushold/three/back.png b/graphics/pokemon/maushold/three/back.png new file mode 100644 index 0000000000..8def92dd59 Binary files /dev/null and b/graphics/pokemon/maushold/three/back.png differ diff --git a/graphics/pokemon/maushold/three/front.png b/graphics/pokemon/maushold/three/front.png new file mode 100644 index 0000000000..aa33ed0d45 Binary files /dev/null and b/graphics/pokemon/maushold/three/front.png differ diff --git a/graphics/pokemon/maushold/three/icon.png b/graphics/pokemon/maushold/three/icon.png new file mode 100755 index 0000000000..97c2d70826 Binary files /dev/null and b/graphics/pokemon/maushold/three/icon.png differ diff --git a/graphics/pokemon/meowscarada/icon.png b/graphics/pokemon/meowscarada/icon.png new file mode 100755 index 0000000000..5b79821453 Binary files /dev/null and b/graphics/pokemon/meowscarada/icon.png differ diff --git a/graphics/pokemon/miraidon/icon.png b/graphics/pokemon/miraidon/icon.png old mode 100644 new mode 100755 index 80531a6315..3ccf056b51 Binary files a/graphics/pokemon/miraidon/icon.png and b/graphics/pokemon/miraidon/icon.png differ diff --git a/graphics/pokemon/nacli/icon.png b/graphics/pokemon/nacli/icon.png new file mode 100755 index 0000000000..ed0895c1d8 Binary files /dev/null and b/graphics/pokemon/nacli/icon.png differ diff --git a/graphics/pokemon/naclstack/icon.png b/graphics/pokemon/naclstack/icon.png new file mode 100755 index 0000000000..a536c3818d Binary files /dev/null and b/graphics/pokemon/naclstack/icon.png differ diff --git a/graphics/pokemon/nymble/back.png b/graphics/pokemon/nymble/back.png index 68a441734a..83abf2fd93 100755 Binary files a/graphics/pokemon/nymble/back.png and b/graphics/pokemon/nymble/back.png differ diff --git a/graphics/pokemon/nymble/front.png b/graphics/pokemon/nymble/front.png index b297a73695..e386e17857 100755 Binary files a/graphics/pokemon/nymble/front.png and b/graphics/pokemon/nymble/front.png differ diff --git a/graphics/pokemon/nymble/icon.png b/graphics/pokemon/nymble/icon.png new file mode 100755 index 0000000000..791bd0a427 Binary files /dev/null and b/graphics/pokemon/nymble/icon.png differ diff --git a/graphics/pokemon/oinkologne/female/icon.png b/graphics/pokemon/oinkologne/female/icon.png new file mode 100755 index 0000000000..0acd6e2711 Binary files /dev/null and b/graphics/pokemon/oinkologne/female/icon.png differ diff --git a/graphics/pokemon/oinkologne/female/iconTODO.png b/graphics/pokemon/oinkologne/female/iconTODO.png new file mode 100755 index 0000000000..36ce1eb7f8 Binary files /dev/null and b/graphics/pokemon/oinkologne/female/iconTODO.png differ diff --git a/graphics/pokemon/oinkologne/icon.png b/graphics/pokemon/oinkologne/icon.png new file mode 100755 index 0000000000..0acd6e2711 Binary files /dev/null and b/graphics/pokemon/oinkologne/icon.png differ diff --git a/graphics/pokemon/orthworm/back.png b/graphics/pokemon/orthworm/back.png index 86c2289cb8..99936e302e 100755 Binary files a/graphics/pokemon/orthworm/back.png and b/graphics/pokemon/orthworm/back.png differ diff --git a/graphics/pokemon/orthworm/front.png b/graphics/pokemon/orthworm/front.png index de2ede81aa..4c3ab7c3bd 100755 Binary files a/graphics/pokemon/orthworm/front.png and b/graphics/pokemon/orthworm/front.png differ diff --git a/graphics/pokemon/orthworm/icon.png b/graphics/pokemon/orthworm/icon.png new file mode 100755 index 0000000000..9cb39cc79b Binary files /dev/null and b/graphics/pokemon/orthworm/icon.png differ diff --git a/graphics/pokemon/palafin/back.png b/graphics/pokemon/palafin/back.png index e72eddae71..77432e6367 100755 Binary files a/graphics/pokemon/palafin/back.png and b/graphics/pokemon/palafin/back.png differ diff --git a/graphics/pokemon/palafin/front.png b/graphics/pokemon/palafin/front.png index 6550f5b890..074ca87f3e 100755 Binary files a/graphics/pokemon/palafin/front.png and b/graphics/pokemon/palafin/front.png differ diff --git a/graphics/pokemon/palafin/hero/back.png b/graphics/pokemon/palafin/hero/back.png index c744151654..922496ccf6 100755 Binary files a/graphics/pokemon/palafin/hero/back.png and b/graphics/pokemon/palafin/hero/back.png differ diff --git a/graphics/pokemon/palafin/hero/front.png b/graphics/pokemon/palafin/hero/front.png index 952b5a305e..47f66479e1 100755 Binary files a/graphics/pokemon/palafin/hero/front.png and b/graphics/pokemon/palafin/hero/front.png differ diff --git a/graphics/pokemon/palafin/hero/icon.png b/graphics/pokemon/palafin/hero/icon.png new file mode 100755 index 0000000000..8dd8a11844 Binary files /dev/null and b/graphics/pokemon/palafin/hero/icon.png differ diff --git a/graphics/pokemon/palafin/icon.png b/graphics/pokemon/palafin/icon.png new file mode 100755 index 0000000000..d24e846fc5 Binary files /dev/null and b/graphics/pokemon/palafin/icon.png differ diff --git a/graphics/pokemon/pawmi/icon.png b/graphics/pokemon/pawmi/icon.png new file mode 100755 index 0000000000..a7fc302fe0 Binary files /dev/null and b/graphics/pokemon/pawmi/icon.png differ diff --git a/graphics/pokemon/pawmo/icon.png b/graphics/pokemon/pawmo/icon.png old mode 100644 new mode 100755 index 80531a6315..41cc6b4f9a Binary files a/graphics/pokemon/pawmo/icon.png and b/graphics/pokemon/pawmo/icon.png differ diff --git a/graphics/pokemon/pawmot/icon.png b/graphics/pokemon/pawmot/icon.png new file mode 100755 index 0000000000..cc9d2e942a Binary files /dev/null and b/graphics/pokemon/pawmot/icon.png differ diff --git a/graphics/pokemon/quaquaval/icon.png b/graphics/pokemon/quaquaval/icon.png new file mode 100755 index 0000000000..4e68d84ff4 Binary files /dev/null and b/graphics/pokemon/quaquaval/icon.png differ diff --git a/graphics/pokemon/quaxly/icon.png b/graphics/pokemon/quaxly/icon.png new file mode 100755 index 0000000000..4036957445 Binary files /dev/null and b/graphics/pokemon/quaxly/icon.png differ diff --git a/graphics/pokemon/quaxwell/icon.png b/graphics/pokemon/quaxwell/icon.png old mode 100644 new mode 100755 index 80531a6315..3806542c09 Binary files a/graphics/pokemon/quaxwell/icon.png and b/graphics/pokemon/quaxwell/icon.png differ diff --git a/graphics/pokemon/rabsca/back.png b/graphics/pokemon/rabsca/back.png new file mode 100644 index 0000000000..3bb97d7a6c Binary files /dev/null and b/graphics/pokemon/rabsca/back.png differ diff --git a/graphics/pokemon/rabsca/front.png b/graphics/pokemon/rabsca/front.png new file mode 100644 index 0000000000..caea46e6b9 Binary files /dev/null and b/graphics/pokemon/rabsca/front.png differ diff --git a/graphics/pokemon/rabsca/icon.png b/graphics/pokemon/rabsca/icon.png new file mode 100755 index 0000000000..57c93e30a3 Binary files /dev/null and b/graphics/pokemon/rabsca/icon.png differ diff --git a/graphics/pokemon/rabsca/normal.pal b/graphics/pokemon/rabsca/normal.pal new file mode 100644 index 0000000000..5be86a05d8 --- /dev/null +++ b/graphics/pokemon/rabsca/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 215 150 +206 0 119 +255 0 255 +255 0 196 +255 3 107 +255 0 72 +255 40 149 +248 248 248 +0 74 92 +0 53 74 +0 0 0 +0 197 231 +166 156 167 +231 0 8 +255 69 90 +0 214 160 diff --git a/graphics/pokemon/rellor/back.png b/graphics/pokemon/rellor/back.png new file mode 100644 index 0000000000..21fcbfbfef Binary files /dev/null and b/graphics/pokemon/rellor/back.png differ diff --git a/graphics/pokemon/rellor/front.png b/graphics/pokemon/rellor/front.png new file mode 100644 index 0000000000..9be53874b4 Binary files /dev/null and b/graphics/pokemon/rellor/front.png differ diff --git a/graphics/pokemon/rellor/icon.png b/graphics/pokemon/rellor/icon.png new file mode 100755 index 0000000000..56ea140347 Binary files /dev/null and b/graphics/pokemon/rellor/icon.png differ diff --git a/graphics/pokemon/rellor/normal.pal b/graphics/pokemon/rellor/normal.pal new file mode 100644 index 0000000000..a8893d8adf --- /dev/null +++ b/graphics/pokemon/rellor/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +124 210 161 +184 67 0 +242 99 32 +255 139 74 +255 187 177 +255 142 0 +69 17 0 +255 108 0 +128 75 40 +0 0 0 +149 123 90 +245 180 41 +255 149 141 +255 54 178 +242 242 242 +0 211 160 diff --git a/graphics/pokemon/rellor/shiny.pal b/graphics/pokemon/rellor/shiny.pal new file mode 100644 index 0000000000..6f715ec097 --- /dev/null +++ b/graphics/pokemon/rellor/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +124 210 161 +184 67 0 +255 161 0 +255 248 0 +255 249 0 +255 142 0 +69 17 0 +255 108 0 +128 75 40 +0 0 0 +149 123 90 +245 180 41 +255 161 0 +0 120 183 +242 242 242 +0 211 160 diff --git a/graphics/pokemon/revavroom/icon.png b/graphics/pokemon/revavroom/icon.png new file mode 100755 index 0000000000..8d3a2ee0cc Binary files /dev/null and b/graphics/pokemon/revavroom/icon.png differ diff --git a/graphics/pokemon/roaring_moon/back.png b/graphics/pokemon/roaring_moon/back.png new file mode 100644 index 0000000000..a4840356d1 Binary files /dev/null and b/graphics/pokemon/roaring_moon/back.png differ diff --git a/graphics/pokemon/roaring_moon/front.png b/graphics/pokemon/roaring_moon/front.png new file mode 100644 index 0000000000..a0eb884f6e Binary files /dev/null and b/graphics/pokemon/roaring_moon/front.png differ diff --git a/graphics/pokemon/roaring_moon/icon.png b/graphics/pokemon/roaring_moon/icon.png new file mode 100755 index 0000000000..d8d82fb015 Binary files /dev/null and b/graphics/pokemon/roaring_moon/icon.png differ diff --git a/graphics/pokemon/roaring_moon/normal.pal b/graphics/pokemon/roaring_moon/normal.pal new file mode 100644 index 0000000000..9021ba933f --- /dev/null +++ b/graphics/pokemon/roaring_moon/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +200 200 168 +62 140 179 +136 48 64 +88 200 248 +248 160 112 +200 72 80 +48 72 112 +152 224 248 +0 0 0 +112 128 128 +192 192 208 +248 248 248 +80 72 72 +248 200 88 +200 160 72 +176 112 48 diff --git a/graphics/pokemon/roaring_moon/shiny.pal b/graphics/pokemon/roaring_moon/shiny.pal new file mode 100644 index 0000000000..4a9116f07f --- /dev/null +++ b/graphics/pokemon/roaring_moon/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +200 200 168 +65 163 146 +136 48 64 +90 224 202 +248 160 112 +200 72 80 +48 72 112 +152 224 248 +0 0 0 +112 128 128 +192 192 208 +248 248 248 +80 72 72 +248 200 88 +200 160 72 +176 112 48 diff --git a/graphics/pokemon/sandy_shocks/icon.png b/graphics/pokemon/sandy_shocks/icon.png old mode 100644 new mode 100755 index 80531a6315..99d693a1ac Binary files a/graphics/pokemon/sandy_shocks/icon.png and b/graphics/pokemon/sandy_shocks/icon.png differ diff --git a/graphics/pokemon/scovillain/icon.png b/graphics/pokemon/scovillain/icon.png new file mode 100755 index 0000000000..ad591b21c3 Binary files /dev/null and b/graphics/pokemon/scovillain/icon.png differ diff --git a/graphics/pokemon/scream_tail/icon.png b/graphics/pokemon/scream_tail/icon.png old mode 100644 new mode 100755 index 53234d4bd8..09ca4083ec Binary files a/graphics/pokemon/scream_tail/icon.png and b/graphics/pokemon/scream_tail/icon.png differ diff --git a/graphics/pokemon/shroodle/back.png b/graphics/pokemon/shroodle/back.png index 33bc74449f..ffecfe183c 100755 Binary files a/graphics/pokemon/shroodle/back.png and b/graphics/pokemon/shroodle/back.png differ diff --git a/graphics/pokemon/shroodle/front.png b/graphics/pokemon/shroodle/front.png index 2e5998881f..38dac9194a 100755 Binary files a/graphics/pokemon/shroodle/front.png and b/graphics/pokemon/shroodle/front.png differ diff --git a/graphics/pokemon/shroodle/icon.png b/graphics/pokemon/shroodle/icon.png new file mode 100755 index 0000000000..1e7a9430d8 Binary files /dev/null and b/graphics/pokemon/shroodle/icon.png differ diff --git a/graphics/pokemon/skeledirge/icon.png b/graphics/pokemon/skeledirge/icon.png new file mode 100755 index 0000000000..901aab95d9 Binary files /dev/null and b/graphics/pokemon/skeledirge/icon.png differ diff --git a/graphics/pokemon/slither_wing/icon.png b/graphics/pokemon/slither_wing/icon.png old mode 100644 new mode 100755 index 80531a6315..e969280a5d Binary files a/graphics/pokemon/slither_wing/icon.png and b/graphics/pokemon/slither_wing/icon.png differ diff --git a/graphics/pokemon/smoliv/back.png b/graphics/pokemon/smoliv/back.png index e6713ec989..94a93c1fa7 100755 Binary files a/graphics/pokemon/smoliv/back.png and b/graphics/pokemon/smoliv/back.png differ diff --git a/graphics/pokemon/smoliv/front.png b/graphics/pokemon/smoliv/front.png index 9ca0c6e383..725787d66d 100755 Binary files a/graphics/pokemon/smoliv/front.png and b/graphics/pokemon/smoliv/front.png differ diff --git a/graphics/pokemon/smoliv/icon.png b/graphics/pokemon/smoliv/icon.png new file mode 100755 index 0000000000..53b8ffc945 Binary files /dev/null and b/graphics/pokemon/smoliv/icon.png differ diff --git a/graphics/pokemon/spidops/icon.png b/graphics/pokemon/spidops/icon.png new file mode 100755 index 0000000000..c35aa36c61 Binary files /dev/null and b/graphics/pokemon/spidops/icon.png differ diff --git a/graphics/pokemon/sprigatito/icon.png b/graphics/pokemon/sprigatito/icon.png new file mode 100755 index 0000000000..114fcff288 Binary files /dev/null and b/graphics/pokemon/sprigatito/icon.png differ diff --git a/graphics/pokemon/squawkabilly/blue_plumage/icon.png b/graphics/pokemon/squawkabilly/blue_plumage/icon.png new file mode 100755 index 0000000000..4ad732211c Binary files /dev/null and b/graphics/pokemon/squawkabilly/blue_plumage/icon.png differ diff --git a/graphics/pokemon/squawkabilly/green_plumage/icon.png b/graphics/pokemon/squawkabilly/green_plumage/icon.png new file mode 100755 index 0000000000..540b7521a8 Binary files /dev/null and b/graphics/pokemon/squawkabilly/green_plumage/icon.png differ diff --git a/graphics/pokemon/squawkabilly/normal.pal b/graphics/pokemon/squawkabilly/green_plumage/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/normal.pal rename to graphics/pokemon/squawkabilly/green_plumage/normal.pal diff --git a/graphics/pokemon/squawkabilly/shiny.pal b/graphics/pokemon/squawkabilly/green_plumage/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/shiny.pal rename to graphics/pokemon/squawkabilly/green_plumage/shiny.pal diff --git a/graphics/pokemon/squawkabilly/icon.png b/graphics/pokemon/squawkabilly/icon.png deleted file mode 100644 index 80531a6315..0000000000 Binary files a/graphics/pokemon/squawkabilly/icon.png and /dev/null differ diff --git a/graphics/pokemon/squawkabilly/white_plumage/icon.png b/graphics/pokemon/squawkabilly/white_plumage/icon.png new file mode 100755 index 0000000000..a784c6cdda Binary files /dev/null and b/graphics/pokemon/squawkabilly/white_plumage/icon.png differ diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/icon.png b/graphics/pokemon/squawkabilly/yellow_plumage/icon.png new file mode 100755 index 0000000000..a042d981d0 Binary files /dev/null and b/graphics/pokemon/squawkabilly/yellow_plumage/icon.png differ diff --git a/graphics/pokemon/tadbulb/icon.png b/graphics/pokemon/tadbulb/icon.png new file mode 100755 index 0000000000..0341a387fb Binary files /dev/null and b/graphics/pokemon/tadbulb/icon.png differ diff --git a/graphics/pokemon/tandemaus/icon.png b/graphics/pokemon/tandemaus/icon.png new file mode 100755 index 0000000000..8effa87c57 Binary files /dev/null and b/graphics/pokemon/tandemaus/icon.png differ diff --git a/graphics/pokemon/tarountula/back.png b/graphics/pokemon/tarountula/back.png index cebc8b4e2c..cb458391ca 100755 Binary files a/graphics/pokemon/tarountula/back.png and b/graphics/pokemon/tarountula/back.png differ diff --git a/graphics/pokemon/tarountula/front.png b/graphics/pokemon/tarountula/front.png index 6b94f5e459..c5864d289c 100755 Binary files a/graphics/pokemon/tarountula/front.png and b/graphics/pokemon/tarountula/front.png differ diff --git a/graphics/pokemon/tarountula/icon.png b/graphics/pokemon/tarountula/icon.png new file mode 100755 index 0000000000..d4802eb0ea Binary files /dev/null and b/graphics/pokemon/tarountula/icon.png differ diff --git a/graphics/pokemon/tatsugiri/back.png b/graphics/pokemon/tatsugiri/back.png deleted file mode 100644 index 6d998537f2..0000000000 Binary files a/graphics/pokemon/tatsugiri/back.png and /dev/null differ diff --git a/graphics/pokemon/tatsugiri/curly/icon.png b/graphics/pokemon/tatsugiri/curly/icon.png old mode 100644 new mode 100755 index 80531a6315..98fe8aa569 Binary files a/graphics/pokemon/tatsugiri/curly/icon.png and b/graphics/pokemon/tatsugiri/curly/icon.png differ diff --git a/graphics/pokemon/tatsugiri/droopy/icon.png b/graphics/pokemon/tatsugiri/droopy/icon.png old mode 100644 new mode 100755 index 80531a6315..48e8c01fd0 Binary files a/graphics/pokemon/tatsugiri/droopy/icon.png and b/graphics/pokemon/tatsugiri/droopy/icon.png differ diff --git a/graphics/pokemon/tatsugiri/front.png b/graphics/pokemon/tatsugiri/front.png deleted file mode 100644 index d4c4512541..0000000000 Binary files a/graphics/pokemon/tatsugiri/front.png and /dev/null differ diff --git a/graphics/pokemon/tatsugiri/icon.png b/graphics/pokemon/tatsugiri/icon.png deleted file mode 100644 index 80531a6315..0000000000 Binary files a/graphics/pokemon/tatsugiri/icon.png and /dev/null differ diff --git a/graphics/pokemon/tatsugiri/normal.pal b/graphics/pokemon/tatsugiri/normal.pal deleted file mode 100644 index 09f36e1ae8..0000000000 --- a/graphics/pokemon/tatsugiri/normal.pal +++ /dev/null @@ -1,15 +0,0 @@ -JASC-PAL -0100 -12 -153 211 165 -136 36 52 -255 74 121 -247 140 161 -195 53 93 -16 16 16 -113 98 84 -240 235 223 -194 171 151 -255 255 255 -128 128 128 -253 253 253 diff --git a/graphics/pokemon/tatsugiri/shiny.pal b/graphics/pokemon/tatsugiri/shiny.pal deleted file mode 100644 index ffa14a905a..0000000000 --- a/graphics/pokemon/tatsugiri/shiny.pal +++ /dev/null @@ -1,15 +0,0 @@ -JASC-PAL -0100 -12 -153 211 165 -143 142 145 -229 229 229 -251 251 251 -172 172 172 -16 16 16 -113 98 84 -240 235 223 -194 171 151 -255 255 255 -128 128 128 -253 253 253 diff --git a/graphics/pokemon/tatsugiri/stretchy/icon.png b/graphics/pokemon/tatsugiri/stretchy/icon.png old mode 100644 new mode 100755 index 80531a6315..1634ec3178 Binary files a/graphics/pokemon/tatsugiri/stretchy/icon.png and b/graphics/pokemon/tatsugiri/stretchy/icon.png differ diff --git a/graphics/pokemon/tauros_paldea_combat/aqua/back.png b/graphics/pokemon/tauros/aqua/back.png similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/aqua/back.png rename to graphics/pokemon/tauros/aqua/back.png diff --git a/graphics/pokemon/tauros/aqua/front.png b/graphics/pokemon/tauros/aqua/front.png new file mode 100644 index 0000000000..7cb62beeb3 Binary files /dev/null and b/graphics/pokemon/tauros/aqua/front.png differ diff --git a/graphics/pokemon/tauros/aqua/icon.png b/graphics/pokemon/tauros/aqua/icon.png new file mode 100755 index 0000000000..a0421d7dd0 Binary files /dev/null and b/graphics/pokemon/tauros/aqua/icon.png differ diff --git a/graphics/pokemon/tauros/aqua/normal.pal b/graphics/pokemon/tauros/aqua/normal.pal new file mode 100644 index 0000000000..fa707bea04 --- /dev/null +++ b/graphics/pokemon/tauros/aqua/normal.pal @@ -0,0 +1,18 @@ +JASC-PAL +0100 +15 +153 210 164 +79 79 79 +7 7 7 +53 53 53 +12 26 16 +53 53 53 +104 104 104 +96 96 96 +248 248 248 +185 185 185 +17 17 17 +137 137 137 +67 79 70 +0 104 155 +0 170 227 diff --git a/graphics/pokemon/tauros_paldea_combat/aqua/shiny.pal b/graphics/pokemon/tauros/aqua/shiny.pal similarity index 98% rename from graphics/pokemon/tauros_paldea_combat/aqua/shiny.pal rename to graphics/pokemon/tauros/aqua/shiny.pal index d4c4b626d0..8ff98dcdac 100644 --- a/graphics/pokemon/tauros_paldea_combat/aqua/shiny.pal +++ b/graphics/pokemon/tauros/aqua/shiny.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -16 +15 153 210 164 53 53 53 7 7 7 diff --git a/graphics/pokemon/tauros_paldea_combat/blaze/back.png b/graphics/pokemon/tauros/blaze/back.png similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/blaze/back.png rename to graphics/pokemon/tauros/blaze/back.png diff --git a/graphics/pokemon/tauros_paldea_combat/blaze/front.ase b/graphics/pokemon/tauros/blaze/front.ase similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/blaze/front.ase rename to graphics/pokemon/tauros/blaze/front.ase diff --git a/graphics/pokemon/tauros/blaze/front.png b/graphics/pokemon/tauros/blaze/front.png new file mode 100644 index 0000000000..a01c02df30 Binary files /dev/null and b/graphics/pokemon/tauros/blaze/front.png differ diff --git a/graphics/pokemon/tauros/blaze/icon.png b/graphics/pokemon/tauros/blaze/icon.png new file mode 100755 index 0000000000..25ec7e0463 Binary files /dev/null and b/graphics/pokemon/tauros/blaze/icon.png differ diff --git a/graphics/pokemon/tauros_paldea_combat/blaze/normal.pal b/graphics/pokemon/tauros/blaze/normal.pal similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/blaze/normal.pal rename to graphics/pokemon/tauros/blaze/normal.pal diff --git a/graphics/pokemon/tauros_paldea_combat/blaze/shiny.pal b/graphics/pokemon/tauros/blaze/shiny.pal similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/blaze/shiny.pal rename to graphics/pokemon/tauros/blaze/shiny.pal diff --git a/graphics/pokemon/tauros_paldea_combat/back.png b/graphics/pokemon/tauros/combat/back.png similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/back.png rename to graphics/pokemon/tauros/combat/back.png diff --git a/graphics/pokemon/tauros_paldea_combat/front.png b/graphics/pokemon/tauros/combat/front.png similarity index 100% rename from graphics/pokemon/tauros_paldea_combat/front.png rename to graphics/pokemon/tauros/combat/front.png diff --git a/graphics/pokemon/tauros/combat/icon.png b/graphics/pokemon/tauros/combat/icon.png new file mode 100755 index 0000000000..daa2eb7882 Binary files /dev/null and b/graphics/pokemon/tauros/combat/icon.png differ diff --git a/graphics/pokemon/tauros_paldea_combat/normal.pal b/graphics/pokemon/tauros/combat/normal.pal similarity index 85% rename from graphics/pokemon/tauros_paldea_combat/normal.pal rename to graphics/pokemon/tauros/combat/normal.pal index fabc119a79..f59738f9f2 100644 --- a/graphics/pokemon/tauros_paldea_combat/normal.pal +++ b/graphics/pokemon/tauros/combat/normal.pal @@ -13,7 +13,3 @@ JASC-PAL 185 185 185 104 104 104 248 248 248 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/tauros_paldea_combat/shiny.pal b/graphics/pokemon/tauros/combat/shiny.pal similarity index 85% rename from graphics/pokemon/tauros_paldea_combat/shiny.pal rename to graphics/pokemon/tauros/combat/shiny.pal index 8e8c4d4424..ce3ef3e7b4 100644 --- a/graphics/pokemon/tauros_paldea_combat/shiny.pal +++ b/graphics/pokemon/tauros/combat/shiny.pal @@ -13,7 +13,3 @@ JASC-PAL 185 185 185 67 79 70 248 248 248 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/tauros_paldea_combat/aqua/front.png b/graphics/pokemon/tauros_paldea_combat/aqua/front.png deleted file mode 100644 index 872a955f0e..0000000000 Binary files a/graphics/pokemon/tauros_paldea_combat/aqua/front.png and /dev/null differ diff --git a/graphics/pokemon/ting_lu/icon.png b/graphics/pokemon/ting_lu/icon.png old mode 100644 new mode 100755 index 80531a6315..0b1f975f9e Binary files a/graphics/pokemon/ting_lu/icon.png and b/graphics/pokemon/ting_lu/icon.png differ diff --git a/graphics/pokemon/tinkatink/back.png b/graphics/pokemon/tinkatink/back.png new file mode 100644 index 0000000000..fee9dde3f4 Binary files /dev/null and b/graphics/pokemon/tinkatink/back.png differ diff --git a/graphics/pokemon/tinkatink/front.png b/graphics/pokemon/tinkatink/front.png new file mode 100644 index 0000000000..e7a8572718 Binary files /dev/null and b/graphics/pokemon/tinkatink/front.png differ diff --git a/graphics/pokemon/tinkatink/normal.pal b/graphics/pokemon/tinkatink/normal.pal new file mode 100644 index 0000000000..17c6a23415 --- /dev/null +++ b/graphics/pokemon/tinkatink/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 214 164 +197 48 90 +8 32 82 +246 170 197 +57 76 115 +156 125 164 +98 101 139 +156 174 197 +255 105 148 +139 20 49 +205 206 230 +115 20 74 +180 24 74 +238 234 238 +255 149 197 +255 250 255 diff --git a/graphics/pokemon/tinkatink/shiny.pal b/graphics/pokemon/tinkatink/shiny.pal new file mode 100644 index 0000000000..d5b4d15c60 --- /dev/null +++ b/graphics/pokemon/tinkatink/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 214 164 +197 48 90 +8 32 82 +246 170 197 +57 76 115 +156 125 164 +98 101 139 +221 121 37 +255 105 172 +139 20 49 +238 195 154 +115 20 74 +180 24 74 +238 234 238 +255 149 197 +255 250 255 diff --git a/graphics/pokemon/tinkaton/front.png b/graphics/pokemon/tinkaton/front.png index 1a323d2ddd..fdd1f03043 100644 Binary files a/graphics/pokemon/tinkaton/front.png and b/graphics/pokemon/tinkaton/front.png differ diff --git a/graphics/pokemon/tinkaton/icon.png b/graphics/pokemon/tinkaton/icon.png old mode 100644 new mode 100755 index 80531a6315..72ab26b86b Binary files a/graphics/pokemon/tinkaton/icon.png and b/graphics/pokemon/tinkaton/icon.png differ diff --git a/graphics/pokemon/tinkatuff/back.png b/graphics/pokemon/tinkatuff/back.png new file mode 100644 index 0000000000..df22166f2d Binary files /dev/null and b/graphics/pokemon/tinkatuff/back.png differ diff --git a/graphics/pokemon/tinkatuff/front.png b/graphics/pokemon/tinkatuff/front.png new file mode 100644 index 0000000000..74a6fcc06c Binary files /dev/null and b/graphics/pokemon/tinkatuff/front.png differ diff --git a/graphics/pokemon/tinkatuff/icon.png b/graphics/pokemon/tinkatuff/icon.png new file mode 100755 index 0000000000..7ab30334fa Binary files /dev/null and b/graphics/pokemon/tinkatuff/icon.png differ diff --git a/graphics/pokemon/tinkatuff/normal.pal b/graphics/pokemon/tinkatuff/normal.pal new file mode 100644 index 0000000000..91e8f61dbd --- /dev/null +++ b/graphics/pokemon/tinkatuff/normal.pal @@ -0,0 +1,17 @@ +JASC-PAL +0100 +14 +38 210 161 +10 9 5 +255 212 213 +67 56 69 +216 169 174 +255 149 189 +150 115 154 +255 86 151 +253 56 120 +187 163 201 +136 46 69 +16 25 8 +159 121 160 +110 37 57 diff --git a/graphics/pokemon/toedscool/icon.png b/graphics/pokemon/toedscool/icon.png new file mode 100755 index 0000000000..91edeb2472 Binary files /dev/null and b/graphics/pokemon/toedscool/icon.png differ diff --git a/graphics/pokemon/toedscruel/icon.png b/graphics/pokemon/toedscruel/icon.png new file mode 100755 index 0000000000..fe3f98f9fa Binary files /dev/null and b/graphics/pokemon/toedscruel/icon.png differ diff --git a/graphics/pokemon/varoom/icon.png b/graphics/pokemon/varoom/icon.png new file mode 100755 index 0000000000..7debadffde Binary files /dev/null and b/graphics/pokemon/varoom/icon.png differ diff --git a/graphics/pokemon/veluza/icon.png b/graphics/pokemon/veluza/icon.png new file mode 100755 index 0000000000..6d06051669 Binary files /dev/null and b/graphics/pokemon/veluza/icon.png differ diff --git a/graphics/pokemon/wattrel/icon.png b/graphics/pokemon/wattrel/icon.png new file mode 100755 index 0000000000..a0a8bc9d49 Binary files /dev/null and b/graphics/pokemon/wattrel/icon.png differ diff --git a/graphics/pokemon/wiglett/icon.png b/graphics/pokemon/wiglett/icon.png new file mode 100755 index 0000000000..668309c68e Binary files /dev/null and b/graphics/pokemon/wiglett/icon.png differ diff --git a/graphics/pokemon/wo_chien/icon.png b/graphics/pokemon/wo_chien/icon.png old mode 100644 new mode 100755 index 80531a6315..22402d15c5 Binary files a/graphics/pokemon/wo_chien/icon.png and b/graphics/pokemon/wo_chien/icon.png differ diff --git a/graphics/pokemon/wooper_paldea/back.png b/graphics/pokemon/wooper/wooper_paldea/back.png similarity index 100% rename from graphics/pokemon/wooper_paldea/back.png rename to graphics/pokemon/wooper/wooper_paldea/back.png diff --git a/graphics/pokemon/wooper_paldea/front.png b/graphics/pokemon/wooper/wooper_paldea/front.png similarity index 100% rename from graphics/pokemon/wooper_paldea/front.png rename to graphics/pokemon/wooper/wooper_paldea/front.png diff --git a/graphics/pokemon/wooper_paldea/normal.pal b/graphics/pokemon/wooper/wooper_paldea/normal.pal similarity index 89% rename from graphics/pokemon/wooper_paldea/normal.pal rename to graphics/pokemon/wooper/wooper_paldea/normal.pal index 2dc8aa092d..2652aa5a76 100644 --- a/graphics/pokemon/wooper_paldea/normal.pal +++ b/graphics/pokemon/wooper/wooper_paldea/normal.pal @@ -14,6 +14,3 @@ JASC-PAL 46 36 35 180 65 65 255 106 115 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/wooper_paldea/shiny.pal b/graphics/pokemon/wooper/wooper_paldea/shiny.pal similarity index 90% rename from graphics/pokemon/wooper_paldea/shiny.pal rename to graphics/pokemon/wooper/wooper_paldea/shiny.pal index 4f9d6e715f..3df4f0efa8 100644 --- a/graphics/pokemon/wooper_paldea/shiny.pal +++ b/graphics/pokemon/wooper/wooper_paldea/shiny.pal @@ -14,6 +14,3 @@ JASC-PAL 46 36 35 180 65 65 255 106 115 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/wugtrio/icon.png b/graphics/pokemon/wugtrio/icon.png new file mode 100755 index 0000000000..1b67044787 Binary files /dev/null and b/graphics/pokemon/wugtrio/icon.png differ diff --git a/include/graphics.h b/include/graphics.h index 7aff93733f..93339833bc 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -215,6 +215,24 @@ extern const u32 gMonFrontPic_Electabuzz[]; extern const u32 gMonFrontPic_Magmar[]; extern const u32 gMonFrontPic_Pinsir[]; extern const u32 gMonFrontPic_Tauros[]; +extern const u32 gMonFrontPic_TaurosCombatBreed[]; +extern const u32 gMonPalette_TaurosCombatBreed[]; +extern const u32 gMonBackPic_TaurosCombatBreed[]; +extern const u32 gMonShinyPalette_TaurosCombatBreed[]; +extern const u8 gMonIcon_TaurosCombatBreed[]; +// extern const u8 gMonFootprint_TaurosCombatBreed[]; +extern const u32 gMonFrontPic_TaurosBlazeBreed[]; +extern const u32 gMonPalette_TaurosBlazeBreed[]; +extern const u32 gMonBackPic_TaurosBlazeBreed[]; +extern const u32 gMonShinyPalette_TaurosBlazeBreed[]; +extern const u8 gMonIcon_TaurosBlazeBreed[]; +// extern const u8 gMonFootprint_TaurosBlazeBreed[]; +extern const u32 gMonFrontPic_TaurosAquaBreed[]; +extern const u32 gMonPalette_TaurosAquaBreed[]; +extern const u32 gMonBackPic_TaurosAquaBreed[]; +extern const u32 gMonShinyPalette_TaurosAquaBreed[]; +extern const u8 gMonIcon_TaurosAquaBreed[]; +// extern const u8 gMonFootprint_TaurosAquaBreed[]; extern const u32 gMonFrontPic_Magikarp[]; extern const u32 gMonFrontPic_MagikarpF[]; extern const u32 gMonFrontPic_Gyarados[]; @@ -292,6 +310,12 @@ extern const u32 gMonFrontPic_Sunflora[]; extern const u32 gMonFrontPic_Yanma[]; extern const u32 gMonFrontPic_Wooper[]; extern const u32 gMonFrontPic_WooperF[]; +extern const u32 gMonFrontPic_WooperPaldean[]; +extern const u32 gMonPalette_WooperPaldean[]; +extern const u32 gMonBackPic_WooperPaldean[]; +extern const u32 gMonShinyPalette_WooperPaldean[]; +extern const u8 gMonIcon_WooperPaldean[]; +extern const u8 gMonFootprint_WooperPaldean[]; extern const u32 gMonFrontPic_Quagsire[]; extern const u32 gMonFrontPic_QuagsireF[]; extern const u32 gMonFrontPic_Espeon[]; @@ -7205,6 +7229,11 @@ extern const u8 gMonFootprint_Mr_Rime[]; extern const u8 gMonFootprint_Runerigus[]; extern const u8 gMonFootprint_Milcery[]; extern const u8 gMonFootprint_Alcremie[]; +extern const u32 gMonFrontPic_Falinks[]; +extern const u32 gMonPalette_Falinks[]; +extern const u32 gMonBackPic_Falinks[]; +extern const u32 gMonShinyPalette_Falinks[]; +extern const u8 gMonIcon_Falinks[]; extern const u8 gMonFootprint_Falinks[]; extern const u8 gMonFootprint_Pincurchin[]; extern const u8 gMonFootprint_Snom[]; @@ -7309,6 +7338,12 @@ extern const u32 gMonBackPic_Oinkologne[]; extern const u32 gMonShinyPalette_Oinkologne[]; extern const u8 gMonIcon_Oinkologne[]; extern const u8 gMonFootprint_Oinkologne[]; +extern const u32 gMonFrontPic_OinkologneFemale[]; +extern const u32 gMonPalette_OinkologneFemale[]; +extern const u32 gMonBackPic_OinkologneFemale[]; +extern const u32 gMonShinyPalette_OinkologneFemale[]; +extern const u8 gMonIcon_OinkologneFemale[]; +extern const u8 gMonFootprint_OinkologneFemale[]; extern const u32 gMonFrontPic_Tarountula[]; extern const u32 gMonPalette_Tarountula[]; extern const u32 gMonBackPic_Tarountula[]; @@ -7363,6 +7398,9 @@ extern const u32 gMonBackPic_Maushold[]; extern const u32 gMonShinyPalette_Maushold[]; extern const u8 gMonIcon_Maushold[]; extern const u8 gMonFootprint_Maushold[]; +extern const u32 gMonFrontPic_MausholdThree[]; +extern const u32 gMonBackPic_MausholdThree[]; +extern const u32 gMonIcon_MausholdThree[]; extern const u32 gMonFrontPic_Fidough[]; extern const u32 gMonPalette_Fidough[]; extern const u32 gMonBackPic_Fidough[]; @@ -7394,16 +7432,19 @@ extern const u32 gMonShinyPalette_Arboliva[]; extern const u8 gMonIcon_Arboliva[]; extern const u8 gMonFootprint_Arboliva[]; extern const u32 gMonFrontPic_Squawkabilly[]; -extern const u32 gMonPalette_Squawkabilly[]; +extern const u32 gMonPalette_SquawkabillyGreenPlumage[]; extern const u32 gMonPalette_SquawkabillyBluePlumage[]; extern const u32 gMonPalette_SquawkabillyYellowPlumage[]; extern const u32 gMonPalette_SquawkabillyWhitePlumage[]; extern const u32 gMonBackPic_Squawkabilly[]; -extern const u32 gMonShinyPalette_Squawkabilly[]; +extern const u32 gMonShinyPalette_SquawkabillyGreenPlumage[]; extern const u32 gMonShinyPalette_SquawkabillyBluePlumage[]; extern const u32 gMonShinyPalette_SquawkabillyYellowPlumage[]; extern const u32 gMonShinyPalette_SquawkabillyWhitePlumage[]; -extern const u8 gMonIcon_Squawkabilly[]; +extern const u8 gMonIcon_SquawkabillyGreenPlumage[]; +extern const u8 gMonIcon_SquawkabillyBluePlumage[]; +extern const u8 gMonIcon_SquawkabillyYellowPlumage[]; +extern const u8 gMonIcon_SquawkabillyWhitePlumage[]; extern const u8 gMonFootprint_Squawkabilly[]; extern const u32 gMonFrontPic_Nacli[]; extern const u32 gMonPalette_Nacli[]; @@ -7602,7 +7643,13 @@ extern const u32 gMonPalette_Palafin[]; extern const u32 gMonBackPic_Palafin[]; extern const u32 gMonShinyPalette_Palafin[]; extern const u8 gMonIcon_Palafin[]; -extern const u8 gMonFootprint_Palafin[]; +extern const u8 gMonFootprint_PalafinHero[]; +extern const u32 gMonFrontPic_PalafinHero[]; +extern const u32 gMonPalette_PalafinHero[]; +extern const u32 gMonBackPic_PalafinHero[]; +extern const u32 gMonShinyPalette_PalafinHero[]; +extern const u8 gMonIcon_PalafinHero[]; +extern const u8 gMonFootprint_PalafinHero[]; extern const u32 gMonFrontPic_Varoom[]; extern const u32 gMonPalette_Varoom[]; extern const u32 gMonBackPic_Varoom[]; @@ -7693,7 +7740,9 @@ extern const u32 gMonBackPic_TatsugiriStretchy[]; extern const u32 gMonShinyPalette_TatsugiriCurly[]; extern const u32 gMonShinyPalette_TatsugiriDroopy[]; extern const u32 gMonShinyPalette_TatsugiriStretchy[]; -extern const u8 gMonIcon_Tatsugiri[]; +extern const u8 gMonIcon_TatsugiriCurly[]; +extern const u8 gMonIcon_TatsugiriDroopy[]; +extern const u8 gMonIcon_TatsugiriStretchy[]; extern const u8 gMonFootprint_Tatsugiri[]; extern const u32 gMonFrontPic_Annihilape[]; extern const u32 gMonPalette_Annihilape[]; @@ -7719,6 +7768,8 @@ extern const u32 gMonBackPic_Dudunsparce[]; extern const u32 gMonShinyPalette_Dudunsparce[]; extern const u8 gMonIcon_Dudunsparce[]; extern const u8 gMonFootprint_Dudunsparce[]; +extern const u32 gMonFrontPic_DudunsparceThreeSegment[]; +extern const u32 gMonBackPic_DudunsparceThreeSegment[]; extern const u32 gMonFrontPic_Kingambit[]; extern const u32 gMonPalette_Kingambit[]; extern const u32 gMonBackPic_Kingambit[]; @@ -7821,6 +7872,10 @@ extern const u32 gMonBackPic_Gimmighoul[]; extern const u32 gMonShinyPalette_Gimmighoul[]; extern const u8 gMonIcon_Gimmighoul[]; extern const u8 gMonFootprint_Gimmighoul[]; +extern const u32 gMonFrontPic_GimmighoulRoaming[]; +extern const u32 gMonPalette_GimmighoulRoaming[]; +extern const u32 gMonBackPic_GimmighoulRoaming[]; +extern const u32 gMonShinyPalette_GimmighoulRoaming[]; extern const u32 gMonFrontPic_Gholdengo[]; extern const u32 gMonPalette_Gholdengo[]; extern const u32 gMonBackPic_Gholdengo[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 110a986451..d5714614dc 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -1440,109 +1440,109 @@ gCryTable:: cry Cry_Unown .endif .if P_GEN_9_POKEMON == TRUE - cry Cry_Unown //Cry_Sprigatito - cry Cry_Unown //Cry_Floragato - cry Cry_Unown //Cry_Meowscarada - cry Cry_Unown //Cry_Fuecoco - cry Cry_Unown //Cry_Crocalor - cry Cry_Unown //Cry_Skeledirge - cry Cry_Unown //Cry_Quaxly - cry Cry_Unown //Cry_Quaxwell - cry Cry_Unown //Cry_Quaquaval - cry Cry_Unown //Cry_Lechonk - cry Cry_Unown //Cry_Oinkologne - cry Cry_Unown //Cry_Tarountula - cry Cry_Unown //Cry_Spidops - cry Cry_Unown //Cry_Nymble - cry Cry_Unown //Cry_Lokix - cry Cry_Unown //Cry_Pawmi - cry Cry_Unown //Cry_Pawmo - cry Cry_Unown //Cry_Pawmot - cry Cry_Unown //Cry_Tandemaus - cry Cry_Unown //Cry_Maushold - cry Cry_Unown //Cry_Fidough - cry Cry_Unown //Cry_Dachsbun - cry Cry_Unown //Cry_Smoliv - cry Cry_Unown //Cry_Dolliv - cry Cry_Unown //Cry_Arboliva - cry Cry_Unown //Cry_Squawkabilly - cry Cry_Unown //Cry_Nacli - cry Cry_Unown //Cry_Naclstack - cry Cry_Unown //Cry_Garganacl - cry Cry_Unown //Cry_Charcadet - cry Cry_Unown //Cry_Armarouge - cry Cry_Unown //Cry_Ceruledge - cry Cry_Unown //Cry_Tadbulb - cry Cry_Unown //Cry_Bellibolt - cry Cry_Unown //Cry_Wattrel - cry Cry_Unown //Cry_Kilowattrel - cry Cry_Unown //Cry_Maschiff - cry Cry_Unown //Cry_Mabosstiff - cry Cry_Unown //Cry_Shroodle - cry Cry_Unown //Cry_Grafaiai - cry Cry_Unown //Cry_Bramblin - cry Cry_Unown //Cry_Brambleghast - cry Cry_Unown //Cry_Toedscool - cry Cry_Unown //Cry_Toedscruel - cry Cry_Unown //Cry_Klawf - cry Cry_Unown //Cry_Capsakid - cry Cry_Unown //Cry_Scovillain - cry Cry_Unown //Cry_Rellor - cry Cry_Unown //Cry_Rabsca - cry Cry_Unown //Cry_Flittle - cry Cry_Unown //Cry_Espathra - cry Cry_Unown //Cry_Tinkatink - cry Cry_Unown //Cry_Tinkatuff - cry Cry_Unown //Cry_Tinkaton - cry Cry_Unown //Cry_Wiglett - cry Cry_Unown //Cry_Wugtrio - cry Cry_Unown //Cry_Bombirdier - cry Cry_Unown //Cry_Finizen - cry Cry_Unown //Cry_Palafin - cry Cry_Unown //Cry_Varoom - cry Cry_Unown //Cry_Revavroom - cry Cry_Unown //Cry_Cyclizar - cry Cry_Unown //Cry_Orthworm - cry Cry_Unown //Cry_Glimmet - cry Cry_Unown //Cry_Glimmora - cry Cry_Unown //Cry_Greavard - cry Cry_Unown //Cry_Houndstone - cry Cry_Unown //Cry_Flamigo - cry Cry_Unown //Cry_Cetoddle - cry Cry_Unown //Cry_Cetitan - cry Cry_Unown //Cry_Veluza - cry Cry_Unown //Cry_Dondozo - cry Cry_Unown //Cry_Tatsugiri - cry Cry_Unown //Cry_Annihilape - cry Cry_Unown //Cry_Clodsire - cry Cry_Unown //Cry_Farigiraf - cry Cry_Unown //Cry_Dudunsparce - cry Cry_Unown //Cry_Kingambit - cry Cry_Unown //Cry_GreatTusk - cry Cry_Unown //Cry_ScreamTail - cry Cry_Unown //Cry_BruteBonnet - cry Cry_Unown //Cry_FlutterMane - cry Cry_Unown //Cry_SlitherWing - cry Cry_Unown //Cry_SandyShocks - cry Cry_Unown //Cry_IronTreads - cry Cry_Unown //Cry_IronBundle - cry Cry_Unown //Cry_IronHands - cry Cry_Unown //Cry_IronJugulis - cry Cry_Unown //Cry_IronMoth - cry Cry_Unown //Cry_IronThorns - cry Cry_Unown //Cry_Frigibax - cry Cry_Unown //Cry_Arctibax - cry Cry_Unown //Cry_Baxcalibur - cry Cry_Unown //Cry_Gimmighoul - cry Cry_Unown //Cry_Gholdengo - cry Cry_Unown //Cry_WoChien - cry Cry_Unown //Cry_ChienPao - cry Cry_Unown //Cry_TingLu - cry Cry_Unown //Cry_ChiYu - cry Cry_Unown //Cry_RoaringMoon - cry Cry_Unown //Cry_IronValiant - cry Cry_Unown //Cry_Koraidon - cry Cry_Unown //Cry_Miraidon + cry Cry_Sprigatito + cry Cry_Floragato + cry Cry_Meowscarada + cry Cry_Fuecoco + cry Cry_Crocalor + cry Cry_Skeledirge + cry Cry_Quaxly + cry Cry_Quaxwell + cry Cry_Quaquaval + cry Cry_Lechonk + cry Cry_Oinkologne + cry Cry_Tarountula + cry Cry_Spidops + cry Cry_Nymble + cry Cry_Lokix + cry Cry_Pawmi + cry Cry_Pawmo + cry Cry_Pawmot + cry Cry_Tandemaus + cry Cry_Maushold + cry Cry_Fidough + cry Cry_Dachsbun + cry Cry_Smoliv + cry Cry_Dolliv + cry Cry_Arboliva + cry Cry_Squawkabilly + cry Cry_Nacli + cry Cry_Naclstack + cry Cry_Garganacl + cry Cry_Charcadet + cry Cry_Armarouge + cry Cry_Ceruledge + cry Cry_Tadbulb + cry Cry_Bellibolt + cry Cry_Wattrel + cry Cry_Kilowattrel + cry Cry_Maschiff + cry Cry_Mabosstiff + cry Cry_Shroodle + cry Cry_Grafaiai + cry Cry_Bramblin + cry Cry_Brambleghast + cry Cry_Toedscool + cry Cry_Toedscruel + cry Cry_Klawf + cry Cry_Capsakid + cry Cry_Scovillain + cry Cry_Rellor + cry Cry_Rabsca + cry Cry_Flittle + cry Cry_Espathra + cry Cry_Tinkatink + cry Cry_Tinkatuff + cry Cry_Tinkaton + cry Cry_Wiglett + cry Cry_Wugtrio + cry Cry_Bombirdier + cry Cry_Finizen + cry Cry_Palafin + cry Cry_Varoom + cry Cry_Revavroom + cry Cry_Cyclizar + cry Cry_Orthworm + cry Cry_Glimmet + cry Cry_Glimmora + cry Cry_Greavard + cry Cry_Houndstone + cry Cry_Flamigo + cry Cry_Cetoddle + cry Cry_Cetitan + cry Cry_Veluza + cry Cry_Dondozo + cry Cry_Tatsugiri + cry Cry_Annihilape + cry Cry_Clodsire + cry Cry_Farigiraf + cry Cry_Dudunsparce + cry Cry_Kingambit + cry Cry_GreatTusk + cry Cry_ScreamTail + cry Cry_BruteBonnet + cry Cry_FlutterMane + cry Cry_SlitherWing + cry Cry_SandyShocks + cry Cry_IronTreads + cry Cry_IronBundle + cry Cry_IronHands + cry Cry_IronJugulis + cry Cry_IronMoth + cry Cry_IronThorns + cry Cry_Frigibax + cry Cry_Arctibax + cry Cry_Baxcalibur + cry Cry_Gimmighoul + cry Cry_Gholdengo + cry Cry_WoChien + cry Cry_ChienPao + cry Cry_TingLu + cry Cry_ChiYu + cry Cry_RoaringMoon + cry Cry_IronValiant + cry Cry_Koraidon + cry Cry_Miraidon cry Cry_Unown //Cry_WalkingWake cry Cry_Unown //Cry_IronLeaves .endif @@ -3681,111 +3681,111 @@ gCryTable_Reverse:: cry_reverse Cry_Unown .endif .if P_GEN_9_POKEMON == TRUE - cry_reverse Cry_Unown //Cry_Sprigatito - cry_reverse Cry_Unown //Cry_Floragato - cry_reverse Cry_Unown //Cry_Meowscarada - cry_reverse Cry_Unown //Cry_Fuecoco - cry_reverse Cry_Unown //Cry_Crocalor - cry_reverse Cry_Unown //Cry_Skeledirge - cry_reverse Cry_Unown //Cry_Quaxly - cry_reverse Cry_Unown //Cry_Quaxwell - cry_reverse Cry_Unown //Cry_Quaquaval - cry_reverse Cry_Unown //Cry_Lechonk - cry_reverse Cry_Unown //Cry_Oinkologne - cry_reverse Cry_Unown //Cry_Tarountula - cry_reverse Cry_Unown //Cry_Spidops - cry_reverse Cry_Unown //Cry_Nymble - cry_reverse Cry_Unown //Cry_Lokix - cry_reverse Cry_Unown //Cry_Pawmi - cry_reverse Cry_Unown //Cry_Pawmo - cry_reverse Cry_Unown //Cry_Pawmot - cry_reverse Cry_Unown //Cry_Tandemaus - cry_reverse Cry_Unown //Cry_Maushold - cry_reverse Cry_Unown //Cry_Fidough - cry_reverse Cry_Unown //Cry_Dachsbun - cry_reverse Cry_Unown //Cry_Smoliv - cry_reverse Cry_Unown //Cry_Dolliv - cry_reverse Cry_Unown //Cry_Arboliva - cry_reverse Cry_Unown //Cry_Squawkabilly - cry_reverse Cry_Unown //Cry_Nacli - cry_reverse Cry_Unown //Cry_Naclstack - cry_reverse Cry_Unown //Cry_Garganacl - cry_reverse Cry_Unown //Cry_Charcadet - cry_reverse Cry_Unown //Cry_Armarouge - cry_reverse Cry_Unown //Cry_Ceruledge - cry_reverse Cry_Unown //Cry_Tadbulb - cry_reverse Cry_Unown //Cry_Bellibolt - cry_reverse Cry_Unown //Cry_Wattrel - cry_reverse Cry_Unown //Cry_Kilowattrel - cry_reverse Cry_Unown //Cry_Maschiff - cry_reverse Cry_Unown //Cry_Mabosstiff - cry_reverse Cry_Unown //Cry_Shroodle - cry_reverse Cry_Unown //Cry_Grafaiai - cry_reverse Cry_Unown //Cry_Bramblin - cry_reverse Cry_Unown //Cry_Brambleghast - cry_reverse Cry_Unown //Cry_Toedscool - cry_reverse Cry_Unown //Cry_Toedscruel - cry_reverse Cry_Unown //Cry_Klawf - cry_reverse Cry_Unown //Cry_Capsakid - cry_reverse Cry_Unown //Cry_Scovillain - cry_reverse Cry_Unown //Cry_Rellor - cry_reverse Cry_Unown //Cry_Rabsca - cry_reverse Cry_Unown //Cry_Flittle - cry_reverse Cry_Unown //Cry_Espathra - cry_reverse Cry_Unown //Cry_Tinkatink - cry_reverse Cry_Unown //Cry_Tinkatuff - cry_reverse Cry_Unown //Cry_Tinkaton - cry_reverse Cry_Unown //Cry_Wiglett - cry_reverse Cry_Unown //Cry_Wugtrio - cry_reverse Cry_Unown //Cry_Bombirdier - cry_reverse Cry_Unown //Cry_Finizen - cry_reverse Cry_Unown //Cry_Palafin - cry_reverse Cry_Unown //Cry_Varoom - cry_reverse Cry_Unown //Cry_Revavroom - cry_reverse Cry_Unown //Cry_Cyclizar - cry_reverse Cry_Unown //Cry_Orthworm - cry_reverse Cry_Unown //Cry_Glimmet - cry_reverse Cry_Unown //Cry_Glimmora - cry_reverse Cry_Unown //Cry_Greavard - cry_reverse Cry_Unown //Cry_Houndstone - cry_reverse Cry_Unown //Cry_Flamigo - cry_reverse Cry_Unown //Cry_Cetoddle - cry_reverse Cry_Unown //Cry_Cetitan - cry_reverse Cry_Unown //Cry_Veluza - cry_reverse Cry_Unown //Cry_Dondozo - cry_reverse Cry_Unown //Cry_Tatsugiri - cry_reverse Cry_Unown //Cry_Annihilape - cry_reverse Cry_Unown //Cry_Clodsire - cry_reverse Cry_Unown //Cry_Farigiraf - cry_reverse Cry_Unown //Cry_Dudunsparce - cry_reverse Cry_Unown //Cry_Kingambit - cry_reverse Cry_Unown //Cry_GreatTusk - cry_reverse Cry_Unown //Cry_ScreamTail - cry_reverse Cry_Unown //Cry_BruteBonnet - cry_reverse Cry_Unown //Cry_FlutterMane - cry_reverse Cry_Unown //Cry_SlitherWing - cry_reverse Cry_Unown //Cry_SandyShocks - cry_reverse Cry_Unown //Cry_IronTreads - cry_reverse Cry_Unown //Cry_IronBundle - cry_reverse Cry_Unown //Cry_IronHands - cry_reverse Cry_Unown //Cry_IronJugulis - cry_reverse Cry_Unown //Cry_IronMoth - cry_reverse Cry_Unown //Cry_IronThorns - cry_reverse Cry_Unown //Cry_Frigibax - cry_reverse Cry_Unown //Cry_Arctibax - cry_reverse Cry_Unown //Cry_Baxcalibur - cry_reverse Cry_Unown //Cry_Gimmighoul - cry_reverse Cry_Unown //Cry_Gholdengo - cry_reverse Cry_Unown //Cry_WoChien - cry_reverse Cry_Unown //Cry_ChienPao - cry_reverse Cry_Unown //Cry_TingLu - cry_reverse Cry_Unown //Cry_ChiYu - cry_reverse Cry_Unown //Cry_RoaringMoon - cry_reverse Cry_Unown //Cry_IronValiant - cry_reverse Cry_Unown //Cry_Koraidon - cry_reverse Cry_Unown //Cry_Miraidon - cry_reverse Cry_Unown //Cry_WalkingWake - cry_reverse Cry_Unown //Cry_IronLeaves + cry_reverse Cry_Sprigatito + cry_reverse Cry_Floragato + cry_reverse Cry_Meowscarada + cry_reverse Cry_Fuecoco + cry_reverse Cry_Crocalor + cry_reverse Cry_Skeledirge + cry_reverse Cry_Quaxly + cry_reverse Cry_Quaxwell + cry_reverse Cry_Quaquaval + cry_reverse Cry_Lechonk + cry_reverse Cry_Oinkologne + cry_reverse Cry_Tarountula + cry_reverse Cry_Spidops + cry_reverse Cry_Nymble + cry_reverse Cry_Lokix + cry_reverse Cry_Pawmi + cry_reverse Cry_Pawmo + cry_reverse Cry_Pawmot + cry_reverse Cry_Tandemaus + cry_reverse Cry_Maushold + cry_reverse Cry_Fidough + cry_reverse Cry_Dachsbun + cry_reverse Cry_Smoliv + cry_reverse Cry_Dolliv + cry_reverse Cry_Arboliva + cry_reverse Cry_Squawkabilly + cry_reverse Cry_Nacli + cry_reverse Cry_Naclstack + cry_reverse Cry_Garganacl + cry_reverse Cry_Charcadet + cry_reverse Cry_Armarouge + cry_reverse Cry_Ceruledge + cry_reverse Cry_Tadbulb + cry_reverse Cry_Bellibolt + cry_reverse Cry_Wattrel + cry_reverse Cry_Kilowattrel + cry_reverse Cry_Maschiff + cry_reverse Cry_Mabosstiff + cry_reverse Cry_Shroodle + cry_reverse Cry_Grafaiai + cry_reverse Cry_Bramblin + cry_reverse Cry_Brambleghast + cry_reverse Cry_Toedscool + cry_reverse Cry_Toedscruel + cry_reverse Cry_Klawf + cry_reverse Cry_Capsakid + cry_reverse Cry_Scovillain + cry_reverse Cry_Rellor + cry_reverse Cry_Rabsca + cry_reverse Cry_Flittle + cry_reverse Cry_Espathra + cry_reverse Cry_Tinkatink + cry_reverse Cry_Tinkatuff + cry_reverse Cry_Tinkaton + cry_reverse Cry_Wiglett + cry_reverse Cry_Wugtrio + cry_reverse Cry_Bombirdier + cry_reverse Cry_Finizen + cry_reverse Cry_Palafin + cry_reverse Cry_Varoom + cry_reverse Cry_Revavroom + cry_reverse Cry_Cyclizar + cry_reverse Cry_Orthworm + cry_reverse Cry_Glimmet + cry_reverse Cry_Glimmora + cry_reverse Cry_Greavard + cry_reverse Cry_Houndstone + cry_reverse Cry_Flamigo + cry_reverse Cry_Cetoddle + cry_reverse Cry_Cetitan + cry_reverse Cry_Veluza + cry_reverse Cry_Dondozo + cry_reverse Cry_Tatsugiri + cry_reverse Cry_Annihilape + cry_reverse Cry_Clodsire + cry_reverse Cry_Farigiraf + cry_reverse Cry_Dudunsparce + cry_reverse Cry_Kingambit + cry_reverse Cry_GreatTusk + cry_reverse Cry_ScreamTail + cry_reverse Cry_BruteBonnet + cry_reverse Cry_FlutterMane + cry_reverse Cry_SlitherWing + cry_reverse Cry_SandyShocks + cry_reverse Cry_IronTreads + cry_reverse Cry_IronBundle + cry_reverse Cry_IronHands + cry_reverse Cry_IronJugulis + cry_reverse Cry_IronMoth + cry_reverse Cry_IronThorns + cry_reverse Cry_Frigibax + cry_reverse Cry_Arctibax + cry_reverse Cry_Baxcalibur + cry_reverse Cry_Gimmighoul + cry_reverse Cry_Gholdengo + cry_reverse Cry_WoChien + cry_reverse Cry_ChienPao + cry_reverse Cry_TingLu + cry_reverse Cry_ChiYu + cry_reverse Cry_RoaringMoon + cry_reverse Cry_IronValiant + cry_reverse Cry_Koraidon + cry_reverse Cry_Miraidon +// cry_reverse Cry_WalkingWake +// cry_reverse Cry_IronLeaves .endif @ Megas cry_reverse Cry_VenusaurMega diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 35a1ec0c6c..9f8c7bbab1 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -4366,417 +4366,417 @@ Cry_CalyrexShadowRider:: .endif .if P_GEN_9_POKEMON == TRUE -// .align 2 -//Cry_Sprigatito:: -// .incbin "sound/direct_sound_samples/cries/sprigatito.bin" + .align 2 +Cry_Sprigatito:: + .incbin "sound/direct_sound_samples/cries/sprigatito.bin" -// .align 2 -//Cry_Floragato:: -// .incbin "sound/direct_sound_samples/cries/floragato.bin" + .align 2 +Cry_Floragato:: + .incbin "sound/direct_sound_samples/cries/floragato.bin" -// .align 2 -//Cry_Meowscarada:: -// .incbin "sound/direct_sound_samples/cries/meowscarada.bin" + .align 2 +Cry_Meowscarada:: + .incbin "sound/direct_sound_samples/cries/meowscarada.bin" -// .align 2 -//Cry_Fuecoco:: -// .incbin "sound/direct_sound_samples/cries/fuecoco.bin" + .align 2 +Cry_Fuecoco:: + .incbin "sound/direct_sound_samples/cries/fuecoco.bin" -// .align 2 -//Cry_Crocalor:: -// .incbin "sound/direct_sound_samples/cries/crocalor.bin" + .align 2 +Cry_Crocalor:: + .incbin "sound/direct_sound_samples/cries/crocalor.bin" -// .align 2 -//Cry_Skeledirge:: -// .incbin "sound/direct_sound_samples/cries/skeledirge.bin" + .align 2 +Cry_Skeledirge:: + .incbin "sound/direct_sound_samples/cries/skeledirge.bin" -// .align 2 -//Cry_Quaxly:: -// .incbin "sound/direct_sound_samples/cries/quaxly.bin" + .align 2 +Cry_Quaxly:: + .incbin "sound/direct_sound_samples/cries/quaxly.bin" -// .align 2 -//Cry_Quaxwell:: -// .incbin "sound/direct_sound_samples/cries/quaxwell.bin" + .align 2 +Cry_Quaxwell:: + .incbin "sound/direct_sound_samples/cries/quaxwell.bin" -// .align 2 -//Cry_Quaquaval:: -// .incbin "sound/direct_sound_samples/cries/quaquaval.bin" + .align 2 +Cry_Quaquaval:: + .incbin "sound/direct_sound_samples/cries/quaquaval.bin" -// .align 2 -//Cry_Lechonk:: -// .incbin "sound/direct_sound_samples/cries/lechonk.bin" + .align 2 +Cry_Lechonk:: + .incbin "sound/direct_sound_samples/cries/lechonk.bin" -// .align 2 -//Cry_Oinkologne:: -// .incbin "sound/direct_sound_samples/cries/oinkologne.bin" + .align 2 +Cry_Oinkologne:: + .incbin "sound/direct_sound_samples/cries/oinkologne.bin" -// .align 2 -//Cry_Tarountula:: -// .incbin "sound/direct_sound_samples/cries/tarountula.bin" + .align 2 +Cry_Tarountula:: + .incbin "sound/direct_sound_samples/cries/tarountula.bin" -// .align 2 -//Cry_Spidops:: -// .incbin "sound/direct_sound_samples/cries/spidops.bin" + .align 2 +Cry_Spidops:: + .incbin "sound/direct_sound_samples/cries/spidops.bin" -// .align 2 -//Cry_Nymble:: -// .incbin "sound/direct_sound_samples/cries/nymble.bin" + .align 2 +Cry_Nymble:: + .incbin "sound/direct_sound_samples/cries/nymble.bin" -// .align 2 -//Cry_Lokix:: -// .incbin "sound/direct_sound_samples/cries/lokix.bin" + .align 2 +Cry_Lokix:: + .incbin "sound/direct_sound_samples/cries/lokix.bin" -// .align 2 -//Cry_Pawmi:: -// .incbin "sound/direct_sound_samples/cries/pawmi.bin" + .align 2 +Cry_Pawmi:: + .incbin "sound/direct_sound_samples/cries/pawmi.bin" -// .align 2 -//Cry_Pawmo:: -// .incbin "sound/direct_sound_samples/cries/pawmo.bin" + .align 2 +Cry_Pawmo:: + .incbin "sound/direct_sound_samples/cries/pawmo.bin" -// .align 2 -//Cry_Pawmot:: -// .incbin "sound/direct_sound_samples/cries/pawmot.bin" + .align 2 +Cry_Pawmot:: + .incbin "sound/direct_sound_samples/cries/pawmot.bin" -// .align 2 -//Cry_Tandemaus:: -// .incbin "sound/direct_sound_samples/cries/tandemaus.bin" + .align 2 +Cry_Tandemaus:: + .incbin "sound/direct_sound_samples/cries/tandemaus.bin" -// .align 2 -//Cry_Maushold:: -// .incbin "sound/direct_sound_samples/cries/maushold.bin" + .align 2 +Cry_Maushold:: + .incbin "sound/direct_sound_samples/cries/maushold.bin" -// .align 2 -//Cry_Fidough:: -// .incbin "sound/direct_sound_samples/cries/fidough.bin" + .align 2 +Cry_Fidough:: + .incbin "sound/direct_sound_samples/cries/fidough.bin" -// .align 2 -//Cry_Dachsbun:: -// .incbin "sound/direct_sound_samples/cries/dachsbun.bin" + .align 2 +Cry_Dachsbun:: + .incbin "sound/direct_sound_samples/cries/dachsbun.bin" -// .align 2 -//Cry_Smoliv:: -// .incbin "sound/direct_sound_samples/cries/smoliv.bin" + .align 2 +Cry_Smoliv:: + .incbin "sound/direct_sound_samples/cries/smoliv.bin" -// .align 2 -//Cry_Dolliv:: -// .incbin "sound/direct_sound_samples/cries/dolliv.bin" + .align 2 +Cry_Dolliv:: + .incbin "sound/direct_sound_samples/cries/dolliv.bin" -// .align 2 -//Cry_Arboliva:: -// .incbin "sound/direct_sound_samples/cries/arboliva.bin" + .align 2 +Cry_Arboliva:: + .incbin "sound/direct_sound_samples/cries/arboliva.bin" -// .align 2 -//Cry_Squawkabilly:: -// .incbin "sound/direct_sound_samples/cries/squawkabilly.bin" + .align 2 +Cry_Squawkabilly:: + .incbin "sound/direct_sound_samples/cries/squawkabilly.bin" -// .align 2 -//Cry_Nacli:: -// .incbin "sound/direct_sound_samples/cries/nacli.bin" + .align 2 +Cry_Nacli:: + .incbin "sound/direct_sound_samples/cries/nacli.bin" -// .align 2 -//Cry_Naclstack:: -// .incbin "sound/direct_sound_samples/cries/naclstack.bin" + .align 2 +Cry_Naclstack:: + .incbin "sound/direct_sound_samples/cries/naclstack.bin" -// .align 2 -//Cry_Garganacl:: -// .incbin "sound/direct_sound_samples/cries/garganacl.bin" + .align 2 +Cry_Garganacl:: + .incbin "sound/direct_sound_samples/cries/garganacl.bin" -// .align 2 -//Cry_Charcadet:: -// .incbin "sound/direct_sound_samples/cries/charcadet.bin" + .align 2 +Cry_Charcadet:: + .incbin "sound/direct_sound_samples/cries/charcadet.bin" -// .align 2 -//Cry_Armarouge:: -// .incbin "sound/direct_sound_samples/cries/armarouge.bin" + .align 2 +Cry_Armarouge:: + .incbin "sound/direct_sound_samples/cries/armarouge.bin" -// .align 2 -//Cry_Ceruledge:: -// .incbin "sound/direct_sound_samples/cries/ceruledge.bin" + .align 2 +Cry_Ceruledge:: + .incbin "sound/direct_sound_samples/cries/ceruledge.bin" -// .align 2 -//Cry_Tadbulb:: -// .incbin "sound/direct_sound_samples/cries/tadbulb.bin" + .align 2 +Cry_Tadbulb:: + .incbin "sound/direct_sound_samples/cries/tadbulb.bin" -// .align 2 -//Cry_Bellibolt:: -// .incbin "sound/direct_sound_samples/cries/bellibolt.bin" + .align 2 +Cry_Bellibolt:: + .incbin "sound/direct_sound_samples/cries/bellibolt.bin" -// .align 2 -//Cry_Wattrel:: -// .incbin "sound/direct_sound_samples/cries/wattrel.bin" + .align 2 +Cry_Wattrel:: + .incbin "sound/direct_sound_samples/cries/wattrel.bin" -// .align 2 -//Cry_Kilowattrel:: -// .incbin "sound/direct_sound_samples/cries/kilowattrel.bin" + .align 2 +Cry_Kilowattrel:: + .incbin "sound/direct_sound_samples/cries/kilowattrel.bin" -// .align 2 -//Cry_Maschiff:: -// .incbin "sound/direct_sound_samples/cries/maschiff.bin" + .align 2 +Cry_Maschiff:: + .incbin "sound/direct_sound_samples/cries/maschiff.bin" -// .align 2 -//Cry_Mabosstiff:: -// .incbin "sound/direct_sound_samples/cries/mabosstiff.bin" + .align 2 +Cry_Mabosstiff:: + .incbin "sound/direct_sound_samples/cries/mabosstiff.bin" -// .align 2 -//Cry_Shroodle:: -// .incbin "sound/direct_sound_samples/cries/shroodle.bin" + .align 2 +Cry_Shroodle:: + .incbin "sound/direct_sound_samples/cries/shroodle.bin" -// .align 2 -//Cry_Grafaiai:: -// .incbin "sound/direct_sound_samples/cries/grafaiai.bin" + .align 2 +Cry_Grafaiai:: + .incbin "sound/direct_sound_samples/cries/grafaiai.bin" -// .align 2 -//Cry_Bramblin:: -// .incbin "sound/direct_sound_samples/cries/bramblin.bin" + .align 2 +Cry_Bramblin:: + .incbin "sound/direct_sound_samples/cries/bramblin.bin" -// .align 2 -//Cry_Brambleghast:: -// .incbin "sound/direct_sound_samples/cries/brambleghast.bin" + .align 2 +Cry_Brambleghast:: + .incbin "sound/direct_sound_samples/cries/brambleghast.bin" -// .align 2 -//Cry_Toedscool:: -// .incbin "sound/direct_sound_samples/cries/toedscool.bin" + .align 2 +Cry_Toedscool:: + .incbin "sound/direct_sound_samples/cries/toedscool.bin" -// .align 2 -//Cry_Toedscruel:: -// .incbin "sound/direct_sound_samples/cries/toedscruel.bin" + .align 2 +Cry_Toedscruel:: + .incbin "sound/direct_sound_samples/cries/toedscruel.bin" -// .align 2 -//Cry_Klawf:: -// .incbin "sound/direct_sound_samples/cries/klawf.bin" + .align 2 +Cry_Klawf:: + .incbin "sound/direct_sound_samples/cries/klawf.bin" -// .align 2 -//Cry_Capsakid:: -// .incbin "sound/direct_sound_samples/cries/capsakid.bin" + .align 2 +Cry_Capsakid:: + .incbin "sound/direct_sound_samples/cries/capsakid.bin" -// .align 2 -//Cry_Scovillain:: -// .incbin "sound/direct_sound_samples/cries/scovillain.bin" + .align 2 +Cry_Scovillain:: + .incbin "sound/direct_sound_samples/cries/scovillain.bin" -// .align 2 -//Cry_Rellor:: -// .incbin "sound/direct_sound_samples/cries/rellor.bin" + .align 2 +Cry_Rellor:: + .incbin "sound/direct_sound_samples/cries/rellor.bin" -// .align 2 -//Cry_Rabsca:: -// .incbin "sound/direct_sound_samples/cries/rabsca.bin" + .align 2 +Cry_Rabsca:: + .incbin "sound/direct_sound_samples/cries/rabsca.bin" -// .align 2 -//Cry_Flittle:: -// .incbin "sound/direct_sound_samples/cries/flittle.bin" + .align 2 +Cry_Flittle:: + .incbin "sound/direct_sound_samples/cries/flittle.bin" -// .align 2 -//Cry_Espathra:: -// .incbin "sound/direct_sound_samples/cries/espathra.bin" + .align 2 +Cry_Espathra:: + .incbin "sound/direct_sound_samples/cries/espathra.bin" -// .align 2 -//Cry_Tinkatink:: -// .incbin "sound/direct_sound_samples/cries/tinkatink.bin" + .align 2 +Cry_Tinkatink:: + .incbin "sound/direct_sound_samples/cries/tinkatink.bin" -// .align 2 -//Cry_Tinkatuff:: -// .incbin "sound/direct_sound_samples/cries/tinkatuff.bin" + .align 2 +Cry_Tinkatuff:: + .incbin "sound/direct_sound_samples/cries/tinkatuff.bin" -// .align 2 -//Cry_Tinkaton:: -// .incbin "sound/direct_sound_samples/cries/tinkaton.bin" + .align 2 +Cry_Tinkaton:: + .incbin "sound/direct_sound_samples/cries/tinkaton.bin" -// .align 2 -//Cry_Wiglett:: -// .incbin "sound/direct_sound_samples/cries/wiglett.bin" + .align 2 +Cry_Wiglett:: + .incbin "sound/direct_sound_samples/cries/wiglett.bin" -// .align 2 -//Cry_Wugtrio:: -// .incbin "sound/direct_sound_samples/cries/wugtrio.bin" + .align 2 +Cry_Wugtrio:: + .incbin "sound/direct_sound_samples/cries/wugtrio.bin" -// .align 2 -//Cry_Bombirdier:: -// .incbin "sound/direct_sound_samples/cries/bombirdier.bin" + .align 2 +Cry_Bombirdier:: + .incbin "sound/direct_sound_samples/cries/bombirdier.bin" -// .align 2 -//Cry_Finizen:: -// .incbin "sound/direct_sound_samples/cries/finizen.bin" + .align 2 +Cry_Finizen:: + .incbin "sound/direct_sound_samples/cries/finizen.bin" -// .align 2 -//Cry_Palafin:: -// .incbin "sound/direct_sound_samples/cries/palafin.bin" + .align 2 +Cry_Palafin:: + .incbin "sound/direct_sound_samples/cries/palafin.bin" -// .align 2 -//Cry_Varoom:: -// .incbin "sound/direct_sound_samples/cries/varoom.bin" + .align 2 +Cry_Varoom:: + .incbin "sound/direct_sound_samples/cries/varoom.bin" -// .align 2 -//Cry_Revavroom:: -// .incbin "sound/direct_sound_samples/cries/revavroom.bin" + .align 2 +Cry_Revavroom:: + .incbin "sound/direct_sound_samples/cries/revavroom.bin" -// .align 2 -//Cry_Cyclizar:: -// .incbin "sound/direct_sound_samples/cries/cyclizar.bin" + .align 2 +Cry_Cyclizar:: + .incbin "sound/direct_sound_samples/cries/cyclizar.bin" -// .align 2 -//Cry_Orthworm:: -// .incbin "sound/direct_sound_samples/cries/orthworm.bin" + .align 2 +Cry_Orthworm:: + .incbin "sound/direct_sound_samples/cries/orthworm.bin" -// .align 2 -//Cry_Glimmet:: -// .incbin "sound/direct_sound_samples/cries/glimmet.bin" + .align 2 +Cry_Glimmet:: + .incbin "sound/direct_sound_samples/cries/glimmet.bin" -// .align 2 -//Cry_Glimmora:: -// .incbin "sound/direct_sound_samples/cries/glimmora.bin" + .align 2 +Cry_Glimmora:: + .incbin "sound/direct_sound_samples/cries/glimmora.bin" -// .align 2 -//Cry_Greavard:: -// .incbin "sound/direct_sound_samples/cries/greavard.bin" + .align 2 +Cry_Greavard:: + .incbin "sound/direct_sound_samples/cries/greavard.bin" -// .align 2 -//Cry_Houndstone:: -// .incbin "sound/direct_sound_samples/cries/houndstone.bin" + .align 2 +Cry_Houndstone:: + .incbin "sound/direct_sound_samples/cries/houndstone.bin" -// .align 2 -//Cry_Flamigo:: -// .incbin "sound/direct_sound_samples/cries/flamigo.bin" + .align 2 +Cry_Flamigo:: + .incbin "sound/direct_sound_samples/cries/flamigo.bin" -// .align 2 -//Cry_Cetoddle:: -// .incbin "sound/direct_sound_samples/cries/cetoddle.bin" + .align 2 +Cry_Cetoddle:: + .incbin "sound/direct_sound_samples/cries/cetoddle.bin" -// .align 2 -//Cry_Cetitan:: -// .incbin "sound/direct_sound_samples/cries/cetitan.bin" + .align 2 +Cry_Cetitan:: + .incbin "sound/direct_sound_samples/cries/cetitan.bin" -// .align 2 -//Cry_Veluza:: -// .incbin "sound/direct_sound_samples/cries/veluza.bin" + .align 2 +Cry_Veluza:: + .incbin "sound/direct_sound_samples/cries/veluza.bin" -// .align 2 -//Cry_Dondozo:: -// .incbin "sound/direct_sound_samples/cries/dondozo.bin" + .align 2 +Cry_Dondozo:: + .incbin "sound/direct_sound_samples/cries/dondozo.bin" -// .align 2 -//Cry_Tatsugiri:: -// .incbin "sound/direct_sound_samples/cries/tatsugiri.bin" + .align 2 +Cry_Tatsugiri:: + .incbin "sound/direct_sound_samples/cries/tatsugiri.bin" -// .align 2 -//Cry_Annihilape:: -// .incbin "sound/direct_sound_samples/cries/annihilape.bin" + .align 2 +Cry_Annihilape:: + .incbin "sound/direct_sound_samples/cries/annihilape.bin" -// .align 2 -//Cry_Clodsire:: -// .incbin "sound/direct_sound_samples/cries/clodsire.bin" + .align 2 +Cry_Clodsire:: + .incbin "sound/direct_sound_samples/cries/clodsire.bin" -// .align 2 -//Cry_Farigiraf:: -// .incbin "sound/direct_sound_samples/cries/farigiraf.bin" + .align 2 +Cry_Farigiraf:: + .incbin "sound/direct_sound_samples/cries/farigiraf.bin" -// .align 2 -//Cry_Dudunsparce:: -// .incbin "sound/direct_sound_samples/cries/dudunsparce.bin" + .align 2 +Cry_Dudunsparce:: + .incbin "sound/direct_sound_samples/cries/dudunsparce.bin" -// .align 2 -//Cry_Kingambit:: -// .incbin "sound/direct_sound_samples/cries/kingambit.bin" + .align 2 +Cry_Kingambit:: + .incbin "sound/direct_sound_samples/cries/kingambit.bin" -// .align 2 -//Cry_GreatTusk:: -// .incbin "sound/direct_sound_samples/cries/greattusk.bin" + .align 2 +Cry_GreatTusk:: + .incbin "sound/direct_sound_samples/cries/greattusk.bin" -// .align 2 -//Cry_ScreamTail:: -// .incbin "sound/direct_sound_samples/cries/screamtail.bin" + .align 2 +Cry_ScreamTail:: + .incbin "sound/direct_sound_samples/cries/screamtail.bin" -// .align 2 -//Cry_BruteBonnet:: -// .incbin "sound/direct_sound_samples/cries/brutebonnet.bin" + .align 2 +Cry_BruteBonnet:: + .incbin "sound/direct_sound_samples/cries/brutebonnet.bin" -// .align 2 -//Cry_FlutterMane:: -// .incbin "sound/direct_sound_samples/cries/fluttermane.bin" + .align 2 +Cry_FlutterMane:: + .incbin "sound/direct_sound_samples/cries/fluttermane.bin" -// .align 2 -//Cry_SlitherWing:: -// .incbin "sound/direct_sound_samples/cries/slitherwing.bin" + .align 2 +Cry_SlitherWing:: + .incbin "sound/direct_sound_samples/cries/slitherwing.bin" -// .align 2 -//Cry_SandyShocks:: -// .incbin "sound/direct_sound_samples/cries/sandyshocks.bin" + .align 2 +Cry_SandyShocks:: + .incbin "sound/direct_sound_samples/cries/sandyshocks.bin" -// .align 2 -//Cry_IronTreads:: -// .incbin "sound/direct_sound_samples/cries/irontreads.bin" + .align 2 +Cry_IronTreads:: + .incbin "sound/direct_sound_samples/cries/irontreads.bin" -// .align 2 -//Cry_IronBundle:: -// .incbin "sound/direct_sound_samples/cries/ironbundle.bin" + .align 2 +Cry_IronBundle:: + .incbin "sound/direct_sound_samples/cries/ironbundle.bin" -// .align 2 -//Cry_IronHands:: -// .incbin "sound/direct_sound_samples/cries/ironhands.bin" + .align 2 +Cry_IronHands:: + .incbin "sound/direct_sound_samples/cries/ironhands.bin" -// .align 2 -//Cry_IronJugulis:: -// .incbin "sound/direct_sound_samples/cries/ironjugulis.bin" + .align 2 +Cry_IronJugulis:: + .incbin "sound/direct_sound_samples/cries/ironjugulis.bin" -// .align 2 -//Cry_IronMoth:: -// .incbin "sound/direct_sound_samples/cries/ironmoth.bin" + .align 2 +Cry_IronMoth:: + .incbin "sound/direct_sound_samples/cries/ironmoth.bin" -// .align 2 -//Cry_IronThorns:: -// .incbin "sound/direct_sound_samples/cries/ironthorns.bin" + .align 2 +Cry_IronThorns:: + .incbin "sound/direct_sound_samples/cries/ironthorns.bin" -// .align 2 -//Cry_Frigibax:: -// .incbin "sound/direct_sound_samples/cries/frigibax.bin" + .align 2 +Cry_Frigibax:: + .incbin "sound/direct_sound_samples/cries/frigibax.bin" -// .align 2 -//Cry_Arctibax:: -// .incbin "sound/direct_sound_samples/cries/arctibax.bin" + .align 2 +Cry_Arctibax:: + .incbin "sound/direct_sound_samples/cries/arctibax.bin" -// .align 2 -//Cry_Baxcalibur:: -// .incbin "sound/direct_sound_samples/cries/baxcalibur.bin" + .align 2 +Cry_Baxcalibur:: + .incbin "sound/direct_sound_samples/cries/baxcalibur.bin" -// .align 2 -//Cry_Gimmighoul:: -// .incbin "sound/direct_sound_samples/cries/gimmighoul.bin" + .align 2 +Cry_Gimmighoul:: + .incbin "sound/direct_sound_samples/cries/gimmighoul.bin" -// .align 2 -//Cry_Gholdengo:: -// .incbin "sound/direct_sound_samples/cries/gholdengo.bin" + .align 2 +Cry_Gholdengo:: + .incbin "sound/direct_sound_samples/cries/gholdengo.bin" -// .align 2 -//Cry_WoChien:: -// .incbin "sound/direct_sound_samples/cries/wochien.bin" + .align 2 +Cry_WoChien:: + .incbin "sound/direct_sound_samples/cries/wochien.bin" -// .align 2 -//Cry_ChienPao:: -// .incbin "sound/direct_sound_samples/cries/chienpao.bin" + .align 2 +Cry_ChienPao:: + .incbin "sound/direct_sound_samples/cries/chienpao.bin" -// .align 2 -//Cry_TingLu:: -// .incbin "sound/direct_sound_samples/cries/tinglu.bin" + .align 2 +Cry_TingLu:: + .incbin "sound/direct_sound_samples/cries/tinglu.bin" -// .align 2 -//Cry_ChiYu:: -// .incbin "sound/direct_sound_samples/cries/chiyu.bin" + .align 2 +Cry_ChiYu:: + .incbin "sound/direct_sound_samples/cries/chiyu.bin" -// .align 2 -//Cry_RoaringMoon:: -// .incbin "sound/direct_sound_samples/cries/roaringmoon.bin" + .align 2 +Cry_RoaringMoon:: + .incbin "sound/direct_sound_samples/cries/roaringmoon.bin" -// .align 2 -//Cry_IronValiant:: -// .incbin "sound/direct_sound_samples/cries/ironvaliant.bin" + .align 2 +Cry_IronValiant:: + .incbin "sound/direct_sound_samples/cries/ironvaliant.bin" -// .align 2 -//Cry_Koraidon:: -// .incbin "sound/direct_sound_samples/cries/koraidon.bin" + .align 2 +Cry_Koraidon:: + .incbin "sound/direct_sound_samples/cries/koraidon.bin" -// .align 2 -//Cry_Miraidon:: -// .incbin "sound/direct_sound_samples/cries/miraidon.bin" + .align 2 +Cry_Miraidon:: + .incbin "sound/direct_sound_samples/cries/miraidon.bin" // .align 2 //Cry_WalkingWake:: diff --git a/sound/direct_sound_samples/cries/annihilape.aif b/sound/direct_sound_samples/cries/annihilape.aif new file mode 100644 index 0000000000..6579c7099a Binary files /dev/null and b/sound/direct_sound_samples/cries/annihilape.aif differ diff --git a/sound/direct_sound_samples/cries/arboliva.aif b/sound/direct_sound_samples/cries/arboliva.aif new file mode 100644 index 0000000000..c09b18d259 Binary files /dev/null and b/sound/direct_sound_samples/cries/arboliva.aif differ diff --git a/sound/direct_sound_samples/cries/arctibax.aif b/sound/direct_sound_samples/cries/arctibax.aif new file mode 100644 index 0000000000..1f07117716 Binary files /dev/null and b/sound/direct_sound_samples/cries/arctibax.aif differ diff --git a/sound/direct_sound_samples/cries/armarouge.aif b/sound/direct_sound_samples/cries/armarouge.aif new file mode 100644 index 0000000000..afdbbe4476 Binary files /dev/null and b/sound/direct_sound_samples/cries/armarouge.aif differ diff --git a/sound/direct_sound_samples/cries/baxcalibur.aif b/sound/direct_sound_samples/cries/baxcalibur.aif new file mode 100644 index 0000000000..30325b75d6 Binary files /dev/null and b/sound/direct_sound_samples/cries/baxcalibur.aif differ diff --git a/sound/direct_sound_samples/cries/bellibolt.aif b/sound/direct_sound_samples/cries/bellibolt.aif new file mode 100644 index 0000000000..ebe9fdac84 Binary files /dev/null and b/sound/direct_sound_samples/cries/bellibolt.aif differ diff --git a/sound/direct_sound_samples/cries/bombirdier.aif b/sound/direct_sound_samples/cries/bombirdier.aif new file mode 100644 index 0000000000..8c7436dd9f Binary files /dev/null and b/sound/direct_sound_samples/cries/bombirdier.aif differ diff --git a/sound/direct_sound_samples/cries/brambleghast.aif b/sound/direct_sound_samples/cries/brambleghast.aif new file mode 100644 index 0000000000..4055bf6daa Binary files /dev/null and b/sound/direct_sound_samples/cries/brambleghast.aif differ diff --git a/sound/direct_sound_samples/cries/bramblin.aif b/sound/direct_sound_samples/cries/bramblin.aif new file mode 100644 index 0000000000..36100f8272 Binary files /dev/null and b/sound/direct_sound_samples/cries/bramblin.aif differ diff --git a/sound/direct_sound_samples/cries/brutebonnet.aif b/sound/direct_sound_samples/cries/brutebonnet.aif new file mode 100644 index 0000000000..668bfbe019 Binary files /dev/null and b/sound/direct_sound_samples/cries/brutebonnet.aif differ diff --git a/sound/direct_sound_samples/cries/capsakid.aif b/sound/direct_sound_samples/cries/capsakid.aif new file mode 100644 index 0000000000..3708d99f2c Binary files /dev/null and b/sound/direct_sound_samples/cries/capsakid.aif differ diff --git a/sound/direct_sound_samples/cries/celuredge.aif b/sound/direct_sound_samples/cries/celuredge.aif new file mode 100644 index 0000000000..511365c519 Binary files /dev/null and b/sound/direct_sound_samples/cries/celuredge.aif differ diff --git a/sound/direct_sound_samples/cries/ceruledge.aif b/sound/direct_sound_samples/cries/ceruledge.aif new file mode 100644 index 0000000000..50e139a97c Binary files /dev/null and b/sound/direct_sound_samples/cries/ceruledge.aif differ diff --git a/sound/direct_sound_samples/cries/cetitan.aif b/sound/direct_sound_samples/cries/cetitan.aif new file mode 100644 index 0000000000..3d648938b4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cetitan.aif differ diff --git a/sound/direct_sound_samples/cries/cetoddle.aif b/sound/direct_sound_samples/cries/cetoddle.aif new file mode 100644 index 0000000000..1d43096a28 Binary files /dev/null and b/sound/direct_sound_samples/cries/cetoddle.aif differ diff --git a/sound/direct_sound_samples/cries/charcadet.aif b/sound/direct_sound_samples/cries/charcadet.aif new file mode 100644 index 0000000000..f6c9ac75d8 Binary files /dev/null and b/sound/direct_sound_samples/cries/charcadet.aif differ diff --git a/sound/direct_sound_samples/cries/chienpao.aif b/sound/direct_sound_samples/cries/chienpao.aif new file mode 100644 index 0000000000..988652792f Binary files /dev/null and b/sound/direct_sound_samples/cries/chienpao.aif differ diff --git a/sound/direct_sound_samples/cries/chiyu.aif b/sound/direct_sound_samples/cries/chiyu.aif new file mode 100644 index 0000000000..48205be3a2 Binary files /dev/null and b/sound/direct_sound_samples/cries/chiyu.aif differ diff --git a/sound/direct_sound_samples/cries/clodsire.aif b/sound/direct_sound_samples/cries/clodsire.aif new file mode 100644 index 0000000000..2540de2125 Binary files /dev/null and b/sound/direct_sound_samples/cries/clodsire.aif differ diff --git a/sound/direct_sound_samples/cries/crocalor.aif b/sound/direct_sound_samples/cries/crocalor.aif new file mode 100644 index 0000000000..c69bee94de Binary files /dev/null and b/sound/direct_sound_samples/cries/crocalor.aif differ diff --git a/sound/direct_sound_samples/cries/cyclizar.aif b/sound/direct_sound_samples/cries/cyclizar.aif new file mode 100644 index 0000000000..43fd5473fc Binary files /dev/null and b/sound/direct_sound_samples/cries/cyclizar.aif differ diff --git a/sound/direct_sound_samples/cries/dachsbun.aif b/sound/direct_sound_samples/cries/dachsbun.aif new file mode 100644 index 0000000000..d512252aac Binary files /dev/null and b/sound/direct_sound_samples/cries/dachsbun.aif differ diff --git a/sound/direct_sound_samples/cries/dolliv.aif b/sound/direct_sound_samples/cries/dolliv.aif new file mode 100644 index 0000000000..1f345fde77 Binary files /dev/null and b/sound/direct_sound_samples/cries/dolliv.aif differ diff --git a/sound/direct_sound_samples/cries/dondozo.aif b/sound/direct_sound_samples/cries/dondozo.aif new file mode 100644 index 0000000000..851015f2dd Binary files /dev/null and b/sound/direct_sound_samples/cries/dondozo.aif differ diff --git a/sound/direct_sound_samples/cries/dudunsparce.aif b/sound/direct_sound_samples/cries/dudunsparce.aif new file mode 100644 index 0000000000..fe29bf119d Binary files /dev/null and b/sound/direct_sound_samples/cries/dudunsparce.aif differ diff --git a/sound/direct_sound_samples/cries/espathra.aif b/sound/direct_sound_samples/cries/espathra.aif new file mode 100644 index 0000000000..94effa59bf Binary files /dev/null and b/sound/direct_sound_samples/cries/espathra.aif differ diff --git a/sound/direct_sound_samples/cries/farigiraf.aif b/sound/direct_sound_samples/cries/farigiraf.aif new file mode 100644 index 0000000000..112be59d5e Binary files /dev/null and b/sound/direct_sound_samples/cries/farigiraf.aif differ diff --git a/sound/direct_sound_samples/cries/fidough.aif b/sound/direct_sound_samples/cries/fidough.aif new file mode 100644 index 0000000000..6ffd67c274 Binary files /dev/null and b/sound/direct_sound_samples/cries/fidough.aif differ diff --git a/sound/direct_sound_samples/cries/finizen.aif b/sound/direct_sound_samples/cries/finizen.aif new file mode 100644 index 0000000000..0adad17610 Binary files /dev/null and b/sound/direct_sound_samples/cries/finizen.aif differ diff --git a/sound/direct_sound_samples/cries/flamigo.aif b/sound/direct_sound_samples/cries/flamigo.aif new file mode 100644 index 0000000000..e6535f285b Binary files /dev/null and b/sound/direct_sound_samples/cries/flamigo.aif differ diff --git a/sound/direct_sound_samples/cries/flittle.aif b/sound/direct_sound_samples/cries/flittle.aif new file mode 100644 index 0000000000..434fcf16d2 Binary files /dev/null and b/sound/direct_sound_samples/cries/flittle.aif differ diff --git a/sound/direct_sound_samples/cries/floragato.aif b/sound/direct_sound_samples/cries/floragato.aif new file mode 100644 index 0000000000..41418701b6 Binary files /dev/null and b/sound/direct_sound_samples/cries/floragato.aif differ diff --git a/sound/direct_sound_samples/cries/fluttermane.aif b/sound/direct_sound_samples/cries/fluttermane.aif new file mode 100644 index 0000000000..b65ea5f881 Binary files /dev/null and b/sound/direct_sound_samples/cries/fluttermane.aif differ diff --git a/sound/direct_sound_samples/cries/frigibax.aif b/sound/direct_sound_samples/cries/frigibax.aif new file mode 100644 index 0000000000..fa6a3c81be Binary files /dev/null and b/sound/direct_sound_samples/cries/frigibax.aif differ diff --git a/sound/direct_sound_samples/cries/fuecoco.aif b/sound/direct_sound_samples/cries/fuecoco.aif new file mode 100644 index 0000000000..d55266d5d0 Binary files /dev/null and b/sound/direct_sound_samples/cries/fuecoco.aif differ diff --git a/sound/direct_sound_samples/cries/garganacl.aif b/sound/direct_sound_samples/cries/garganacl.aif new file mode 100644 index 0000000000..9867b95431 Binary files /dev/null and b/sound/direct_sound_samples/cries/garganacl.aif differ diff --git a/sound/direct_sound_samples/cries/gholdengo.aif b/sound/direct_sound_samples/cries/gholdengo.aif new file mode 100644 index 0000000000..1fbab21c08 Binary files /dev/null and b/sound/direct_sound_samples/cries/gholdengo.aif differ diff --git a/sound/direct_sound_samples/cries/gimmighoul.aif b/sound/direct_sound_samples/cries/gimmighoul.aif new file mode 100644 index 0000000000..b48f118f2d Binary files /dev/null and b/sound/direct_sound_samples/cries/gimmighoul.aif differ diff --git a/sound/direct_sound_samples/cries/glimmet.aif b/sound/direct_sound_samples/cries/glimmet.aif new file mode 100644 index 0000000000..65fca1f904 Binary files /dev/null and b/sound/direct_sound_samples/cries/glimmet.aif differ diff --git a/sound/direct_sound_samples/cries/glimmora.aif b/sound/direct_sound_samples/cries/glimmora.aif new file mode 100644 index 0000000000..20e2207bfa Binary files /dev/null and b/sound/direct_sound_samples/cries/glimmora.aif differ diff --git a/sound/direct_sound_samples/cries/grafaiai.aif b/sound/direct_sound_samples/cries/grafaiai.aif new file mode 100644 index 0000000000..cf6e2f6587 Binary files /dev/null and b/sound/direct_sound_samples/cries/grafaiai.aif differ diff --git a/sound/direct_sound_samples/cries/greattusk.aif b/sound/direct_sound_samples/cries/greattusk.aif new file mode 100644 index 0000000000..25344a2901 Binary files /dev/null and b/sound/direct_sound_samples/cries/greattusk.aif differ diff --git a/sound/direct_sound_samples/cries/greavard.aif b/sound/direct_sound_samples/cries/greavard.aif new file mode 100644 index 0000000000..ac6f259dde Binary files /dev/null and b/sound/direct_sound_samples/cries/greavard.aif differ diff --git a/sound/direct_sound_samples/cries/houndstone.aif b/sound/direct_sound_samples/cries/houndstone.aif new file mode 100644 index 0000000000..fd0f129c09 Binary files /dev/null and b/sound/direct_sound_samples/cries/houndstone.aif differ diff --git a/sound/direct_sound_samples/cries/ironbundle.aif b/sound/direct_sound_samples/cries/ironbundle.aif new file mode 100644 index 0000000000..126f0f2c54 Binary files /dev/null and b/sound/direct_sound_samples/cries/ironbundle.aif differ diff --git a/sound/direct_sound_samples/cries/ironhands.aif b/sound/direct_sound_samples/cries/ironhands.aif new file mode 100644 index 0000000000..9fa3ea429c Binary files /dev/null and b/sound/direct_sound_samples/cries/ironhands.aif differ diff --git a/sound/direct_sound_samples/cries/ironjugulis.aif b/sound/direct_sound_samples/cries/ironjugulis.aif new file mode 100644 index 0000000000..9705de50f9 Binary files /dev/null and b/sound/direct_sound_samples/cries/ironjugulis.aif differ diff --git a/sound/direct_sound_samples/cries/ironmoth.aif b/sound/direct_sound_samples/cries/ironmoth.aif new file mode 100644 index 0000000000..c59372a2b6 Binary files /dev/null and b/sound/direct_sound_samples/cries/ironmoth.aif differ diff --git a/sound/direct_sound_samples/cries/ironthorns.aif b/sound/direct_sound_samples/cries/ironthorns.aif new file mode 100644 index 0000000000..2e89e2d990 Binary files /dev/null and b/sound/direct_sound_samples/cries/ironthorns.aif differ diff --git a/sound/direct_sound_samples/cries/irontreads.aif b/sound/direct_sound_samples/cries/irontreads.aif new file mode 100644 index 0000000000..08f00e30fd Binary files /dev/null and b/sound/direct_sound_samples/cries/irontreads.aif differ diff --git a/sound/direct_sound_samples/cries/ironvaliant.aif b/sound/direct_sound_samples/cries/ironvaliant.aif new file mode 100644 index 0000000000..01299a813e Binary files /dev/null and b/sound/direct_sound_samples/cries/ironvaliant.aif differ diff --git a/sound/direct_sound_samples/cries/kilowattrel.aif b/sound/direct_sound_samples/cries/kilowattrel.aif new file mode 100644 index 0000000000..8147f8601c Binary files /dev/null and b/sound/direct_sound_samples/cries/kilowattrel.aif differ diff --git a/sound/direct_sound_samples/cries/kingambit.aif b/sound/direct_sound_samples/cries/kingambit.aif new file mode 100644 index 0000000000..f113ea5d28 Binary files /dev/null and b/sound/direct_sound_samples/cries/kingambit.aif differ diff --git a/sound/direct_sound_samples/cries/klawf.aif b/sound/direct_sound_samples/cries/klawf.aif new file mode 100644 index 0000000000..f4333f91c3 Binary files /dev/null and b/sound/direct_sound_samples/cries/klawf.aif differ diff --git a/sound/direct_sound_samples/cries/koraidon.aif b/sound/direct_sound_samples/cries/koraidon.aif new file mode 100644 index 0000000000..4ba5378df1 Binary files /dev/null and b/sound/direct_sound_samples/cries/koraidon.aif differ diff --git a/sound/direct_sound_samples/cries/lechonk.aif b/sound/direct_sound_samples/cries/lechonk.aif new file mode 100644 index 0000000000..dec07eb58a Binary files /dev/null and b/sound/direct_sound_samples/cries/lechonk.aif differ diff --git a/sound/direct_sound_samples/cries/lokix.aif b/sound/direct_sound_samples/cries/lokix.aif new file mode 100644 index 0000000000..5c43f19cee Binary files /dev/null and b/sound/direct_sound_samples/cries/lokix.aif differ diff --git a/sound/direct_sound_samples/cries/mabosstiff.aif b/sound/direct_sound_samples/cries/mabosstiff.aif new file mode 100644 index 0000000000..8e5191f2a3 Binary files /dev/null and b/sound/direct_sound_samples/cries/mabosstiff.aif differ diff --git a/sound/direct_sound_samples/cries/maschiff.aif b/sound/direct_sound_samples/cries/maschiff.aif new file mode 100644 index 0000000000..e2cd0e805d Binary files /dev/null and b/sound/direct_sound_samples/cries/maschiff.aif differ diff --git a/sound/direct_sound_samples/cries/maushold.aif b/sound/direct_sound_samples/cries/maushold.aif new file mode 100644 index 0000000000..ef4f32f90f Binary files /dev/null and b/sound/direct_sound_samples/cries/maushold.aif differ diff --git a/sound/direct_sound_samples/cries/meowscarada.aif b/sound/direct_sound_samples/cries/meowscarada.aif new file mode 100644 index 0000000000..732437febd Binary files /dev/null and b/sound/direct_sound_samples/cries/meowscarada.aif differ diff --git a/sound/direct_sound_samples/cries/miraidon.aif b/sound/direct_sound_samples/cries/miraidon.aif new file mode 100644 index 0000000000..ffdf2a1d38 Binary files /dev/null and b/sound/direct_sound_samples/cries/miraidon.aif differ diff --git a/sound/direct_sound_samples/cries/nacli.aif b/sound/direct_sound_samples/cries/nacli.aif new file mode 100644 index 0000000000..414e345d30 Binary files /dev/null and b/sound/direct_sound_samples/cries/nacli.aif differ diff --git a/sound/direct_sound_samples/cries/naclstack.aif b/sound/direct_sound_samples/cries/naclstack.aif new file mode 100644 index 0000000000..0673e99c32 Binary files /dev/null and b/sound/direct_sound_samples/cries/naclstack.aif differ diff --git a/sound/direct_sound_samples/cries/nymble.aif b/sound/direct_sound_samples/cries/nymble.aif new file mode 100644 index 0000000000..2be79a20b4 Binary files /dev/null and b/sound/direct_sound_samples/cries/nymble.aif differ diff --git a/sound/direct_sound_samples/cries/oinkologne.aif b/sound/direct_sound_samples/cries/oinkologne.aif new file mode 100644 index 0000000000..4a81d17930 Binary files /dev/null and b/sound/direct_sound_samples/cries/oinkologne.aif differ diff --git a/sound/direct_sound_samples/cries/orthworm.aif b/sound/direct_sound_samples/cries/orthworm.aif new file mode 100644 index 0000000000..04c9d0d397 Binary files /dev/null and b/sound/direct_sound_samples/cries/orthworm.aif differ diff --git a/sound/direct_sound_samples/cries/palafin.aif b/sound/direct_sound_samples/cries/palafin.aif new file mode 100644 index 0000000000..a1e92dc241 Binary files /dev/null and b/sound/direct_sound_samples/cries/palafin.aif differ diff --git a/sound/direct_sound_samples/cries/pawmi.aif b/sound/direct_sound_samples/cries/pawmi.aif new file mode 100644 index 0000000000..55342ef851 Binary files /dev/null and b/sound/direct_sound_samples/cries/pawmi.aif differ diff --git a/sound/direct_sound_samples/cries/pawmo.aif b/sound/direct_sound_samples/cries/pawmo.aif new file mode 100644 index 0000000000..faaf692d08 Binary files /dev/null and b/sound/direct_sound_samples/cries/pawmo.aif differ diff --git a/sound/direct_sound_samples/cries/pawmot.aif b/sound/direct_sound_samples/cries/pawmot.aif new file mode 100644 index 0000000000..fe8e796234 Binary files /dev/null and b/sound/direct_sound_samples/cries/pawmot.aif differ diff --git a/sound/direct_sound_samples/cries/quaquaval.aif b/sound/direct_sound_samples/cries/quaquaval.aif new file mode 100644 index 0000000000..1bdfe06e82 Binary files /dev/null and b/sound/direct_sound_samples/cries/quaquaval.aif differ diff --git a/sound/direct_sound_samples/cries/quaxly.aif b/sound/direct_sound_samples/cries/quaxly.aif new file mode 100644 index 0000000000..a9783dc132 Binary files /dev/null and b/sound/direct_sound_samples/cries/quaxly.aif differ diff --git a/sound/direct_sound_samples/cries/quaxwell.aif b/sound/direct_sound_samples/cries/quaxwell.aif new file mode 100644 index 0000000000..92398e562e Binary files /dev/null and b/sound/direct_sound_samples/cries/quaxwell.aif differ diff --git a/sound/direct_sound_samples/cries/rabsca.aif b/sound/direct_sound_samples/cries/rabsca.aif new file mode 100644 index 0000000000..82088a8b0e Binary files /dev/null and b/sound/direct_sound_samples/cries/rabsca.aif differ diff --git a/sound/direct_sound_samples/cries/rellor.aif b/sound/direct_sound_samples/cries/rellor.aif new file mode 100644 index 0000000000..ed4b0206d4 Binary files /dev/null and b/sound/direct_sound_samples/cries/rellor.aif differ diff --git a/sound/direct_sound_samples/cries/revavroom.aif b/sound/direct_sound_samples/cries/revavroom.aif new file mode 100644 index 0000000000..23805561e0 Binary files /dev/null and b/sound/direct_sound_samples/cries/revavroom.aif differ diff --git a/sound/direct_sound_samples/cries/roaringmoon.aif b/sound/direct_sound_samples/cries/roaringmoon.aif new file mode 100644 index 0000000000..19f22c1274 Binary files /dev/null and b/sound/direct_sound_samples/cries/roaringmoon.aif differ diff --git a/sound/direct_sound_samples/cries/sandyshocks.aif b/sound/direct_sound_samples/cries/sandyshocks.aif new file mode 100644 index 0000000000..8f45dc8bd0 Binary files /dev/null and b/sound/direct_sound_samples/cries/sandyshocks.aif differ diff --git a/sound/direct_sound_samples/cries/scovillain.aif b/sound/direct_sound_samples/cries/scovillain.aif new file mode 100644 index 0000000000..e61ce70661 Binary files /dev/null and b/sound/direct_sound_samples/cries/scovillain.aif differ diff --git a/sound/direct_sound_samples/cries/screamtail.aif b/sound/direct_sound_samples/cries/screamtail.aif new file mode 100644 index 0000000000..c01c98075a Binary files /dev/null and b/sound/direct_sound_samples/cries/screamtail.aif differ diff --git a/sound/direct_sound_samples/cries/shroodle.aif b/sound/direct_sound_samples/cries/shroodle.aif new file mode 100644 index 0000000000..a118367144 Binary files /dev/null and b/sound/direct_sound_samples/cries/shroodle.aif differ diff --git a/sound/direct_sound_samples/cries/skeledirge.aif b/sound/direct_sound_samples/cries/skeledirge.aif new file mode 100644 index 0000000000..06ac1d7baa Binary files /dev/null and b/sound/direct_sound_samples/cries/skeledirge.aif differ diff --git a/sound/direct_sound_samples/cries/slitherwing.aif b/sound/direct_sound_samples/cries/slitherwing.aif new file mode 100644 index 0000000000..f54f817aed Binary files /dev/null and b/sound/direct_sound_samples/cries/slitherwing.aif differ diff --git a/sound/direct_sound_samples/cries/smoliv.aif b/sound/direct_sound_samples/cries/smoliv.aif new file mode 100644 index 0000000000..18c03f6995 Binary files /dev/null and b/sound/direct_sound_samples/cries/smoliv.aif differ diff --git a/sound/direct_sound_samples/cries/sneasler.aif b/sound/direct_sound_samples/cries/sneasler.aif index fa2fbef2bc..9471a039d0 100644 Binary files a/sound/direct_sound_samples/cries/sneasler.aif and b/sound/direct_sound_samples/cries/sneasler.aif differ diff --git a/sound/direct_sound_samples/cries/spidops.aif b/sound/direct_sound_samples/cries/spidops.aif new file mode 100644 index 0000000000..dd3602be22 Binary files /dev/null and b/sound/direct_sound_samples/cries/spidops.aif differ diff --git a/sound/direct_sound_samples/cries/sprigatito.aif b/sound/direct_sound_samples/cries/sprigatito.aif new file mode 100644 index 0000000000..28448733e4 Binary files /dev/null and b/sound/direct_sound_samples/cries/sprigatito.aif differ diff --git a/sound/direct_sound_samples/cries/squawkabilly.aif b/sound/direct_sound_samples/cries/squawkabilly.aif new file mode 100644 index 0000000000..00995c6c6c Binary files /dev/null and b/sound/direct_sound_samples/cries/squawkabilly.aif differ diff --git a/sound/direct_sound_samples/cries/tadbulb.aif b/sound/direct_sound_samples/cries/tadbulb.aif new file mode 100644 index 0000000000..7e9822d36a Binary files /dev/null and b/sound/direct_sound_samples/cries/tadbulb.aif differ diff --git a/sound/direct_sound_samples/cries/tandemaus.aif b/sound/direct_sound_samples/cries/tandemaus.aif new file mode 100644 index 0000000000..74c3b9484c Binary files /dev/null and b/sound/direct_sound_samples/cries/tandemaus.aif differ diff --git a/sound/direct_sound_samples/cries/tarountula.aif b/sound/direct_sound_samples/cries/tarountula.aif new file mode 100644 index 0000000000..b886e51c52 Binary files /dev/null and b/sound/direct_sound_samples/cries/tarountula.aif differ diff --git a/sound/direct_sound_samples/cries/tatsugiri.aif b/sound/direct_sound_samples/cries/tatsugiri.aif new file mode 100644 index 0000000000..6c4a155f37 Binary files /dev/null and b/sound/direct_sound_samples/cries/tatsugiri.aif differ diff --git a/sound/direct_sound_samples/cries/tinglu.aif b/sound/direct_sound_samples/cries/tinglu.aif new file mode 100644 index 0000000000..464dba0c8d Binary files /dev/null and b/sound/direct_sound_samples/cries/tinglu.aif differ diff --git a/sound/direct_sound_samples/cries/tinkatink.aif b/sound/direct_sound_samples/cries/tinkatink.aif new file mode 100644 index 0000000000..87bc80586d Binary files /dev/null and b/sound/direct_sound_samples/cries/tinkatink.aif differ diff --git a/sound/direct_sound_samples/cries/tinkaton.aif b/sound/direct_sound_samples/cries/tinkaton.aif new file mode 100644 index 0000000000..da174e1574 Binary files /dev/null and b/sound/direct_sound_samples/cries/tinkaton.aif differ diff --git a/sound/direct_sound_samples/cries/tinkatuff.aif b/sound/direct_sound_samples/cries/tinkatuff.aif new file mode 100644 index 0000000000..a2e6a09c29 Binary files /dev/null and b/sound/direct_sound_samples/cries/tinkatuff.aif differ diff --git a/sound/direct_sound_samples/cries/toedscool.aif b/sound/direct_sound_samples/cries/toedscool.aif new file mode 100644 index 0000000000..daaa40d73f Binary files /dev/null and b/sound/direct_sound_samples/cries/toedscool.aif differ diff --git a/sound/direct_sound_samples/cries/toedscruel.aif b/sound/direct_sound_samples/cries/toedscruel.aif new file mode 100644 index 0000000000..0fa6c5b240 Binary files /dev/null and b/sound/direct_sound_samples/cries/toedscruel.aif differ diff --git a/sound/direct_sound_samples/cries/varoom.aif b/sound/direct_sound_samples/cries/varoom.aif new file mode 100644 index 0000000000..b0d30b8033 Binary files /dev/null and b/sound/direct_sound_samples/cries/varoom.aif differ diff --git a/sound/direct_sound_samples/cries/veluza.aif b/sound/direct_sound_samples/cries/veluza.aif new file mode 100644 index 0000000000..5d09484ae5 Binary files /dev/null and b/sound/direct_sound_samples/cries/veluza.aif differ diff --git a/sound/direct_sound_samples/cries/wattrel.aif b/sound/direct_sound_samples/cries/wattrel.aif new file mode 100644 index 0000000000..807a278073 Binary files /dev/null and b/sound/direct_sound_samples/cries/wattrel.aif differ diff --git a/sound/direct_sound_samples/cries/wiglett.aif b/sound/direct_sound_samples/cries/wiglett.aif new file mode 100644 index 0000000000..38d10de7c8 Binary files /dev/null and b/sound/direct_sound_samples/cries/wiglett.aif differ diff --git a/sound/direct_sound_samples/cries/wochien.aif b/sound/direct_sound_samples/cries/wochien.aif new file mode 100644 index 0000000000..1cea8a165b Binary files /dev/null and b/sound/direct_sound_samples/cries/wochien.aif differ diff --git a/sound/direct_sound_samples/cries/wugtrio.aif b/sound/direct_sound_samples/cries/wugtrio.aif new file mode 100644 index 0000000000..31dacf5188 Binary files /dev/null and b/sound/direct_sound_samples/cries/wugtrio.aif differ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 18244672d6..69e7188bbd 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -148,6 +148,28 @@ const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/an const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz"); + +const u32 gMonFrontPic_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/front.4bpp.lz"); +const u32 gMonPalette_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/normal.gbapal.lz"); +const u32 gMonBackPic_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/back.4bpp.lz"); +const u32 gMonShinyPalette_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/shiny.gbapal.lz"); +const u8 gMonIcon_TaurosCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/combat/icon.4bpp"); +// const u8 gMonFootprint_TaurosCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/combat/footprint.1bpp"); + +const u32 gMonFrontPic_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/front.4bpp.lz"); +const u32 gMonPalette_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/normal.gbapal.lz"); +const u32 gMonBackPic_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/back.4bpp.lz"); +const u32 gMonShinyPalette_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/shiny.gbapal.lz"); +const u8 gMonIcon_TaurosBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/blaze/icon.4bpp"); +// const u8 gMonFootprint_TaurosBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/blaze/footprint.1bpp"); + +const u32 gMonFrontPic_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/front.4bpp.lz"); +const u32 gMonPalette_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/normal.gbapal.lz"); +const u32 gMonBackPic_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/back.4bpp.lz"); +const u32 gMonShinyPalette_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/shiny.gbapal.lz"); +const u8 gMonIcon_TaurosAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/aqua/icon.4bpp"); +// const u8 gMonFootprint_TaurosAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/aqua/footprint.1bpp"); + const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz"); const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz"); @@ -225,6 +247,14 @@ const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_f const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz"); const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/anim_frontf.4bpp.lz"); + +const u32 gMonFrontPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldea/front.4bpp.lz"); +const u32 gMonPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldea/normal.gbapal.lz"); +const u32 gMonBackPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldea/back.4bpp.lz"); +const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldea/shiny.gbapal.lz"); +// const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldea/icon.4bpp"); +// const u8 gMonFootprint_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldea/footprint.1bpp"); + const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz"); const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz"); @@ -7179,7 +7209,7 @@ const u32 gMonFrontPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/fr const u32 gMonPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/normal.gbapal.lz"); const u32 gMonBackPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/back.4bpp.lz"); const u32 gMonShinyPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/shiny.gbapal.lz"); -// const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/icon.4bpp"); +const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/icon.4bpp"); // const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/footprint.1bpp"); const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/front.4bpp.lz"); @@ -7193,35 +7223,35 @@ const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/ const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/normal.gbapal.lz"); const u32 gMonBackPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/back.4bpp.lz"); const u32 gMonShinyPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/shiny.gbapal.lz"); -// const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/icon.4bpp"); +const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/icon.4bpp"); // const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/footprint.1bpp"); const u32 gMonFrontPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/front.4bpp.lz"); const u32 gMonPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/normal.gbapal.lz"); const u32 gMonBackPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/back.4bpp.lz"); const u32 gMonShinyPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/shiny.gbapal.lz"); -// const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/icon.4bpp"); +const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/icon.4bpp"); // const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/footprint.1bpp"); const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/front.4bpp.lz"); const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/normal.gbapal.lz"); const u32 gMonBackPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/back.4bpp.lz"); const u32 gMonShinyPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/shiny.gbapal.lz"); -// const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/icon.4bpp"); +const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/icon.4bpp"); // const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/footprint.1bpp"); const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/front.4bpp.lz"); const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/normal.gbapal.lz"); const u32 gMonBackPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/back.4bpp.lz"); const u32 gMonShinyPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/shiny.gbapal.lz"); -// const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/icon.4bpp"); +const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/icon.4bpp"); // const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/footprint.1bpp"); const u32 gMonFrontPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/front.4bpp.lz"); const u32 gMonPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/normal.gbapal.lz"); const u32 gMonBackPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/back.4bpp.lz"); const u32 gMonShinyPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/shiny.gbapal.lz"); -// const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/icon.4bpp"); +const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/icon.4bpp"); // const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/footprint.1bpp"); const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/front.4bpp.lz"); @@ -7235,56 +7265,63 @@ const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/fron const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/normal.gbapal.lz"); const u32 gMonBackPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/back.4bpp.lz"); const u32 gMonShinyPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/shiny.gbapal.lz"); -// const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/icon.4bpp"); +const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/icon.4bpp"); // const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/footprint.1bpp"); const u32 gMonFrontPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/front.4bpp.lz"); const u32 gMonPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/normal.gbapal.lz"); const u32 gMonBackPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/back.4bpp.lz"); const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/shiny.gbapal.lz"); -// const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/icon.4bpp"); +const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/icon.4bpp"); // const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp"); const u32 gMonFrontPic_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz"); const u32 gMonPalette_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz"); const u32 gMonBackPic_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz"); const u32 gMonShinyPalette_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz"); -// const u8 gMonIcon_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp"); +const u8 gMonIcon_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp"); // const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); +const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/front.4bpp.lz"); +const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/normal.gbapal.lz"); +const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/back.4bpp.lz"); +const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/shiny.gbapal.lz"); +const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/female/icon.4bpp"); +// const u8 gMonFootprint_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); + const u32 gMonFrontPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/front.4bpp.lz"); const u32 gMonPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/normal.gbapal.lz"); const u32 gMonBackPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/back.4bpp.lz"); const u32 gMonShinyPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/shiny.gbapal.lz"); -// const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/icon.4bpp"); +const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/icon.4bpp"); // const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/footprint.1bpp"); const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/front.4bpp.lz"); const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/normal.gbapal.lz"); const u32 gMonBackPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/back.4bpp.lz"); const u32 gMonShinyPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/shiny.gbapal.lz"); -// const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/icon.4bpp"); +const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/icon.4bpp"); // const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/footprint.1bpp"); const u32 gMonFrontPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/front.4bpp.lz"); const u32 gMonPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/normal.gbapal.lz"); const u32 gMonBackPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/back.4bpp.lz"); const u32 gMonShinyPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/shiny.gbapal.lz"); -// const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/icon.4bpp"); +const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/icon.4bpp"); // const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/footprint.1bpp"); const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/front.4bpp.lz"); const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/normal.gbapal.lz"); const u32 gMonBackPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/back.4bpp.lz"); const u32 gMonShinyPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/shiny.gbapal.lz"); -// const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/icon.4bpp"); +const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/icon.4bpp"); // const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/footprint.1bpp"); const u32 gMonFrontPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/front.4bpp.lz"); const u32 gMonPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/normal.gbapal.lz"); const u32 gMonBackPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/back.4bpp.lz"); const u32 gMonShinyPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/shiny.gbapal.lz"); -// const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/icon.4bpp"); +const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/icon.4bpp"); // const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/footprint.1bpp"); const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/front.4bpp.lz"); @@ -7298,28 +7335,32 @@ const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/front.4bpp const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/normal.gbapal.lz"); const u32 gMonBackPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/back.4bpp.lz"); const u32 gMonShinyPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/shiny.gbapal.lz"); -// const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/icon.4bpp"); +const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/icon.4bpp"); // const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/footprint.1bpp"); const u32 gMonFrontPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/front.4bpp.lz"); const u32 gMonPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/normal.gbapal.lz"); const u32 gMonBackPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/back.4bpp.lz"); const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/shiny.gbapal.lz"); -// const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/icon.4bpp"); +const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/icon.4bpp"); // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp"); const u32 gMonFrontPic_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz"); const u32 gMonBackPic_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz"); -// const u8 gMonIcon_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); +const u8 gMonIcon_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); +const u32 gMonFrontPic_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/three/front.4bpp.lz"); +const u32 gMonBackPic_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/three/back.4bpp.lz"); +const u8 gMonIcon_MausholdThree[] = INCBIN_U8("graphics/pokemon/maushold/three/icon.4bpp"); + const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/front.4bpp.lz"); const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/normal.gbapal.lz"); const u32 gMonBackPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/back.4bpp.lz"); const u32 gMonShinyPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/shiny.gbapal.lz"); -// const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/icon.4bpp"); +const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/icon.4bpp"); // const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/footprint.1bpp"); const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/front.4bpp.lz"); @@ -7333,132 +7374,135 @@ const u32 gMonFrontPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/front.4bpp const u32 gMonPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/normal.gbapal.lz"); const u32 gMonBackPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/back.4bpp.lz"); const u32 gMonShinyPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/shiny.gbapal.lz"); -// const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/icon.4bpp"); +const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/icon.4bpp"); // const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/footprint.1bpp"); const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/front.4bpp.lz"); const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/normal.gbapal.lz"); const u32 gMonBackPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/back.4bpp.lz"); const u32 gMonShinyPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/shiny.gbapal.lz"); -// const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/icon.4bpp"); +const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/icon.4bpp"); // const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/footprint.1bpp"); const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/front.4bpp.lz"); const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/normal.gbapal.lz"); const u32 gMonBackPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/back.4bpp.lz"); const u32 gMonShinyPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/shiny.gbapal.lz"); -// const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/icon.4bpp"); +const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/icon.4bpp"); // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp"); const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/front.4bpp.lz"); -const u32 gMonPalette_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/normal.gbapal.lz"); +const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/normal.gbapal.lz"); const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/normal.gbapal.lz"); const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/normal.gbapal.lz"); const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/normal.gbapal.lz"); const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/back.4bpp.lz"); -const u32 gMonShinyPalette_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/shiny.gbapal.lz"); const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz"); const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz"); const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz"); -const u8 gMonIcon_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/icon.4bpp"); +const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/green_plumage/icon.4bpp"); +const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp"); +const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp"); +const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp"); // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/footprint.1bpp"); const u32 gMonFrontPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/front.4bpp.lz"); const u32 gMonPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/normal.gbapal.lz"); const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/back.4bpp.lz"); const u32 gMonShinyPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/shiny.gbapal.lz"); -// const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/icon.4bpp"); +const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/icon.4bpp"); // const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/footprint.1bpp"); const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/front.4bpp.lz"); const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/normal.gbapal.lz"); const u32 gMonBackPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/back.4bpp.lz"); const u32 gMonShinyPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/shiny.gbapal.lz"); -// const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/icon.4bpp"); +const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/icon.4bpp"); // const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/footprint.1bpp"); const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/front.4bpp.lz"); const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/normal.gbapal.lz"); const u32 gMonBackPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/back.4bpp.lz"); const u32 gMonShinyPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/shiny.gbapal.lz"); -// const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/icon.4bpp"); +const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/icon.4bpp"); // const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/footprint.1bpp"); const u32 gMonFrontPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/front.4bpp.lz"); const u32 gMonPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/normal.gbapal.lz"); const u32 gMonBackPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/back.4bpp.lz"); const u32 gMonShinyPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/shiny.gbapal.lz"); -// const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/icon.4bpp"); +const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/icon.4bpp"); // const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/footprint.1bpp"); const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/front.4bpp.lz"); const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/normal.gbapal.lz"); const u32 gMonBackPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/back.4bpp.lz"); const u32 gMonShinyPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/shiny.gbapal.lz"); -// const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/icon.4bpp"); +const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/icon.4bpp"); // const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/footprint.1bpp"); const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/front.4bpp.lz"); const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/normal.gbapal.lz"); const u32 gMonBackPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/back.4bpp.lz"); const u32 gMonShinyPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/shiny.gbapal.lz"); -// const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/icon.4bpp"); +const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/icon.4bpp"); // const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/footprint.1bpp"); const u32 gMonFrontPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/front.4bpp.lz"); const u32 gMonPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/normal.gbapal.lz"); const u32 gMonBackPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/back.4bpp.lz"); const u32 gMonShinyPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/shiny.gbapal.lz"); -// const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/icon.4bpp"); +const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/icon.4bpp"); // const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/footprint.1bpp"); const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/front.4bpp.lz"); const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/normal.gbapal.lz"); const u32 gMonBackPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/back.4bpp.lz"); const u32 gMonShinyPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/shiny.gbapal.lz"); -// const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/icon.4bpp"); +const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/icon.4bpp"); // const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/footprint.1bpp"); const u32 gMonFrontPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/front.4bpp.lz"); const u32 gMonPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/normal.gbapal.lz"); const u32 gMonBackPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/back.4bpp.lz"); const u32 gMonShinyPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/shiny.gbapal.lz"); -// const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/icon.4bpp"); +const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/icon.4bpp"); // const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/footprint.1bpp"); const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/front.4bpp.lz"); const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/normal.gbapal.lz"); const u32 gMonBackPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/back.4bpp.lz"); const u32 gMonShinyPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/shiny.gbapal.lz"); -// const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/icon.4bpp"); +const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/icon.4bpp"); // const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/footprint.1bpp"); const u32 gMonFrontPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/front.4bpp.lz"); const u32 gMonPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/normal.gbapal.lz"); const u32 gMonBackPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/back.4bpp.lz"); const u32 gMonShinyPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/shiny.gbapal.lz"); -// const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/icon.4bpp"); +const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/icon.4bpp"); // const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/footprint.1bpp"); const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/front.4bpp.lz"); const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/normal.gbapal.lz"); const u32 gMonBackPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/back.4bpp.lz"); const u32 gMonShinyPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/shiny.gbapal.lz"); -// const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/icon.4bpp"); +const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/icon.4bpp"); // const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/footprint.1bpp"); const u32 gMonFrontPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/front.4bpp.lz"); const u32 gMonPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/normal.gbapal.lz"); const u32 gMonBackPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/back.4bpp.lz"); const u32 gMonShinyPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/shiny.gbapal.lz"); -// const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/icon.4bpp"); +const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/icon.4bpp"); // const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/footprint.1bpp"); const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/front.4bpp.lz"); const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/normal.gbapal.lz"); const u32 gMonBackPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/back.4bpp.lz"); const u32 gMonShinyPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/shiny.gbapal.lz"); -// const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/icon.4bpp"); +const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/icon.4bpp"); // const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/footprint.1bpp"); const u32 gMonFrontPic_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/front.4bpp.lz"); @@ -7472,56 +7516,56 @@ const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghas const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/normal.gbapal.lz"); const u32 gMonBackPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/back.4bpp.lz"); const u32 gMonShinyPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/shiny.gbapal.lz"); -// const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/icon.4bpp"); +const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/icon.4bpp"); // const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/footprint.1bpp"); const u32 gMonFrontPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/front.4bpp.lz"); const u32 gMonPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/normal.gbapal.lz"); const u32 gMonBackPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/back.4bpp.lz"); const u32 gMonShinyPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/shiny.gbapal.lz"); -// const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/icon.4bpp"); +const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/icon.4bpp"); // const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/footprint.1bpp"); const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/front.4bpp.lz"); const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/normal.gbapal.lz"); const u32 gMonBackPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/back.4bpp.lz"); const u32 gMonShinyPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/shiny.gbapal.lz"); -// const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/icon.4bpp"); +const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/icon.4bpp"); // const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/footprint.1bpp"); const u32 gMonFrontPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/front.4bpp.lz"); const u32 gMonPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/normal.gbapal.lz"); const u32 gMonBackPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/back.4bpp.lz"); const u32 gMonShinyPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/shiny.gbapal.lz"); -// const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/icon.4bpp"); +const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/icon.4bpp"); // const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/footprint.1bpp"); const u32 gMonFrontPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/front.4bpp.lz"); const u32 gMonPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/normal.gbapal.lz"); const u32 gMonBackPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/back.4bpp.lz"); const u32 gMonShinyPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/shiny.gbapal.lz"); -// const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/icon.4bpp"); +const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/icon.4bpp"); // const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/footprint.1bpp"); const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/front.4bpp.lz"); const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/normal.gbapal.lz"); const u32 gMonBackPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/back.4bpp.lz"); const u32 gMonShinyPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/shiny.gbapal.lz"); -// const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/icon.4bpp"); +const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/icon.4bpp"); // const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/footprint.1bpp"); -// const u32 gMonFrontPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/front.4bpp.lz"); -// const u32 gMonPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/normal.gbapal.lz"); -// const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/back.4bpp.lz"); -// const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/shiny.gbapal.lz"); -// const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/icon.4bpp"); +const u32 gMonFrontPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/front.4bpp.lz"); +const u32 gMonPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/normal.gbapal.lz"); +const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/back.4bpp.lz"); +const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/shiny.gbapal.lz"); +const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/icon.4bpp"); // const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/footprint.1bpp"); -// const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz"); -// const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz"); -// const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/back.4bpp.lz"); +const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz"); +const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz"); +const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/back.4bpp.lz"); // const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/shiny.gbapal.lz"); -// const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/icon.4bpp"); +const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/icon.4bpp"); // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp"); const u32 gMonFrontPic_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/front.4bpp.lz"); @@ -7531,25 +7575,25 @@ const u32 gMonShinyPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/shin const u8 gMonIcon_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/icon.4bpp"); // const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/footprint.1bpp"); -// const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/front.4bpp.lz"); -// const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/normal.gbapal.lz"); -// const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/back.4bpp.lz"); -// const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/shiny.gbapal.lz"); -// const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/icon.4bpp"); +const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/front.4bpp.lz"); +const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/normal.gbapal.lz"); +const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/back.4bpp.lz"); +const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/shiny.gbapal.lz"); +const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/icon.4bpp"); // const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/footprint.1bpp"); -// const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/front.4bpp.lz"); -// const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/normal.gbapal.lz"); -// const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/back.4bpp.lz"); -// const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/shiny.gbapal.lz"); +const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/front.4bpp.lz"); +const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/normal.gbapal.lz"); +const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/back.4bpp.lz"); +const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/shiny.gbapal.lz"); // const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/icon.4bpp"); // const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp"); -// const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz"); -// const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz"); -// const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/back.4bpp.lz"); +const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz"); +const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz"); +const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/back.4bpp.lz"); // const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/shiny.gbapal.lz"); -// const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/icon.4bpp"); +const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/icon.4bpp"); // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp"); const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/front.4bpp.lz"); @@ -7563,210 +7607,220 @@ const u32 gMonFrontPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/front.4b const u32 gMonPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/normal.gbapal.lz"); const u32 gMonBackPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/back.4bpp.lz"); const u32 gMonShinyPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/shiny.gbapal.lz"); -// const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/icon.4bpp"); +const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/icon.4bpp"); // const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/footprint.1bpp"); const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/front.4bpp.lz"); const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/normal.gbapal.lz"); const u32 gMonBackPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/back.4bpp.lz"); const u32 gMonShinyPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/shiny.gbapal.lz"); -// const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/icon.4bpp"); +const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/icon.4bpp"); // const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/footprint.1bpp"); const u32 gMonFrontPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/front.4bpp.lz"); const u32 gMonPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/normal.gbapal.lz"); const u32 gMonBackPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/back.4bpp.lz"); const u32 gMonShinyPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/shiny.gbapal.lz"); -// const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/icon.4bpp"); +const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/icon.4bpp"); // const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/footprint.1bpp"); const u32 gMonFrontPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/front.4bpp.lz"); const u32 gMonPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/normal.gbapal.lz"); const u32 gMonBackPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/back.4bpp.lz"); const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/shiny.gbapal.lz"); -// const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/icon.4bpp"); +const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/icon.4bpp"); // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp"); const u32 gMonFrontPic_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz"); const u32 gMonPalette_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz"); const u32 gMonBackPic_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/back.4bpp.lz"); const u32 gMonShinyPalette_Palafin[] = INCBIN_U32("graphics/pokemon/palafin/shiny.gbapal.lz"); -// const u8 gMonIcon_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp"); +const u8 gMonIcon_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp"); // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); +const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/front.4bpp.lz"); +const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/normal.gbapal.lz"); +const u32 gMonBackPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/back.4bpp.lz"); +const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/shiny.gbapal.lz"); +const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/hero/icon.4bpp"); +// const u8 gMonFootprint_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); + const u32 gMonFrontPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/front.4bpp.lz"); const u32 gMonPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/normal.gbapal.lz"); const u32 gMonBackPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/back.4bpp.lz"); const u32 gMonShinyPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/shiny.gbapal.lz"); -// const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/icon.4bpp"); +const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/icon.4bpp"); // const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/footprint.1bpp"); const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/front.4bpp.lz"); const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/normal.gbapal.lz"); const u32 gMonBackPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/back.4bpp.lz"); const u32 gMonShinyPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/shiny.gbapal.lz"); -// const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/icon.4bpp"); +const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/icon.4bpp"); // const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/footprint.1bpp"); const u32 gMonFrontPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/front.4bpp.lz"); const u32 gMonPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/normal.gbapal.lz"); const u32 gMonBackPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/back.4bpp.lz"); const u32 gMonShinyPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/shiny.gbapal.lz"); -// const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/icon.4bpp"); +const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/icon.4bpp"); // const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/footprint.1bpp"); const u32 gMonFrontPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/front.4bpp.lz"); const u32 gMonPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/normal.gbapal.lz"); const u32 gMonBackPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/back.4bpp.lz"); const u32 gMonShinyPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/shiny.gbapal.lz"); -// const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/icon.4bpp"); +const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/icon.4bpp"); // const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/footprint.1bpp"); const u32 gMonFrontPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/front.4bpp.lz"); const u32 gMonPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/normal.gbapal.lz"); const u32 gMonBackPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/back.4bpp.lz"); const u32 gMonShinyPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/shiny.gbapal.lz"); -// const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/icon.4bpp"); +const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/icon.4bpp"); // const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/footprint.1bpp"); const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/front.4bpp.lz"); const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/normal.gbapal.lz"); const u32 gMonBackPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/back.4bpp.lz"); const u32 gMonShinyPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/shiny.gbapal.lz"); -// const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/icon.4bpp"); +const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/icon.4bpp"); // const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/footprint.1bpp"); const u32 gMonFrontPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/front.4bpp.lz"); const u32 gMonPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/normal.gbapal.lz"); const u32 gMonBackPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/back.4bpp.lz"); const u32 gMonShinyPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/shiny.gbapal.lz"); -// const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/icon.4bpp"); +const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/icon.4bpp"); // const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/footprint.1bpp"); const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/front.4bpp.lz"); const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/normal.gbapal.lz"); const u32 gMonBackPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/back.4bpp.lz"); const u32 gMonShinyPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/shiny.gbapal.lz"); -// const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/icon.4bpp"); +const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/icon.4bpp"); // const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/footprint.1bpp"); const u32 gMonFrontPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/front.4bpp.lz"); const u32 gMonPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/normal.gbapal.lz"); const u32 gMonBackPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/back.4bpp.lz"); const u32 gMonShinyPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/shiny.gbapal.lz"); -// const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/icon.4bpp"); +const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/icon.4bpp"); // const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/footprint.1bpp"); const u32 gMonFrontPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/front.4bpp.lz"); const u32 gMonPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/normal.gbapal.lz"); const u32 gMonBackPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/back.4bpp.lz"); const u32 gMonShinyPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/shiny.gbapal.lz"); -// const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/icon.4bpp"); +const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/icon.4bpp"); // const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/footprint.1bpp"); const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/front.4bpp.lz"); const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/normal.gbapal.lz"); const u32 gMonBackPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/back.4bpp.lz"); const u32 gMonShinyPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/shiny.gbapal.lz"); -// const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/icon.4bpp"); +const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/icon.4bpp"); // const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/footprint.1bpp"); const u32 gMonFrontPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/front.4bpp.lz"); const u32 gMonPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/normal.gbapal.lz"); const u32 gMonBackPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/back.4bpp.lz"); const u32 gMonShinyPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/shiny.gbapal.lz"); -// const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/icon.4bpp"); +const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/icon.4bpp"); // const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/footprint.1bpp"); const u32 gMonFrontPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/front.4bpp.lz"); const u32 gMonPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/normal.gbapal.lz"); const u32 gMonBackPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/back.4bpp.lz"); const u32 gMonShinyPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/shiny.gbapal.lz"); -// const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/icon.4bpp"); +const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/icon.4bpp"); // const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/footprint.1bpp"); const u32 gMonFrontPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/front.4bpp.lz"); const u32 gMonPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/normal.gbapal.lz"); const u32 gMonBackPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/shiny.gbapal.lz"); -const u8 gMonIcon_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/icon.4bpp"); +const u8 gMonIcon_TatsugiriCurly[] = INCBIN_U8("graphics/pokemon/tatsugiri/curly/icon.4bpp"); // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); const u32 gMonFrontPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/front.4bpp.lz"); const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/normal.gbapal.lz"); const u32 gMonBackPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/shiny.gbapal.lz"); -// const u8 gMonIcon_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/icon.4bpp"); +const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/tatsugiri/droopy/icon.4bpp"); // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); const u32 gMonFrontPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/front.4bpp.lz"); const u32 gMonPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/normal.gbapal.lz"); const u32 gMonBackPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/shiny.gbapal.lz"); -// const u8 gMonIcon_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/icon.4bpp"); +const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/tatsugiri/stretchy/icon.4bpp"); // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/front.4bpp.lz"); const u32 gMonPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/normal.gbapal.lz"); const u32 gMonBackPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/back.4bpp.lz"); const u32 gMonShinyPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/shiny.gbapal.lz"); -// const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/icon.4bpp"); +const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/icon.4bpp"); // const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/footprint.1bpp"); const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/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"); -// const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/icon.4bpp"); +const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/icon.4bpp"); // const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp"); const u32 gMonFrontPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/front.4bpp.lz"); const u32 gMonPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/normal.gbapal.lz"); const u32 gMonBackPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/back.4bpp.lz"); const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/shiny.gbapal.lz"); -// const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/icon.4bpp"); +const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/icon.4bpp"); // const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp"); const u32 gMonFrontPic_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz"); const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/normal.gbapal.lz"); const u32 gMonBackPic_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz"); const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/shiny.gbapal.lz"); -// const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/icon.4bpp"); +const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/icon.4bpp"); // const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp"); +const u32 gMonFrontPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/front.4bpp.lz"); +const u32 gMonBackPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/back.4bpp.lz"); + const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/front.4bpp.lz"); const u32 gMonPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/normal.gbapal.lz"); const u32 gMonBackPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/back.4bpp.lz"); const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/shiny.gbapal.lz"); -// const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/icon.4bpp"); +const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/icon.4bpp"); // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp"); const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/front.4bpp.lz"); const u32 gMonPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/normal.gbapal.lz"); const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/back.4bpp.lz"); const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/shiny.gbapal.lz"); -// const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/icon.4bpp"); +const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/icon.4bpp"); // const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/footprint.1bpp"); const u32 gMonFrontPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/front.4bpp.lz"); const u32 gMonPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/normal.gbapal.lz"); const u32 gMonBackPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/back.4bpp.lz"); const u32 gMonShinyPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/shiny.gbapal.lz"); -// const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/icon.4bpp"); +const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/icon.4bpp"); // const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/footprint.1bpp"); const u32 gMonFrontPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/front.4bpp.lz"); const u32 gMonPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/normal.gbapal.lz"); const u32 gMonBackPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/back.4bpp.lz"); const u32 gMonShinyPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/shiny.gbapal.lz"); -// const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/icon.4bpp"); +const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/icon.4bpp"); // const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/footprint.1bpp"); const u32 gMonFrontPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/front.4bpp.lz"); const u32 gMonPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/normal.gbapal.lz"); const u32 gMonBackPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/back.4bpp.lz"); const u32 gMonShinyPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/shiny.gbapal.lz"); -// const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/icon.4bpp"); +const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/icon.4bpp"); // const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/footprint.1bpp"); const u32 gMonFrontPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/front.4bpp.lz"); @@ -7787,21 +7841,21 @@ const u32 gMonFrontPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/f const u32 gMonPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/normal.gbapal.lz"); const u32 gMonBackPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/back.4bpp.lz"); const u32 gMonShinyPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/shiny.gbapal.lz"); -// const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/icon.4bpp"); +const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/icon.4bpp"); // const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/footprint.1bpp"); const u32 gMonFrontPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/front.4bpp.lz"); const u32 gMonPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/normal.gbapal.lz"); const u32 gMonBackPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/back.4bpp.lz"); const u32 gMonShinyPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/shiny.gbapal.lz"); -// const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/icon.4bpp"); +const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/icon.4bpp"); // const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/footprint.1bpp"); const u32 gMonFrontPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/front.4bpp.lz"); const u32 gMonPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/normal.gbapal.lz"); const u32 gMonBackPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/back.4bpp.lz"); const u32 gMonShinyPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/shiny.gbapal.lz"); -// const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/icon.4bpp"); +const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/icon.4bpp"); // const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/footprint.1bpp"); const u32 gMonFrontPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/front.4bpp.lz"); @@ -7815,49 +7869,56 @@ const u32 gMonFrontPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/front const u32 gMonPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/normal.gbapal.lz"); const u32 gMonBackPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/back.4bpp.lz"); const u32 gMonShinyPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/shiny.gbapal.lz"); -// const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/icon.4bpp"); +const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/icon.4bpp"); // const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/footprint.1bpp"); const u32 gMonFrontPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/front.4bpp.lz"); const u32 gMonPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/normal.gbapal.lz"); const u32 gMonBackPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/back.4bpp.lz"); const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/shiny.gbapal.lz"); -// const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/icon.4bpp"); +const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/icon.4bpp"); // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp"); const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/front.4bpp.lz"); const u32 gMonPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/normal.gbapal.lz"); const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/back.4bpp.lz"); const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/shiny.gbapal.lz"); -// const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/icon.4bpp"); +const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/icon.4bpp"); // const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/footprint.1bpp"); const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/front.4bpp.lz"); const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/normal.gbapal.lz"); const u32 gMonBackPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/back.4bpp.lz"); const u32 gMonShinyPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/shiny.gbapal.lz"); -// const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/icon.4bpp"); +const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/icon.4bpp"); // const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/footprint.1bpp"); const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/front.4bpp.lz"); const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/normal.gbapal.lz"); const u32 gMonBackPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/back.4bpp.lz"); const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/shiny.gbapal.lz"); -// const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/icon.4bpp"); +const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/icon.4bpp"); // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp"); const u32 gMonFrontPic_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/front.4bpp.lz"); const u32 gMonPalette_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/normal.gbapal.lz"); const u32 gMonBackPic_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/back.4bpp.lz"); const u32 gMonShinyPalette_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/shiny.gbapal.lz"); -// const u8 gMonIcon_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); +const u8 gMonIcon_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); -// const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz"); -// const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz"); -// const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/back.4bpp.lz"); -// const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/shiny.gbapal.lz"); -// const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/icon.4bpp"); +const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/front.4bpp.lz"); +const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/normal.gbapal.lz"); +const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/back.4bpp.lz"); +const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/shiny.gbapal.lz"); +// const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); +// const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); + +const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz"); +const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz"); +const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/back.4bpp.lz"); +const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/shiny.gbapal.lz"); +const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/icon.4bpp"); // const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/footprint.1bpp"); const u32 gMonFrontPic_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/front.4bpp.lz"); @@ -7885,28 +7946,28 @@ const u32 gMonFrontPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/front.4bpp. const u32 gMonPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/normal.gbapal.lz"); const u32 gMonBackPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/back.4bpp.lz"); const u32 gMonShinyPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/shiny.gbapal.lz"); -// const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/icon.4bpp"); +const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/icon.4bpp"); // const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/footprint.1bpp"); -// const u32 gMonFrontPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/front.4bpp.lz"); -// const u32 gMonPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/normal.gbapal.lz"); -// const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/back.4bpp.lz"); -// const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/shiny.gbapal.lz"); -// const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/icon.4bpp"); +const u32 gMonFrontPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/front.4bpp.lz"); +const u32 gMonPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/normal.gbapal.lz"); +const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/back.4bpp.lz"); +const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/shiny.gbapal.lz"); +const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/icon.4bpp"); // const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/footprint.1bpp"); const u32 gMonFrontPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/front.4bpp.lz"); const u32 gMonPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/normal.gbapal.lz"); const u32 gMonBackPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/back.4bpp.lz"); const u32 gMonShinyPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/shiny.gbapal.lz"); -// const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/icon.4bpp"); +const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/icon.4bpp"); // const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/footprint.1bpp"); const u32 gMonFrontPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/front.4bpp.lz"); const u32 gMonPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/normal.gbapal.lz"); const u32 gMonBackPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/back.4bpp.lz"); const u32 gMonShinyPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/shiny.gbapal.lz"); -// const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/icon.4bpp"); +const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/icon.4bpp"); // const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/footprint.1bpp"); const u32 gMonFrontPic_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/front.4bpp.lz"); diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index abc86aeba8..775a59dc32 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -772,6 +772,32 @@ const u8 gTaurosPokedexText[] = _( "Tauros to battle, it will charge at thick\n" "trees and knock them down to calm itself."); +const u8 gTaurosCombatBreedPokedexText[] = _( + "This Pokémon has a muscular body\n" + "and excels at close-quarters combat.\n" + "It uses its short horns to strike\n" + "the opponent’s weak spots."); + +const u8 gTaurosBlazeBreedPokedexText[] = _( + "When heated by fire energy, its horns can\n" + "get hotter than 1,800 degrees Fahrenheit.\n" + "Those gored by them will suffer\n" + "both wounds and burns."); + +// Placeholder +const u8 gTaurosAquaBreedPokedexText[] = _( + "When heated by fire energy, its horns can\n" + "get hotter than 1,800 degrees Fahrenheit.\n" + "Those gored by them will suffer\n" + "both wounds and burns."); + +// Error massage: array `gTaurosAquaBreedPokedexText' assumed to have one element +// const u8 gTaurosAquaBreedPokedexText[] = _( +// "This Pokémon blasts water from holes on\n" +// "the tips of its horns—the high-pressure\n" +// "jets pierce right through\n" +// "Tauros’s enemies."); + const u8 gMagikarpPokedexText[] = _( "Its swimming muscles are weak, so it is\n" "easily washed away by currents. In places\n" @@ -1168,6 +1194,12 @@ const u8 gWooperPokedexText[] = _( "On land, they coat their bodies with a\n" "gooey, toxic film."); +const u8 gWooperPaldeaPokedexText[] = _( + "After losing a territorial struggle,\n" + "Wooper began living on land.\n" + "The Pokémon changed over time, developing\n" + "a poisonous film to protect its body."); + const u8 gQuagsirePokedexText[] = _( "A Quagsire hunts by leaving its mouth wide\n" "open in water and waiting for its prey to\n" diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index ec59f632ed..2b5297b6e2 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -3801,27 +3801,57 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, +#define TAUROS_MISC_INFO \ + .baseHP = 75, \ + .baseAttack = 100, \ + .baseDefense = 95, \ + .baseSpeed = 110, \ + .baseSpAttack = 40, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = 172, \ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \ + .noFlip = FALSE + [SPECIES_TAUROS] = { - .baseHP = 75, - .baseAttack = 100, - .baseDefense = 95, - .baseSpeed = 110, - .baseSpAttack = 40, - .baseSpDefense = 70, .types = { TYPE_NORMAL, TYPE_NORMAL }, - .catchRate = 45, - .expYield = 172, .evYield_Attack = 1, .evYield_Speed = 1, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_SLOW, - .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FIELD}, .abilities = {ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_SHEER_FORCE}, .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + TAUROS_MISC_INFO + }, + + [SPECIES_TAUROS_PALDEAN] = + { + .types = { TYPE_FIGHTING, TYPE_FIGHTING }, + .evYield_Attack = 2, + .abilities = {ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW}, + .bodyColor = BODY_COLOR_BROWN, + TAUROS_MISC_INFO + }, + + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = + { + .types = { TYPE_FIGHTING, TYPE_FIRE }, + .evYield_Attack = 2, + .abilities = {ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW}, + .bodyColor = BODY_COLOR_BROWN, + TAUROS_MISC_INFO + }, + + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = + { + .types = { TYPE_FIGHTING, TYPE_WATER }, + .evYield_Attack = 2, + .abilities = {ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW}, + .bodyColor = BODY_COLOR_BROWN, + TAUROS_MISC_INFO }, [SPECIES_MAGIKARP] = @@ -5314,26 +5344,37 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, +#define WOOPER_MISC_INFO \ + .baseHP = 55, \ + .baseAttack = 45, \ + .baseDefense = 45, \ + .baseSpeed = 15, \ + .baseSpAttack = 25, \ + .baseSpDefense = 25, \ + .catchRate = 255, \ + .expYield = 42, \ + .evYield_HP = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD}, \ + .noFlip = FALSE + [SPECIES_WOOPER] = { - .baseHP = 55, - .baseAttack = 45, - .baseDefense = 45, - .baseSpeed = 15, - .baseSpAttack = 25, - .baseSpDefense = 25, .types = { TYPE_WATER, TYPE_GROUND }, - .catchRate = 255, - .expYield = 42, - .evYield_HP = 1, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD}, .abilities = {ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE}, .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + WOOPER_MISC_INFO + }, + + [SPECIES_WOOPER_PALDEAN] = + { + .types = { TYPE_WATER, TYPE_GROUND }, + .abilities = {ABILITY_POISON_POINT, ABILITY_WATER_ABSORB, ABILITY_UNAWARE}, + .bodyColor = BODY_COLOR_BROWN, + WOOPER_MISC_INFO }, [SPECIES_QUAGSIRE] = diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 8ea2fcd0f8..ed50efcf37 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -152,6 +152,9 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_PINSIR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_TAUROS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, + [SPECIES_TAUROS_PALDEAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MAGIKARP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GYARADOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_LAPRAS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, @@ -218,6 +221,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_YANMA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WOOPER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, + [SPECIES_WOOPER_PALDEAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_QUAGSIRE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ESPEON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_UMBREON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -951,6 +955,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_OINKOLOGNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, @@ -959,7 +964,8 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, @@ -990,11 +996,11 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 20 }, [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WIGLETT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, @@ -1022,11 +1028,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DUDUNSPARCE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_SCREAM_TAIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BRUTE_BONNET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_SLITHER_WING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SANDY_SHOCKS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_IRON_TREADS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, @@ -1039,12 +1046,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_GIMMIGHOUL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CHI_YU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ROARING_MOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ROARING_MOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_IRON_VALIANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KORAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MIRAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 6811831771..dc5b8a3eb8 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -129,6 +129,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(MAGMAR, gMonBackPic_Magmar), SPECIES_SPRITE(PINSIR, gMonBackPic_Pinsir), SPECIES_SPRITE(TAUROS, gMonBackPic_Tauros), + SPECIES_SPRITE(TAUROS_PALDEAN, gMonBackPic_TaurosCombatBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_BLAZE_BREED, gMonBackPic_TaurosBlazeBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_AQUA_BREED, gMonBackPic_TaurosAquaBreed), SPECIES_SPRITE(MAGIKARP, gMonBackPic_Magikarp), SPECIES_SPRITE(GYARADOS, gMonBackPic_Gyarados), SPECIES_SPRITE(LAPRAS, gMonBackPic_Lapras), @@ -195,6 +198,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SUNFLORA, gMonBackPic_Sunflora), SPECIES_SPRITE(YANMA, gMonBackPic_Yanma), SPECIES_SPRITE(WOOPER, gMonBackPic_Wooper), + SPECIES_SPRITE(WOOPER_PALDEAN, gMonBackPic_WooperPaldean), SPECIES_SPRITE(QUAGSIRE, gMonBackPic_Quagsire), SPECIES_SPRITE(ESPEON, gMonBackPic_Espeon), SPECIES_SPRITE(UMBREON, gMonBackPic_Umbreon), @@ -1348,6 +1352,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(QUAQUAVAL, gMonBackPic_Quaquaval), SPECIES_SPRITE(LECHONK, gMonBackPic_Lechonk), SPECIES_SPRITE(OINKOLOGNE, gMonBackPic_Oinkologne), + SPECIES_SPRITE(OINKOLOGNE_FEMALE, gMonBackPic_OinkologneFemale), SPECIES_SPRITE(TAROUNTULA, gMonBackPic_Tarountula), SPECIES_SPRITE(SPIDOPS, gMonBackPic_Spidops), SPECIES_SPRITE(NYMBLE, gMonBackPic_Nymble), @@ -1357,6 +1362,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PAWMOT, gMonBackPic_Pawmot), SPECIES_SPRITE(TANDEMAUS, gMonBackPic_Tandemaus), SPECIES_SPRITE(MAUSHOLD, gMonBackPic_Maushold), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_THREE, gMonBackPic_MausholdThree), SPECIES_SPRITE(FIDOUGH, gMonBackPic_Fidough), SPECIES_SPRITE(DACHSBUN, gMonBackPic_Dachsbun), SPECIES_SPRITE(SMOLIV, gMonBackPic_Smoliv), @@ -1387,18 +1393,19 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(KLAWF, gMonBackPic_Klawf), SPECIES_SPRITE(CAPSAKID, gMonBackPic_Capsakid), SPECIES_SPRITE(SCOVILLAIN, gMonBackPic_Scovillain), - // SPECIES_SPRITE(RELLOR, gMonBackPic_Rellor), - // SPECIES_SPRITE(RABSCA, gMonBackPic_Rabsca), + SPECIES_SPRITE(RELLOR, gMonBackPic_Rellor), + SPECIES_SPRITE(RABSCA, gMonBackPic_Rabsca), SPECIES_SPRITE(FLITTLE, gMonBackPic_Flittle), - // SPECIES_SPRITE(ESPATHRA, gMonBackPic_Espathra), - // SPECIES_SPRITE(TINKATINK, gMonBackPic_Tinkatink), - // SPECIES_SPRITE(TINKATUFF, gMonBackPic_Tinkatuff), + SPECIES_SPRITE(ESPATHRA, gMonBackPic_Espathra), + SPECIES_SPRITE(TINKATINK, gMonBackPic_Tinkatink), + SPECIES_SPRITE(TINKATUFF, gMonBackPic_Tinkatuff), SPECIES_SPRITE(TINKATON, gMonBackPic_Tinkaton), SPECIES_SPRITE(WIGLETT, gMonBackPic_Wiglett), SPECIES_SPRITE(WUGTRIO, gMonBackPic_Wugtrio), SPECIES_SPRITE(BOMBIRDIER, gMonBackPic_Bombirdier), SPECIES_SPRITE(FINIZEN, gMonBackPic_Finizen), SPECIES_SPRITE(PALAFIN, gMonBackPic_Palafin), + SPECIES_SPRITE(PALAFIN_HERO, gMonBackPic_PalafinHero), SPECIES_SPRITE(VAROOM, gMonBackPic_Varoom), SPECIES_SPRITE(REVAVROOM, gMonBackPic_Revavroom), SPECIES_SPRITE(CYCLIZAR, gMonBackPic_Cyclizar), @@ -1419,6 +1426,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(CLODSIRE, gMonBackPic_Clodsire), SPECIES_SPRITE(FARIGIRAF, gMonBackPic_Farigiraf), SPECIES_SPRITE(DUDUNSPARCE, gMonBackPic_Dudunsparce), + SPECIES_SPRITE(DUDUNSPARCE_THREE_SEGMENT, gMonBackPic_DudunsparceThreeSegment), SPECIES_SPRITE(KINGAMBIT, gMonBackPic_Kingambit), SPECIES_SPRITE(GREAT_TUSK, gMonBackPic_GreatTusk), SPECIES_SPRITE(SCREAM_TAIL, gMonBackPic_ScreamTail), @@ -1436,12 +1444,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ARCTIBAX, gMonBackPic_Arctibax), SPECIES_SPRITE(BAXCALIBUR, gMonBackPic_Baxcalibur), SPECIES_SPRITE(GIMMIGHOUL, gMonBackPic_Gimmighoul), - // SPECIES_SPRITE(GHOLDENGO, gMonBackPic_Gholdengo), + SPECIES_SPRITE(GIMMIGHOUL_ROAMING, gMonBackPic_GimmighoulRoaming), + SPECIES_SPRITE(GHOLDENGO, gMonBackPic_Gholdengo), SPECIES_SPRITE(WO_CHIEN, gMonBackPic_WoChien), SPECIES_SPRITE(CHIEN_PAO, gMonBackPic_ChienPao), SPECIES_SPRITE(TING_LU, gMonBackPic_TingLu), SPECIES_SPRITE(CHI_YU, gMonBackPic_ChiYu), - // SPECIES_SPRITE(ROARING_MOON, gMonBackPic_RoaringMoon), + SPECIES_SPRITE(ROARING_MOON, gMonBackPic_RoaringMoon), SPECIES_SPRITE(IRON_VALIANT, gMonBackPic_IronValiant), SPECIES_SPRITE(KORAIDON, gMonBackPic_Koraidon), SPECIES_SPRITE(MIRAIDON, gMonBackPic_Miraidon), diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index f6e9babb49..9b0f2717f2 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -277,8 +277,9 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_GLIMMORA] = 10, [SPECIES_VELUZA] = 1, [SPECIES_DONDOZO] = 1, - [SPECIES_FLUTTER_MANE] = 11, - [SPECIES_IRON_MOTH] = 8, - [SPECIES_CHI_YU] = 11, + [SPECIES_FLUTTER_MANE] = 5, + [SPECIES_IRON_JUGULIS] = 7, + [SPECIES_IRON_MOTH] = 4, + [SPECIES_CHI_YU] = 2, #endif }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index b66e7d3ef7..b48fb6f791 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -199,6 +199,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, [SPECIES_YANMA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_WOOPER] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, + [SPECIES_WOOPER_PALDEAN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 12 }, [SPECIES_QUAGSIRE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ESPEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_UMBREON] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, @@ -940,7 +941,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, @@ -971,7 +973,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1003,6 +1005,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DUDUNSPARCE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SCREAM_TAIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, @@ -1020,6 +1023,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GIMMIGHOUL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 9227b79abb..6f403b4989 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -129,6 +129,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(MAGMAR, gMonFrontPic_Magmar), SPECIES_SPRITE(PINSIR, gMonFrontPic_Pinsir), SPECIES_SPRITE(TAUROS, gMonFrontPic_Tauros), + SPECIES_SPRITE(TAUROS_PALDEAN, gMonFrontPic_TaurosCombatBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_BLAZE_BREED, gMonFrontPic_TaurosBlazeBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_AQUA_BREED, gMonFrontPic_TaurosAquaBreed), SPECIES_SPRITE(MAGIKARP, gMonFrontPic_Magikarp), SPECIES_SPRITE(GYARADOS, gMonFrontPic_Gyarados), SPECIES_SPRITE(LAPRAS, gMonFrontPic_Lapras), @@ -195,6 +198,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SUNFLORA, gMonFrontPic_Sunflora), SPECIES_SPRITE(YANMA, gMonFrontPic_Yanma), SPECIES_SPRITE(WOOPER, gMonFrontPic_Wooper), + SPECIES_SPRITE(WOOPER_PALDEAN, gMonFrontPic_WooperPaldean), SPECIES_SPRITE(QUAGSIRE, gMonFrontPic_Quagsire), SPECIES_SPRITE(ESPEON, gMonFrontPic_Espeon), SPECIES_SPRITE(UMBREON, gMonFrontPic_Umbreon), @@ -1346,6 +1350,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(QUAQUAVAL, gMonFrontPic_Quaquaval), SPECIES_SPRITE(LECHONK, gMonFrontPic_Lechonk), SPECIES_SPRITE(OINKOLOGNE, gMonFrontPic_Oinkologne), + SPECIES_SPRITE(OINKOLOGNE_FEMALE, gMonFrontPic_OinkologneFemale), SPECIES_SPRITE(TAROUNTULA, gMonFrontPic_Tarountula), SPECIES_SPRITE(SPIDOPS, gMonFrontPic_Spidops), SPECIES_SPRITE(NYMBLE, gMonFrontPic_Nymble), @@ -1355,6 +1360,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PAWMOT, gMonFrontPic_Pawmot), SPECIES_SPRITE(TANDEMAUS, gMonFrontPic_Tandemaus), SPECIES_SPRITE(MAUSHOLD, gMonFrontPic_Maushold), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_THREE, gMonFrontPic_MausholdThree), SPECIES_SPRITE(FIDOUGH, gMonFrontPic_Fidough), SPECIES_SPRITE(DACHSBUN, gMonFrontPic_Dachsbun), SPECIES_SPRITE(SMOLIV, gMonFrontPic_Smoliv), @@ -1385,18 +1391,19 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(KLAWF, gMonFrontPic_Klawf), SPECIES_SPRITE(CAPSAKID, gMonFrontPic_Capsakid), SPECIES_SPRITE(SCOVILLAIN, gMonFrontPic_Scovillain), - // SPECIES_SPRITE(RELLOR, gMonFrontPic_Rellor), - // SPECIES_SPRITE(RABSCA, gMonFrontPic_Rabsca), + SPECIES_SPRITE(RELLOR, gMonFrontPic_Rellor), + SPECIES_SPRITE(RABSCA, gMonFrontPic_Rabsca), SPECIES_SPRITE(FLITTLE, gMonFrontPic_Flittle), - // SPECIES_SPRITE(ESPATHRA, gMonFrontPic_Espathra), - // SPECIES_SPRITE(TINKATINK, gMonFrontPic_Tinkatink), - // SPECIES_SPRITE(TINKATUFF, gMonFrontPic_Tinkatuff), + SPECIES_SPRITE(ESPATHRA, gMonFrontPic_Espathra), + SPECIES_SPRITE(TINKATINK, gMonFrontPic_Tinkatink), + SPECIES_SPRITE(TINKATUFF, gMonFrontPic_Tinkatuff), SPECIES_SPRITE(TINKATON, gMonFrontPic_Tinkaton), SPECIES_SPRITE(WIGLETT, gMonFrontPic_Wiglett), SPECIES_SPRITE(WUGTRIO, gMonFrontPic_Wugtrio), SPECIES_SPRITE(BOMBIRDIER, gMonFrontPic_Bombirdier), SPECIES_SPRITE(FINIZEN, gMonFrontPic_Finizen), SPECIES_SPRITE(PALAFIN, gMonFrontPic_Palafin), + SPECIES_SPRITE(PALAFIN_HERO, gMonFrontPic_PalafinHero), SPECIES_SPRITE(VAROOM, gMonFrontPic_Varoom), SPECIES_SPRITE(REVAVROOM, gMonFrontPic_Revavroom), SPECIES_SPRITE(CYCLIZAR, gMonFrontPic_Cyclizar), @@ -1417,6 +1424,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(CLODSIRE, gMonFrontPic_Clodsire), SPECIES_SPRITE(FARIGIRAF, gMonFrontPic_Farigiraf), SPECIES_SPRITE(DUDUNSPARCE, gMonFrontPic_Dudunsparce), + SPECIES_SPRITE(DUDUNSPARCE_THREE_SEGMENT, gMonFrontPic_DudunsparceThreeSegment), SPECIES_SPRITE(KINGAMBIT, gMonFrontPic_Kingambit), SPECIES_SPRITE(GREAT_TUSK, gMonFrontPic_GreatTusk), SPECIES_SPRITE(SCREAM_TAIL, gMonFrontPic_ScreamTail), @@ -1434,12 +1442,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ARCTIBAX, gMonFrontPic_Arctibax), SPECIES_SPRITE(BAXCALIBUR, gMonFrontPic_Baxcalibur), SPECIES_SPRITE(GIMMIGHOUL, gMonFrontPic_Gimmighoul), - // SPECIES_SPRITE(GHOLDENGO, gMonFrontPic_Gholdengo), + SPECIES_SPRITE(GIMMIGHOUL_ROAMING, gMonFrontPic_GimmighoulRoaming), + SPECIES_SPRITE(GHOLDENGO, gMonFrontPic_Gholdengo), SPECIES_SPRITE(WO_CHIEN, gMonFrontPic_WoChien), SPECIES_SPRITE(CHIEN_PAO, gMonFrontPic_ChienPao), SPECIES_SPRITE(TING_LU, gMonFrontPic_TingLu), SPECIES_SPRITE(CHI_YU, gMonFrontPic_ChiYu), - // SPECIES_SPRITE(ROARING_MOON, gMonFrontPic_RoaringMoon), + SPECIES_SPRITE(ROARING_MOON, gMonFrontPic_RoaringMoon), SPECIES_SPRITE(IRON_VALIANT, gMonFrontPic_IronValiant), SPECIES_SPRITE(KORAIDON, gMonFrontPic_Koraidon), SPECIES_SPRITE(MIRAIDON, gMonFrontPic_Miraidon), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index d185650acc..5a631c185a 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -129,6 +129,9 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(MAGMAR, gMonPalette_Magmar), SPECIES_PAL(PINSIR, gMonPalette_Pinsir), SPECIES_PAL(TAUROS, gMonPalette_Tauros), + SPECIES_PAL(TAUROS_PALDEAN, gMonPalette_TaurosCombatBreed), + SPECIES_PAL(TAUROS_PALDEAN_BLAZE_BREED, gMonPalette_TaurosBlazeBreed), + SPECIES_PAL(TAUROS_PALDEAN_AQUA_BREED, gMonPalette_TaurosAquaBreed), SPECIES_PAL(MAGIKARP, gMonPalette_Magikarp), SPECIES_PAL(GYARADOS, gMonPalette_Gyarados), SPECIES_PAL(LAPRAS, gMonPalette_Lapras), @@ -195,6 +198,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(SUNFLORA, gMonPalette_Sunflora), SPECIES_PAL(YANMA, gMonPalette_Yanma), SPECIES_PAL(WOOPER, gMonPalette_Wooper), + SPECIES_PAL(WOOPER_PALDEAN, gMonPalette_WooperPaldean), SPECIES_PAL(QUAGSIRE, gMonPalette_Quagsire), SPECIES_PAL(ESPEON, gMonPalette_Espeon), SPECIES_PAL(UMBREON, gMonPalette_Umbreon), @@ -1345,6 +1349,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(QUAQUAVAL, gMonPalette_Quaquaval), SPECIES_PAL(LECHONK, gMonPalette_Lechonk), SPECIES_PAL(OINKOLOGNE, gMonPalette_Oinkologne), + SPECIES_PAL(OINKOLOGNE_FEMALE, gMonPalette_OinkologneFemale), SPECIES_PAL(TAROUNTULA, gMonPalette_Tarountula), SPECIES_PAL(SPIDOPS, gMonPalette_Spidops), SPECIES_PAL(NYMBLE, gMonPalette_Nymble), @@ -1354,12 +1359,13 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(PAWMOT, gMonPalette_Pawmot), SPECIES_PAL(TANDEMAUS, gMonPalette_Tandemaus), SPECIES_PAL(MAUSHOLD, gMonPalette_Maushold), + SPECIES_PAL(MAUSHOLD_FAMILY_OF_THREE, gMonPalette_Maushold), SPECIES_PAL(FIDOUGH, gMonPalette_Fidough), SPECIES_PAL(DACHSBUN, gMonPalette_Dachsbun), SPECIES_PAL(SMOLIV, gMonPalette_Smoliv), SPECIES_PAL(DOLLIV, gMonPalette_Dolliv), SPECIES_PAL(ARBOLIVA, gMonPalette_Arboliva), - SPECIES_PAL(SQUAWKABILLY, gMonPalette_Squawkabilly), + SPECIES_PAL(SQUAWKABILLY, gMonPalette_SquawkabillyGreenPlumage), SPECIES_PAL(SQUAWKABILLY_BLUE_PLUMAGE, gMonPalette_SquawkabillyBluePlumage), SPECIES_PAL(SQUAWKABILLY_YELLOW_PLUMAGE, gMonPalette_SquawkabillyYellowPlumage), SPECIES_PAL(SQUAWKABILLY_WHITE_PLUMAGE, gMonPalette_SquawkabillyWhitePlumage), @@ -1384,18 +1390,19 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(KLAWF, gMonPalette_Klawf), SPECIES_PAL(CAPSAKID, gMonPalette_Capsakid), SPECIES_PAL(SCOVILLAIN, gMonPalette_Scovillain), - // SPECIES_PAL(RELLOR, gMonPalette_Rellor), - // SPECIES_PAL(RABSCA, gMonPalette_Rabsca), + SPECIES_PAL(RELLOR, gMonPalette_Rellor), + SPECIES_PAL(RABSCA, gMonPalette_Rabsca), SPECIES_PAL(FLITTLE, gMonPalette_Flittle), - // SPECIES_PAL(ESPATHRA, gMonPalette_Espathra), - // SPECIES_PAL(TINKATINK, gMonPalette_Tinkatink), - // SPECIES_PAL(TINKATUFF, gMonPalette_Tinkatuff), + SPECIES_PAL(ESPATHRA, gMonPalette_Espathra), + SPECIES_PAL(TINKATINK, gMonPalette_Tinkatink), + SPECIES_PAL(TINKATUFF, gMonPalette_Tinkatuff), SPECIES_PAL(TINKATON, gMonPalette_Tinkaton), SPECIES_PAL(WIGLETT, gMonPalette_Wiglett), SPECIES_PAL(WUGTRIO, gMonPalette_Wugtrio), SPECIES_PAL(BOMBIRDIER, gMonPalette_Bombirdier), SPECIES_PAL(FINIZEN, gMonPalette_Finizen), SPECIES_PAL(PALAFIN, gMonPalette_Palafin), + SPECIES_PAL(PALAFIN_HERO, gMonPalette_PalafinHero), SPECIES_PAL(VAROOM, gMonPalette_Varoom), SPECIES_PAL(REVAVROOM, gMonPalette_Revavroom), SPECIES_PAL(CYCLIZAR, gMonPalette_Cyclizar), @@ -1416,6 +1423,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(CLODSIRE, gMonPalette_Clodsire), SPECIES_PAL(FARIGIRAF, gMonPalette_Farigiraf), SPECIES_PAL(DUDUNSPARCE, gMonPalette_Dudunsparce), + SPECIES_PAL(DUDUNSPARCE_THREE_SEGMENT, gMonPalette_Dudunsparce), SPECIES_PAL(KINGAMBIT, gMonPalette_Kingambit), SPECIES_PAL(GREAT_TUSK, gMonPalette_GreatTusk), SPECIES_PAL(SCREAM_TAIL, gMonPalette_ScreamTail), @@ -1433,12 +1441,13 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(ARCTIBAX, gMonPalette_Arctibax), SPECIES_PAL(BAXCALIBUR, gMonPalette_Baxcalibur), SPECIES_PAL(GIMMIGHOUL, gMonPalette_Gimmighoul), - // SPECIES_PAL(GHOLDENGO, gMonPalette_Gholdengo), + SPECIES_PAL(GIMMIGHOUL_ROAMING, gMonPalette_GimmighoulRoaming), + SPECIES_PAL(GHOLDENGO, gMonPalette_Gholdengo), SPECIES_PAL(WO_CHIEN, gMonPalette_WoChien), SPECIES_PAL(CHIEN_PAO, gMonPalette_ChienPao), SPECIES_PAL(TING_LU, gMonPalette_TingLu), SPECIES_PAL(CHI_YU, gMonPalette_ChiYu), - // SPECIES_PAL(ROARING_MOON, gMonPalette_RoaringMoon), + SPECIES_PAL(ROARING_MOON, gMonPalette_RoaringMoon), SPECIES_PAL(IRON_VALIANT, gMonPalette_IronValiant), SPECIES_PAL(KORAIDON, gMonPalette_Koraidon), SPECIES_PAL(MIRAIDON, gMonPalette_Miraidon), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index f379aaa165..52d74c9194 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -129,6 +129,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(MAGMAR, gMonShinyPalette_Magmar), SPECIES_SHINY_PAL(PINSIR, gMonShinyPalette_Pinsir), SPECIES_SHINY_PAL(TAUROS, gMonShinyPalette_Tauros), + SPECIES_SHINY_PAL(TAUROS_PALDEAN, gMonShinyPalette_TaurosCombatBreed), + SPECIES_SHINY_PAL(TAUROS_PALDEAN_BLAZE_BREED, gMonShinyPalette_TaurosBlazeBreed), + SPECIES_SHINY_PAL(TAUROS_PALDEAN_AQUA_BREED, gMonShinyPalette_TaurosAquaBreed), SPECIES_SHINY_PAL(MAGIKARP, gMonShinyPalette_Magikarp), SPECIES_SHINY_PAL(GYARADOS, gMonShinyPalette_Gyarados), SPECIES_SHINY_PAL(LAPRAS, gMonShinyPalette_Lapras), @@ -195,6 +198,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(SUNFLORA, gMonShinyPalette_Sunflora), SPECIES_SHINY_PAL(YANMA, gMonShinyPalette_Yanma), SPECIES_SHINY_PAL(WOOPER, gMonShinyPalette_Wooper), + SPECIES_SHINY_PAL(WOOPER_PALDEAN, gMonShinyPalette_WooperPaldean), SPECIES_SHINY_PAL(QUAGSIRE, gMonShinyPalette_Quagsire), SPECIES_SHINY_PAL(ESPEON, gMonShinyPalette_Espeon), SPECIES_SHINY_PAL(UMBREON, gMonShinyPalette_Umbreon), @@ -1333,118 +1337,123 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_EnamorusTherian), #endif #if P_GEN_9_POKEMON == TRUE - SPECIES_PAL(SPRIGATITO, gMonShinyPalette_Sprigatito), - SPECIES_PAL(FLORAGATO, gMonShinyPalette_Floragato), - SPECIES_PAL(MEOWSCARADA, gMonShinyPalette_Meowscarada), - SPECIES_PAL(FUECOCO, gMonShinyPalette_Fuecoco), - SPECIES_PAL(CROCALOR, gMonShinyPalette_Crocalor), - SPECIES_PAL(SKELEDIRGE, gMonShinyPalette_Skeledirge), - SPECIES_PAL(QUAXLY, gMonShinyPalette_Quaxly), - SPECIES_PAL(QUAXWELL, gMonShinyPalette_Quaxwell), - SPECIES_PAL(QUAQUAVAL, gMonShinyPalette_Quaquaval), - SPECIES_PAL(LECHONK, gMonShinyPalette_Lechonk), - SPECIES_PAL(OINKOLOGNE, gMonShinyPalette_Oinkologne), - SPECIES_PAL(TAROUNTULA, gMonShinyPalette_Tarountula), - SPECIES_PAL(SPIDOPS, gMonShinyPalette_Spidops), - SPECIES_PAL(NYMBLE, gMonShinyPalette_Nymble), - SPECIES_PAL(LOKIX, gMonShinyPalette_Lokix), - SPECIES_PAL(PAWMI, gMonShinyPalette_Pawmi), - SPECIES_PAL(PAWMO, gMonShinyPalette_Pawmo), - SPECIES_PAL(PAWMOT, gMonShinyPalette_Pawmot), - SPECIES_PAL(TANDEMAUS, gMonShinyPalette_Tandemaus), - SPECIES_PAL(MAUSHOLD, gMonShinyPalette_Maushold), - SPECIES_PAL(FIDOUGH, gMonShinyPalette_Fidough), - SPECIES_PAL(DACHSBUN, gMonShinyPalette_Dachsbun), - SPECIES_PAL(SMOLIV, gMonShinyPalette_Smoliv), - SPECIES_PAL(DOLLIV, gMonShinyPalette_Dolliv), - SPECIES_PAL(ARBOLIVA, gMonShinyPalette_Arboliva), - SPECIES_PAL(SQUAWKABILLY, gMonShinyPalette_Squawkabilly), - SPECIES_PAL(SQUAWKABILLY_BLUE_PLUMAGE, gMonShinyPalette_SquawkabillyBluePlumage), - SPECIES_PAL(SQUAWKABILLY_YELLOW_PLUMAGE, gMonShinyPalette_SquawkabillyYellowPlumage), - SPECIES_PAL(SQUAWKABILLY_WHITE_PLUMAGE, gMonShinyPalette_SquawkabillyWhitePlumage), - SPECIES_PAL(NACLI, gMonShinyPalette_Nacli), - SPECIES_PAL(NACLSTACK, gMonShinyPalette_Naclstack), - SPECIES_PAL(GARGANACL, gMonShinyPalette_Garganacl), - SPECIES_PAL(CHARCADET, gMonShinyPalette_Charcadet), - SPECIES_PAL(ARMAROUGE, gMonShinyPalette_Armarouge), - SPECIES_PAL(CERULEDGE, gMonShinyPalette_Ceruledge), - SPECIES_PAL(TADBULB, gMonShinyPalette_Tadbulb), - SPECIES_PAL(BELLIBOLT, gMonShinyPalette_Bellibolt), - SPECIES_PAL(WATTREL, gMonShinyPalette_Wattrel), - SPECIES_PAL(KILOWATTREL, gMonShinyPalette_Kilowattrel), - SPECIES_PAL(MASCHIFF, gMonShinyPalette_Maschiff), - SPECIES_PAL(MABOSSTIFF, gMonShinyPalette_Mabosstiff), - SPECIES_PAL(SHROODLE, gMonShinyPalette_Shroodle), - SPECIES_PAL(GRAFAIAI, gMonShinyPalette_Grafaiai), - SPECIES_PAL(BRAMBLIN, gMonShinyPalette_Bramblin), - SPECIES_PAL(BRAMBLEGHAST, gMonShinyPalette_Brambleghast), - SPECIES_PAL(TOEDSCOOL, gMonShinyPalette_Toedscool), - SPECIES_PAL(TOEDSCRUEL, gMonShinyPalette_Toedscruel), - SPECIES_PAL(KLAWF, gMonShinyPalette_Klawf), - SPECIES_PAL(CAPSAKID, gMonShinyPalette_Capsakid), - SPECIES_PAL(SCOVILLAIN, gMonShinyPalette_Scovillain), - // SPECIES_PAL(RELLOR, gMonShinyPalette_Rellor), - // SPECIES_PAL(RABSCA, gMonShinyPalette_Rabsca), - SPECIES_PAL(FLITTLE, gMonShinyPalette_Flittle), - // SPECIES_PAL(ESPATHRA, gMonShinyPalette_Espathra), - // SPECIES_PAL(TINKATINK, gMonShinyPalette_Tinkatink), - // SPECIES_PAL(TINKATUFF, gMonShinyPalette_Tinkatuff), - SPECIES_PAL(TINKATON, gMonShinyPalette_Tinkaton), - SPECIES_PAL(WIGLETT, gMonShinyPalette_Wiglett), - SPECIES_PAL(WUGTRIO, gMonShinyPalette_Wugtrio), - SPECIES_PAL(BOMBIRDIER, gMonShinyPalette_Bombirdier), - SPECIES_PAL(FINIZEN, gMonShinyPalette_Finizen), - SPECIES_PAL(PALAFIN, gMonShinyPalette_Palafin), - SPECIES_PAL(VAROOM, gMonShinyPalette_Varoom), - SPECIES_PAL(REVAVROOM, gMonShinyPalette_Revavroom), - SPECIES_PAL(CYCLIZAR, gMonShinyPalette_Cyclizar), - SPECIES_PAL(ORTHWORM, gMonShinyPalette_Orthworm), - SPECIES_PAL(GLIMMET, gMonShinyPalette_Glimmet), - SPECIES_PAL(GLIMMORA, gMonShinyPalette_Glimmora), - SPECIES_PAL(GREAVARD, gMonShinyPalette_Greavard), - SPECIES_PAL(HOUNDSTONE, gMonShinyPalette_Houndstone), - SPECIES_PAL(FLAMIGO, gMonShinyPalette_Flamigo), - SPECIES_PAL(CETODDLE, gMonShinyPalette_Cetoddle), - SPECIES_PAL(CETITAN, gMonShinyPalette_Cetitan), - SPECIES_PAL(VELUZA, gMonShinyPalette_Veluza), - SPECIES_PAL(DONDOZO, gMonShinyPalette_Dondozo), - SPECIES_PAL(TATSUGIRI, gMonShinyPalette_TatsugiriCurly), - SPECIES_PAL(TATSUGIRI_DROOPY, gMonShinyPalette_TatsugiriDroopy), - SPECIES_PAL(TATSUGIRI_STRETCHY, gMonShinyPalette_TatsugiriStretchy), - SPECIES_PAL(ANNIHILAPE, gMonShinyPalette_Annihilape), - SPECIES_PAL(CLODSIRE, gMonShinyPalette_Clodsire), - SPECIES_PAL(FARIGIRAF, gMonShinyPalette_Farigiraf), - SPECIES_PAL(DUDUNSPARCE, gMonShinyPalette_Dudunsparce), - SPECIES_PAL(KINGAMBIT, gMonShinyPalette_Kingambit), - SPECIES_PAL(GREAT_TUSK, gMonShinyPalette_GreatTusk), - SPECIES_PAL(SCREAM_TAIL, gMonShinyPalette_ScreamTail), - SPECIES_PAL(BRUTE_BONNET, gMonShinyPalette_BruteBonnet), - SPECIES_PAL(FLUTTER_MANE, gMonShinyPalette_FlutterMane), - SPECIES_PAL(SLITHER_WING, gMonShinyPalette_SlitherWing), - SPECIES_PAL(SANDY_SHOCKS, gMonShinyPalette_SandyShocks), - SPECIES_PAL(IRON_TREADS, gMonShinyPalette_IronTreads), - SPECIES_PAL(IRON_BUNDLE, gMonShinyPalette_IronBundle), - SPECIES_PAL(IRON_HANDS, gMonShinyPalette_IronHands), - SPECIES_PAL(IRON_JUGULIS, gMonShinyPalette_IronJugulis), - SPECIES_PAL(IRON_MOTH, gMonShinyPalette_IronMoth), - SPECIES_PAL(IRON_THORNS, gMonShinyPalette_IronThorns), - SPECIES_PAL(FRIGIBAX, gMonShinyPalette_Frigibax), - SPECIES_PAL(ARCTIBAX, gMonShinyPalette_Arctibax), - SPECIES_PAL(BAXCALIBUR, gMonShinyPalette_Baxcalibur), - SPECIES_PAL(GIMMIGHOUL, gMonShinyPalette_Gimmighoul), - // SPECIES_PAL(GHOLDENGO, gMonShinyPalette_Gholdengo), - SPECIES_PAL(WO_CHIEN, gMonShinyPalette_WoChien), - SPECIES_PAL(CHIEN_PAO, gMonShinyPalette_ChienPao), - SPECIES_PAL(TING_LU, gMonShinyPalette_TingLu), - SPECIES_PAL(CHI_YU, gMonShinyPalette_ChiYu), - // SPECIES_PAL(ROARING_MOON, gMonShinyPalette_RoaringMoon), - SPECIES_PAL(IRON_VALIANT, gMonShinyPalette_IronValiant), - SPECIES_PAL(KORAIDON, gMonShinyPalette_Koraidon), - SPECIES_PAL(MIRAIDON, gMonShinyPalette_Miraidon), - SPECIES_PAL(WALKING_WAKE, gMonShinyPalette_WalkingWake), - SPECIES_PAL(IRON_LEAVES, gMonShinyPalette_IronLeaves), + SPECIES_SHINY_PAL(SPRIGATITO, gMonShinyPalette_Sprigatito), + SPECIES_SHINY_PAL(FLORAGATO, gMonShinyPalette_Floragato), + SPECIES_SHINY_PAL(MEOWSCARADA, gMonShinyPalette_Meowscarada), + SPECIES_SHINY_PAL(FUECOCO, gMonShinyPalette_Fuecoco), + SPECIES_SHINY_PAL(CROCALOR, gMonShinyPalette_Crocalor), + SPECIES_SHINY_PAL(SKELEDIRGE, gMonShinyPalette_Skeledirge), + SPECIES_SHINY_PAL(QUAXLY, gMonShinyPalette_Quaxly), + SPECIES_SHINY_PAL(QUAXWELL, gMonShinyPalette_Quaxwell), + SPECIES_SHINY_PAL(QUAQUAVAL, gMonShinyPalette_Quaquaval), + SPECIES_SHINY_PAL(LECHONK, gMonShinyPalette_Lechonk), + SPECIES_SHINY_PAL(OINKOLOGNE, gMonShinyPalette_Oinkologne), + SPECIES_SHINY_PAL(OINKOLOGNE_FEMALE, gMonShinyPalette_OinkologneFemale), + SPECIES_SHINY_PAL(TAROUNTULA, gMonShinyPalette_Tarountula), + SPECIES_SHINY_PAL(SPIDOPS, gMonShinyPalette_Spidops), + SPECIES_SHINY_PAL(NYMBLE, gMonShinyPalette_Nymble), + SPECIES_SHINY_PAL(LOKIX, gMonShinyPalette_Lokix), + SPECIES_SHINY_PAL(PAWMI, gMonShinyPalette_Pawmi), + SPECIES_SHINY_PAL(PAWMO, gMonShinyPalette_Pawmo), + SPECIES_SHINY_PAL(PAWMOT, gMonShinyPalette_Pawmot), + SPECIES_SHINY_PAL(TANDEMAUS, gMonShinyPalette_Tandemaus), + SPECIES_SHINY_PAL(MAUSHOLD, gMonShinyPalette_Maushold), + SPECIES_SHINY_PAL(MAUSHOLD_FAMILY_OF_THREE, gMonShinyPalette_Maushold), + SPECIES_SHINY_PAL(FIDOUGH, gMonShinyPalette_Fidough), + SPECIES_SHINY_PAL(DACHSBUN, gMonShinyPalette_Dachsbun), + SPECIES_SHINY_PAL(SMOLIV, gMonShinyPalette_Smoliv), + SPECIES_SHINY_PAL(DOLLIV, gMonShinyPalette_Dolliv), + SPECIES_SHINY_PAL(ARBOLIVA, gMonShinyPalette_Arboliva), + SPECIES_SHINY_PAL(SQUAWKABILLY, gMonShinyPalette_SquawkabillyGreenPlumage), + SPECIES_SHINY_PAL(SQUAWKABILLY_BLUE_PLUMAGE, gMonShinyPalette_SquawkabillyBluePlumage), + SPECIES_SHINY_PAL(SQUAWKABILLY_YELLOW_PLUMAGE, gMonShinyPalette_SquawkabillyYellowPlumage), + SPECIES_SHINY_PAL(SQUAWKABILLY_WHITE_PLUMAGE, gMonShinyPalette_SquawkabillyWhitePlumage), + SPECIES_SHINY_PAL(NACLI, gMonShinyPalette_Nacli), + SPECIES_SHINY_PAL(NACLSTACK, gMonShinyPalette_Naclstack), + SPECIES_SHINY_PAL(GARGANACL, gMonShinyPalette_Garganacl), + SPECIES_SHINY_PAL(CHARCADET, gMonShinyPalette_Charcadet), + SPECIES_SHINY_PAL(ARMAROUGE, gMonShinyPalette_Armarouge), + SPECIES_SHINY_PAL(CERULEDGE, gMonShinyPalette_Ceruledge), + SPECIES_SHINY_PAL(TADBULB, gMonShinyPalette_Tadbulb), + SPECIES_SHINY_PAL(BELLIBOLT, gMonShinyPalette_Bellibolt), + SPECIES_SHINY_PAL(WATTREL, gMonShinyPalette_Wattrel), + SPECIES_SHINY_PAL(KILOWATTREL, gMonShinyPalette_Kilowattrel), + SPECIES_SHINY_PAL(MASCHIFF, gMonShinyPalette_Maschiff), + SPECIES_SHINY_PAL(MABOSSTIFF, gMonShinyPalette_Mabosstiff), + SPECIES_SHINY_PAL(SHROODLE, gMonShinyPalette_Shroodle), + SPECIES_SHINY_PAL(GRAFAIAI, gMonShinyPalette_Grafaiai), + SPECIES_SHINY_PAL(BRAMBLIN, gMonShinyPalette_Bramblin), + SPECIES_SHINY_PAL(BRAMBLEGHAST, gMonShinyPalette_Brambleghast), + SPECIES_SHINY_PAL(TOEDSCOOL, gMonShinyPalette_Toedscool), + SPECIES_SHINY_PAL(TOEDSCRUEL, gMonShinyPalette_Toedscruel), + SPECIES_SHINY_PAL(KLAWF, gMonShinyPalette_Klawf), + SPECIES_SHINY_PAL(CAPSAKID, gMonShinyPalette_Capsakid), + SPECIES_SHINY_PAL(SCOVILLAIN, gMonShinyPalette_Scovillain), + SPECIES_SHINY_PAL(RELLOR, gMonShinyPalette_Rellor), + // SPECIES_SHINY_PAL(RABSCA, gMonShinyPalette_Rabsca), + SPECIES_SHINY_PAL(FLITTLE, gMonShinyPalette_Flittle), + SPECIES_SHINY_PAL(ESPATHRA, gMonShinyPalette_Espathra), + SPECIES_SHINY_PAL(TINKATINK, gMonShinyPalette_Tinkatink), + // SPECIES_SHINY_PAL(TINKATUFF, gMonShinyPalette_Tinkatuff), + SPECIES_SHINY_PAL(TINKATON, gMonShinyPalette_Tinkaton), + SPECIES_SHINY_PAL(WIGLETT, gMonShinyPalette_Wiglett), + SPECIES_SHINY_PAL(WUGTRIO, gMonShinyPalette_Wugtrio), + SPECIES_SHINY_PAL(BOMBIRDIER, gMonShinyPalette_Bombirdier), + SPECIES_SHINY_PAL(FINIZEN, gMonShinyPalette_Finizen), + SPECIES_SHINY_PAL(PALAFIN, gMonShinyPalette_Palafin), + SPECIES_SHINY_PAL(PALAFIN_HERO, gMonShinyPalette_PalafinHero), + SPECIES_SHINY_PAL(VAROOM, gMonShinyPalette_Varoom), + SPECIES_SHINY_PAL(REVAVROOM, gMonShinyPalette_Revavroom), + SPECIES_SHINY_PAL(CYCLIZAR, gMonShinyPalette_Cyclizar), + SPECIES_SHINY_PAL(ORTHWORM, gMonShinyPalette_Orthworm), + SPECIES_SHINY_PAL(GLIMMET, gMonShinyPalette_Glimmet), + SPECIES_SHINY_PAL(GLIMMORA, gMonShinyPalette_Glimmora), + SPECIES_SHINY_PAL(GREAVARD, gMonShinyPalette_Greavard), + SPECIES_SHINY_PAL(HOUNDSTONE, gMonShinyPalette_Houndstone), + SPECIES_SHINY_PAL(FLAMIGO, gMonShinyPalette_Flamigo), + SPECIES_SHINY_PAL(CETODDLE, gMonShinyPalette_Cetoddle), + SPECIES_SHINY_PAL(CETITAN, gMonShinyPalette_Cetitan), + SPECIES_SHINY_PAL(VELUZA, gMonShinyPalette_Veluza), + SPECIES_SHINY_PAL(DONDOZO, gMonShinyPalette_Dondozo), + SPECIES_SHINY_PAL(TATSUGIRI, gMonShinyPalette_TatsugiriCurly), + SPECIES_SHINY_PAL(TATSUGIRI_DROOPY, gMonShinyPalette_TatsugiriDroopy), + SPECIES_SHINY_PAL(TATSUGIRI_STRETCHY, gMonShinyPalette_TatsugiriStretchy), + SPECIES_SHINY_PAL(ANNIHILAPE, gMonShinyPalette_Annihilape), + SPECIES_SHINY_PAL(CLODSIRE, gMonShinyPalette_Clodsire), + SPECIES_SHINY_PAL(FARIGIRAF, gMonShinyPalette_Farigiraf), + SPECIES_SHINY_PAL(DUDUNSPARCE, gMonShinyPalette_Dudunsparce), + SPECIES_SHINY_PAL(DUDUNSPARCE_THREE_SEGMENT, gMonShinyPalette_Dudunsparce), + SPECIES_SHINY_PAL(KINGAMBIT, gMonShinyPalette_Kingambit), + SPECIES_SHINY_PAL(GREAT_TUSK, gMonShinyPalette_GreatTusk), + SPECIES_SHINY_PAL(SCREAM_TAIL, gMonShinyPalette_ScreamTail), + SPECIES_SHINY_PAL(BRUTE_BONNET, gMonShinyPalette_BruteBonnet), + SPECIES_SHINY_PAL(FLUTTER_MANE, gMonShinyPalette_FlutterMane), + SPECIES_SHINY_PAL(SLITHER_WING, gMonShinyPalette_SlitherWing), + SPECIES_SHINY_PAL(SANDY_SHOCKS, gMonShinyPalette_SandyShocks), + SPECIES_SHINY_PAL(IRON_TREADS, gMonShinyPalette_IronTreads), + SPECIES_SHINY_PAL(IRON_BUNDLE, gMonShinyPalette_IronBundle), + SPECIES_SHINY_PAL(IRON_HANDS, gMonShinyPalette_IronHands), + SPECIES_SHINY_PAL(IRON_JUGULIS, gMonShinyPalette_IronJugulis), + SPECIES_SHINY_PAL(IRON_MOTH, gMonShinyPalette_IronMoth), + SPECIES_SHINY_PAL(IRON_THORNS, gMonShinyPalette_IronThorns), + SPECIES_SHINY_PAL(FRIGIBAX, gMonShinyPalette_Frigibax), + SPECIES_SHINY_PAL(ARCTIBAX, gMonShinyPalette_Arctibax), + SPECIES_SHINY_PAL(BAXCALIBUR, gMonShinyPalette_Baxcalibur), + SPECIES_SHINY_PAL(GIMMIGHOUL, gMonShinyPalette_Gimmighoul), + SPECIES_SHINY_PAL(GIMMIGHOUL_ROAMING, gMonShinyPalette_GimmighoulRoaming), + SPECIES_SHINY_PAL(GHOLDENGO, gMonShinyPalette_Gholdengo), + SPECIES_SHINY_PAL(WO_CHIEN, gMonShinyPalette_WoChien), + SPECIES_SHINY_PAL(CHIEN_PAO, gMonShinyPalette_ChienPao), + SPECIES_SHINY_PAL(TING_LU, gMonShinyPalette_TingLu), + SPECIES_SHINY_PAL(CHI_YU, gMonShinyPalette_ChiYu), + SPECIES_SHINY_PAL(ROARING_MOON, gMonShinyPalette_RoaringMoon), + SPECIES_SHINY_PAL(IRON_VALIANT, gMonShinyPalette_IronValiant), + SPECIES_SHINY_PAL(KORAIDON, gMonShinyPalette_Koraidon), + SPECIES_SHINY_PAL(MIRAIDON, gMonShinyPalette_Miraidon), + SPECIES_SHINY_PAL(WALKING_WAKE, gMonShinyPalette_WalkingWake), + SPECIES_SHINY_PAL(IRON_LEAVES, gMonShinyPalette_IronLeaves), #endif - SPECIES_PAL(EGG, gMonPalette_Egg), + SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), }; const struct CompressedSpritePalette gMonShinyPaletteTableFemale[NUM_SPECIES + 1] = diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 2e112ab67f..5ca5a7ea33 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -155,6 +155,9 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = gMonIcon_Magmar, [SPECIES_PINSIR] = gMonIcon_Pinsir, [SPECIES_TAUROS] = gMonIcon_Tauros, + [SPECIES_TAUROS_PALDEAN] = gMonIcon_TaurosCombatBreed, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = gMonIcon_TaurosBlazeBreed, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = gMonIcon_TaurosAquaBreed, [SPECIES_MAGIKARP] = gMonIcon_Magikarp, [SPECIES_GYARADOS] = gMonIcon_Gyarados, [SPECIES_LAPRAS] = gMonIcon_Lapras, @@ -1296,109 +1299,118 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionFemale, #endif #if P_GEN_9_POKEMON == TRUE - //[SPECIES_SPRIGATITO] = gMonIcon_Sprigatito, - //[SPECIES_FLORAGATO] = gMonIcon_Floragato, - //[SPECIES_MEOWSCARADA] = gMonIcon_Meowscarada, - //[SPECIES_FUECOCO] = gMonIcon_Fuecoco, - //[SPECIES_CROCALOR] = gMonIcon_Crocalor, - //[SPECIES_SKELEDIRGE] = gMonIcon_Skeledirge, - //[SPECIES_QUAXLY] = gMonIcon_Quaxly, - //[SPECIES_QUAXWELL] = gMonIcon_Quaxwell, - //[SPECIES_QUAQUAVAL] = gMonIcon_Quaquaval, - //[SPECIES_LECHONK] = gMonIcon_Lechonk, - //[SPECIES_OINKOLOGNE] = gMonIcon_Oinkologne, - //[SPECIES_TAROUNTULA] = gMonIcon_Tarountula, - //[SPECIES_SPIDOPS] = gMonIcon_Spidops, - //[SPECIES_NYMBLE] = gMonIcon_Nymble, - //[SPECIES_LOKIX] = gMonIcon_Lokix, - //[SPECIES_PAWMI] = gMonIcon_Pawmi, - //[SPECIES_PAWMO] = gMonIcon_Pawmo, - //[SPECIES_PAWMOT] = gMonIcon_Pawmot, - //[SPECIES_TANDEMAUS] = gMonIcon_Tandemaus, - //[SPECIES_MAUSHOLD] = gMonIcon_Maushold, - //[SPECIES_FIDOUGH] = gMonIcon_Fidough, - //[SPECIES_DACHSBUN] = gMonIcon_Dachsbun, - //[SPECIES_SMOLIV] = gMonIcon_Smoliv, - //[SPECIES_DOLLIV] = gMonIcon_Dolliv, - //[SPECIES_ARBOLIVA] = gMonIcon_Arboliva, - //[SPECIES_SQUAWKABILLY] = gMonIcon_Squawkabilly, - //[SPECIES_NACLI] = gMonIcon_Nacli, - //[SPECIES_NACLSTACK] = gMonIcon_Naclstack, - //[SPECIES_GARGANACL] = gMonIcon_Garganacl, - //[SPECIES_CHARCADET] = gMonIcon_Charcadet, - //[SPECIES_ARMAROUGE] = gMonIcon_Armarouge, - //[SPECIES_CERULEDGE] = gMonIcon_Ceruledge, - //[SPECIES_TADBULB] = gMonIcon_Tadbulb, - //[SPECIES_BELLIBOLT] = gMonIcon_Bellibolt, - //[SPECIES_WATTREL] = gMonIcon_Wattrel, - //[SPECIES_KILOWATTREL] = gMonIcon_Kilowattrel, - //[SPECIES_MASCHIFF] = gMonIcon_Maschiff, - //[SPECIES_MABOSSTIFF] = gMonIcon_Mabosstiff, - //[SPECIES_SHROODLE] = gMonIcon_Shroodle, - //[SPECIES_GRAFAIAI] = gMonIcon_Grafaiai, - //[SPECIES_BRAMBLIN] = gMonIcon_Bramblin, - //[SPECIES_BRAMBLEGHAST] = gMonIcon_Brambleghast, - //[SPECIES_TOEDSCOOL] = gMonIcon_Toedscool, - //[SPECIES_TOEDSCRUEL] = gMonIcon_Toedscruel, - //[SPECIES_KLAWF] = gMonIcon_Klawf, - //[SPECIES_CAPSAKID] = gMonIcon_Capsakid, - //[SPECIES_SCOVILLAIN] = gMonIcon_Scovillain, - //[SPECIES_RELLOR] = gMonIcon_Rellor, - //[SPECIES_RABSCA] = gMonIcon_Rabsca, - //[SPECIES_FLITTLE] = gMonIcon_Flittle, - //[SPECIES_ESPATHRA] = gMonIcon_Espathra, - //[SPECIES_TINKATINK] = gMonIcon_Tinkatink, - //[SPECIES_TINKATUFF] = gMonIcon_Tinkatuff, - //[SPECIES_TINKATON] = gMonIcon_Tinkaton, - //[SPECIES_WIGLETT] = gMonIcon_Wiglett, - //[SPECIES_WUGTRIO] = gMonIcon_Wugtrio, - //[SPECIES_BOMBIRDIER] = gMonIcon_Bombirdier, - //[SPECIES_FINIZEN] = gMonIcon_Finizen, - //[SPECIES_PALAFIN] = gMonIcon_Palafin, - //[SPECIES_VAROOM] = gMonIcon_Varoom, - //[SPECIES_REVAVROOM] = gMonIcon_Revavroom, - //[SPECIES_CYCLIZAR] = gMonIcon_Cyclizar, - //[SPECIES_ORTHWORM] = gMonIcon_Orthworm, - //[SPECIES_GLIMMET] = gMonIcon_Glimmet, - //[SPECIES_GLIMMORA] = gMonIcon_Glimmora, - //[SPECIES_GREAVARD] = gMonIcon_Greavard, - //[SPECIES_HOUNDSTONE] = gMonIcon_Houndstone, - //[SPECIES_FLAMIGO] = gMonIcon_Flamigo, - //[SPECIES_CETODDLE] = gMonIcon_Cetoddle, - //[SPECIES_CETITAN] = gMonIcon_Cetitan, - //[SPECIES_VELUZA] = gMonIcon_Veluza, - //[SPECIES_DONDOZO] = gMonIcon_Dondozo, - //[SPECIES_TATSUGIRI] = gMonIcon_Tatsugiri, - //[SPECIES_ANNIHILAPE] = gMonIcon_Annihilape, - //[SPECIES_CLODSIRE] = gMonIcon_Clodsire, - //[SPECIES_FARIGIRAF] = gMonIcon_Farigiraf, - //[SPECIES_DUDUNSPARCE] = gMonIcon_Dudunsparce, - //[SPECIES_KINGAMBIT] = gMonIcon_Kingambit, - //[SPECIES_GREAT_TUSK] = gMonIcon_GreatTusk, - //[SPECIES_SCREAM_TAIL] = gMonIcon_ScreamTail, - //[SPECIES_BRUTE_BONNET] = gMonIcon_BruteBonnet, - //[SPECIES_FLUTTER_MANE] = gMonIcon_FlutterMane, - //[SPECIES_SLITHER_WING] = gMonIcon_SlitherWing, - //[SPECIES_SANDY_SHOCKS] = gMonIcon_SandyShocks, - //[SPECIES_IRON_TREADS] = gMonIcon_IronTreads, - //[SPECIES_IRON_BUNDLE] = gMonIcon_IronBundle, - //[SPECIES_IRON_HANDS] = gMonIcon_IronHands, - //[SPECIES_IRON_JUGULIS] = gMonIcon_IronJugulis, - //[SPECIES_IRON_MOTH] = gMonIcon_IronMoth, - //[SPECIES_IRON_THORNS] = gMonIcon_IronThorns, - //[SPECIES_FRIGIBAX] = gMonIcon_Frigibax, - //[SPECIES_ARCTIBAX] = gMonIcon_Arctibax, - //[SPECIES_BAXCALIBUR] = gMonIcon_Baxcalibur, - //[SPECIES_GIMMIGHOUL] = gMonIcon_Gimmighoul, - //[SPECIES_GHOLDENGO] = gMonIcon_Gholdengo, - //[SPECIES_WO_CHIEN] = gMonIcon_WoChien, - //[SPECIES_CHIEN_PAO] = gMonIcon_ChienPao, - //[SPECIES_TING_LU] = gMonIcon_TingLu, - //[SPECIES_CHI_YU] = gMonIcon_ChiYu, - //[SPECIES_ROARING_MOON] = gMonIcon_RoaringMoon, - //[SPECIES_IRON_VALIANT] = gMonIcon_IronValiant, - //[SPECIES_KORAIDON] = gMonIcon_Koraidon, - //[SPECIES_MIRAIDON] = gMonIcon_Miraidon, + [SPECIES_SPRIGATITO] = gMonIcon_Sprigatito, + // [SPECIES_FLORAGATO] = gMonIcon_Floragato, + [SPECIES_MEOWSCARADA] = gMonIcon_Meowscarada, + [SPECIES_FUECOCO] = gMonIcon_Fuecoco, + [SPECIES_CROCALOR] = gMonIcon_Crocalor, + [SPECIES_SKELEDIRGE] = gMonIcon_Skeledirge, + [SPECIES_QUAXLY] = gMonIcon_Quaxly, + [SPECIES_QUAXWELL] = gMonIcon_Quaxwell, + [SPECIES_QUAQUAVAL] = gMonIcon_Quaquaval, + [SPECIES_LECHONK] = gMonIcon_Lechonk, + [SPECIES_OINKOLOGNE] = gMonIcon_Oinkologne, + [SPECIES_OINKOLOGNE_FEMALE] = gMonIcon_OinkologneFemale, + [SPECIES_TAROUNTULA] = gMonIcon_Tarountula, + [SPECIES_SPIDOPS] = gMonIcon_Spidops, + [SPECIES_NYMBLE] = gMonIcon_Nymble, + [SPECIES_LOKIX] = gMonIcon_Lokix, + [SPECIES_PAWMI] = gMonIcon_Pawmi, + [SPECIES_PAWMO] = gMonIcon_Pawmo, + [SPECIES_PAWMOT] = gMonIcon_Pawmot, + [SPECIES_TANDEMAUS] = gMonIcon_Tandemaus, + [SPECIES_MAUSHOLD] = gMonIcon_Maushold, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonIcon_Maushold, + [SPECIES_FIDOUGH] = gMonIcon_Fidough, + // [SPECIES_DACHSBUN] = gMonIcon_Dachsbun, + [SPECIES_SMOLIV] = gMonIcon_Smoliv, + [SPECIES_DOLLIV] = gMonIcon_Dolliv, + [SPECIES_ARBOLIVA] = gMonIcon_Arboliva, + [SPECIES_SQUAWKABILLY] = gMonIcon_SquawkabillyGreenPlumage, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = gMonIcon_SquawkabillyBluePlumage, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = gMonIcon_SquawkabillyYellowPlumage, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = gMonIcon_SquawkabillyWhitePlumage, + [SPECIES_NACLI] = gMonIcon_Nacli, + [SPECIES_NACLSTACK] = gMonIcon_Naclstack, + [SPECIES_GARGANACL] = gMonIcon_Garganacl, + [SPECIES_CHARCADET] = gMonIcon_Charcadet, + [SPECIES_ARMAROUGE] = gMonIcon_Armarouge, + [SPECIES_CERULEDGE] = gMonIcon_Ceruledge, + [SPECIES_TADBULB] = gMonIcon_Tadbulb, + [SPECIES_BELLIBOLT] = gMonIcon_Bellibolt, + [SPECIES_WATTREL] = gMonIcon_Wattrel, + [SPECIES_KILOWATTREL] = gMonIcon_Kilowattrel, + [SPECIES_MASCHIFF] = gMonIcon_Maschiff, + [SPECIES_MABOSSTIFF] = gMonIcon_Mabosstiff, + [SPECIES_SHROODLE] = gMonIcon_Shroodle, + [SPECIES_GRAFAIAI] = gMonIcon_Grafaiai, + [SPECIES_BRAMBLIN] = gMonIcon_Bramblin, + [SPECIES_BRAMBLEGHAST] = gMonIcon_Brambleghast, + [SPECIES_TOEDSCOOL] = gMonIcon_Toedscool, + [SPECIES_TOEDSCRUEL] = gMonIcon_Toedscruel, + [SPECIES_KLAWF] = gMonIcon_Klawf, + [SPECIES_CAPSAKID] = gMonIcon_Capsakid, + [SPECIES_SCOVILLAIN] = gMonIcon_Scovillain, + [SPECIES_RELLOR] = gMonIcon_Rellor, + [SPECIES_RABSCA] = gMonIcon_Rabsca, + [SPECIES_FLITTLE] = gMonIcon_Flittle, + [SPECIES_ESPATHRA] = gMonIcon_Espathra, + // [SPECIES_TINKATINK] = gMonIcon_Tinkatink, + [SPECIES_TINKATUFF] = gMonIcon_Tinkatuff, + [SPECIES_TINKATON] = gMonIcon_Tinkaton, + [SPECIES_WIGLETT] = gMonIcon_Wiglett, + [SPECIES_WUGTRIO] = gMonIcon_Wugtrio, + [SPECIES_BOMBIRDIER] = gMonIcon_Bombirdier, + [SPECIES_FINIZEN] = gMonIcon_Finizen, + [SPECIES_PALAFIN] = gMonIcon_Palafin, + [SPECIES_PALAFIN_HERO] = gMonIcon_PalafinHero, + [SPECIES_VAROOM] = gMonIcon_Varoom, + [SPECIES_REVAVROOM] = gMonIcon_Revavroom, + [SPECIES_CYCLIZAR] = gMonIcon_Cyclizar, + [SPECIES_ORTHWORM] = gMonIcon_Orthworm, + [SPECIES_GLIMMET] = gMonIcon_Glimmet, + [SPECIES_GLIMMORA] = gMonIcon_Glimmora, + [SPECIES_GREAVARD] = gMonIcon_Greavard, + [SPECIES_HOUNDSTONE] = gMonIcon_Houndstone, + [SPECIES_FLAMIGO] = gMonIcon_Flamigo, + [SPECIES_CETODDLE] = gMonIcon_Cetoddle, + [SPECIES_CETITAN] = gMonIcon_Cetitan, + [SPECIES_VELUZA] = gMonIcon_Veluza, + [SPECIES_DONDOZO] = gMonIcon_Dondozo, + [SPECIES_TATSUGIRI] = gMonIcon_TatsugiriCurly, + [SPECIES_TATSUGIRI_DROOPY] = gMonIcon_TatsugiriDroopy, + [SPECIES_TATSUGIRI_STRETCHY] = gMonIcon_TatsugiriStretchy, + [SPECIES_ANNIHILAPE] = gMonIcon_Annihilape, + [SPECIES_CLODSIRE] = gMonIcon_Clodsire, + [SPECIES_FARIGIRAF] = gMonIcon_Farigiraf, + [SPECIES_DUDUNSPARCE] = gMonIcon_Dudunsparce, + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = gMonIcon_Dudunsparce, + [SPECIES_KINGAMBIT] = gMonIcon_Kingambit, + [SPECIES_GREAT_TUSK] = gMonIcon_GreatTusk, + [SPECIES_SCREAM_TAIL] = gMonIcon_ScreamTail, + [SPECIES_BRUTE_BONNET] = gMonIcon_BruteBonnet, + [SPECIES_FLUTTER_MANE] = gMonIcon_FlutterMane, + [SPECIES_SLITHER_WING] = gMonIcon_SlitherWing, + [SPECIES_SANDY_SHOCKS] = gMonIcon_SandyShocks, + [SPECIES_IRON_TREADS] = gMonIcon_IronTreads, + [SPECIES_IRON_BUNDLE] = gMonIcon_IronBundle, + [SPECIES_IRON_HANDS] = gMonIcon_IronHands, + [SPECIES_IRON_JUGULIS] = gMonIcon_IronJugulis, + [SPECIES_IRON_MOTH] = gMonIcon_IronMoth, + [SPECIES_IRON_THORNS] = gMonIcon_IronThorns, + [SPECIES_FRIGIBAX] = gMonIcon_Frigibax, + [SPECIES_ARCTIBAX] = gMonIcon_Arctibax, + [SPECIES_BAXCALIBUR] = gMonIcon_Baxcalibur, + [SPECIES_GIMMIGHOUL] = gMonIcon_Gimmighoul, + [SPECIES_GHOLDENGO] = gMonIcon_Gholdengo, + [SPECIES_WO_CHIEN] = gMonIcon_WoChien, + [SPECIES_CHIEN_PAO] = gMonIcon_ChienPao, + [SPECIES_TING_LU] = gMonIcon_TingLu, + [SPECIES_CHI_YU] = gMonIcon_ChiYu, + [SPECIES_ROARING_MOON] = gMonIcon_RoaringMoon, + [SPECIES_IRON_VALIANT] = gMonIcon_IronValiant, + [SPECIES_KORAIDON] = gMonIcon_Koraidon, + [SPECIES_MIRAIDON] = gMonIcon_Miraidon, //[SPECIES_WALKING_WAKE] = gMonIcon_WalkingWake, //[SPECIES_IRON_LEAVES] = gMonIcon_IronLeaves, #endif @@ -2637,109 +2649,113 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BASCULEGION_FEMALE] = 0, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_SPRIGATITO] = 0, - [SPECIES_FLORAGATO] = 0, - [SPECIES_MEOWSCARADA] = 0, + [SPECIES_SPRIGATITO] = 4, + [SPECIES_FLORAGATO] = 1, + [SPECIES_MEOWSCARADA] = 1, [SPECIES_FUECOCO] = 0, [SPECIES_CROCALOR] = 0, [SPECIES_SKELEDIRGE] = 0, - [SPECIES_QUAXLY] = 0, + [SPECIES_QUAXLY] = 2, [SPECIES_QUAXWELL] = 0, [SPECIES_QUAQUAVAL] = 0, - [SPECIES_LECHONK] = 0, - [SPECIES_OINKOLOGNE] = 0, - [SPECIES_TAROUNTULA] = 0, - [SPECIES_SPIDOPS] = 0, + [SPECIES_LECHONK] = 1, + [SPECIES_OINKOLOGNE] = 1, + [SPECIES_OINKOLOGNE_FEMALE] = 2, + [SPECIES_TAROUNTULA] = 1, + [SPECIES_SPIDOPS] = 1, [SPECIES_NYMBLE] = 0, [SPECIES_LOKIX] = 0, - [SPECIES_PAWMI] = 0, - [SPECIES_PAWMO] = 0, - [SPECIES_PAWMOT] = 0, + [SPECIES_PAWMI] = 3, + [SPECIES_PAWMO] = 3, + [SPECIES_PAWMOT] = 3, [SPECIES_TANDEMAUS] = 0, [SPECIES_MAUSHOLD] = 0, - [SPECIES_FIDOUGH] = 0, - [SPECIES_DACHSBUN] = 0, - [SPECIES_SMOLIV] = 0, - [SPECIES_DOLLIV] = 0, - [SPECIES_ARBOLIVA] = 0, - [SPECIES_SQUAWKABILLY] = 0, - [SPECIES_NACLI] = 0, - [SPECIES_NACLSTACK] = 0, - [SPECIES_GARGANACL] = 0, - [SPECIES_CHARCADET] = 0, + [SPECIES_FIDOUGH] = 1, + [SPECIES_DACHSBUN] = 0, // TODO + [SPECIES_SMOLIV] = 1, + [SPECIES_DOLLIV] = 1, + [SPECIES_ARBOLIVA] = 5, + [SPECIES_SQUAWKABILLY] = 1, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = 1, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = 1, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = 1, + [SPECIES_NACLI] = 2, + [SPECIES_NACLSTACK] = 2, // TODO: recolor + [SPECIES_GARGANACL] = 3, + [SPECIES_CHARCADET] = 1, [SPECIES_ARMAROUGE] = 0, - [SPECIES_CERULEDGE] = 0, - [SPECIES_TADBULB] = 0, + [SPECIES_CERULEDGE] = 2, + [SPECIES_TADBULB] = 5, // TODO: Redo to 0 [SPECIES_BELLIBOLT] = 0, - [SPECIES_WATTREL] = 0, - [SPECIES_KILOWATTREL] = 0, - [SPECIES_MASCHIFF] = 0, - [SPECIES_MABOSSTIFF] = 0, + [SPECIES_WATTREL] = 3, + [SPECIES_KILOWATTREL] = 3, + [SPECIES_MASCHIFF] = 3, + [SPECIES_MABOSSTIFF] = 5, [SPECIES_SHROODLE] = 0, [SPECIES_GRAFAIAI] = 0, - [SPECIES_BRAMBLIN] = 0, - [SPECIES_BRAMBLEGHAST] = 0, + [SPECIES_BRAMBLIN] = 3, + [SPECIES_BRAMBLEGHAST] = 5, [SPECIES_TOEDSCOOL] = 0, [SPECIES_TOEDSCRUEL] = 0, [SPECIES_KLAWF] = 0, - [SPECIES_CAPSAKID] = 0, - [SPECIES_SCOVILLAIN] = 0, - [SPECIES_RELLOR] = 0, + [SPECIES_CAPSAKID] = 1, + [SPECIES_SCOVILLAIN] = 1, + [SPECIES_RELLOR] = 5, [SPECIES_RABSCA] = 0, - [SPECIES_FLITTLE] = 0, - [SPECIES_ESPATHRA] = 0, - [SPECIES_TINKATINK] = 0, - [SPECIES_TINKATUFF] = 0, - [SPECIES_TINKATON] = 0, + [SPECIES_FLITTLE] = 3, + [SPECIES_ESPATHRA] = 5, + [SPECIES_TINKATINK] = 4, + [SPECIES_TINKATUFF] = 4, + [SPECIES_TINKATON] = 4, [SPECIES_WIGLETT] = 0, [SPECIES_WUGTRIO] = 0, [SPECIES_BOMBIRDIER] = 0, [SPECIES_FINIZEN] = 0, - [SPECIES_PALAFIN] = 0, - [SPECIES_VAROOM] = 0, - [SPECIES_REVAVROOM] = 0, - [SPECIES_CYCLIZAR] = 0, - [SPECIES_ORTHWORM] = 0, + [SPECIES_PALAFIN] = 0, // TODO: Hero form + [SPECIES_VAROOM] = 5, + [SPECIES_REVAVROOM] = 5, + [SPECIES_CYCLIZAR] = 1, + [SPECIES_ORTHWORM] = 4, [SPECIES_GLIMMET] = 0, [SPECIES_GLIMMORA] = 0, - [SPECIES_GREAVARD] = 0, - [SPECIES_HOUNDSTONE] = 0, - [SPECIES_FLAMIGO] = 0, + [SPECIES_GREAVARD] = 2, + [SPECIES_HOUNDSTONE] = 5, + [SPECIES_FLAMIGO] = 4, [SPECIES_CETODDLE] = 0, [SPECIES_CETITAN] = 0, - [SPECIES_VELUZA] = 0, + [SPECIES_VELUZA] = 4, [SPECIES_DONDOZO] = 0, - [SPECIES_TATSUGIRI] = 0, + [SPECIES_TATSUGIRI] = 0, // TODO: Forms [SPECIES_ANNIHILAPE] = 0, - [SPECIES_CLODSIRE] = 0, + [SPECIES_CLODSIRE] = 2, [SPECIES_FARIGIRAF] = 0, [SPECIES_DUDUNSPARCE] = 0, - [SPECIES_KINGAMBIT] = 0, + [SPECIES_KINGAMBIT] = 3, [SPECIES_GREAT_TUSK] = 0, [SPECIES_SCREAM_TAIL] = 0, - [SPECIES_BRUTE_BONNET] = 0, - [SPECIES_FLUTTER_MANE] = 0, - [SPECIES_SLITHER_WING] = 0, + [SPECIES_BRUTE_BONNET] = 1, + [SPECIES_FLUTTER_MANE] = 4, + [SPECIES_SLITHER_WING] = 3, [SPECIES_SANDY_SHOCKS] = 0, [SPECIES_IRON_TREADS] = 0, [SPECIES_IRON_BUNDLE] = 0, [SPECIES_IRON_HANDS] = 0, - [SPECIES_IRON_JUGULIS] = 0, - [SPECIES_IRON_MOTH] = 0, - [SPECIES_IRON_THORNS] = 0, - [SPECIES_FRIGIBAX] = 0, + [SPECIES_IRON_JUGULIS] = 2, + [SPECIES_IRON_MOTH] = 3, + [SPECIES_IRON_THORNS] = 1, + [SPECIES_FRIGIBAX] = 3, [SPECIES_ARCTIBAX] = 0, [SPECIES_BAXCALIBUR] = 0, - [SPECIES_GIMMIGHOUL] = 0, + [SPECIES_GIMMIGHOUL] = 1, // TODO: Overworld Form [SPECIES_GHOLDENGO] = 0, - [SPECIES_WO_CHIEN] = 0, + [SPECIES_WO_CHIEN] = 5, [SPECIES_CHIEN_PAO] = 0, [SPECIES_TING_LU] = 0, [SPECIES_CHI_YU] = 0, - [SPECIES_ROARING_MOON] = 0, - [SPECIES_IRON_VALIANT] = 0, + [SPECIES_ROARING_MOON] = 3, + [SPECIES_IRON_VALIANT] = 4, [SPECIES_KORAIDON] = 0, - [SPECIES_MIRAIDON] = 0, + [SPECIES_MIRAIDON] = 2, [SPECIES_WALKING_WAKE] = 0, [SPECIES_IRON_LEAVES] = 0, #endif