Merge branch 'master' into Unbound

Browse Source

...

This commit is contained in:

Skeli

2021-06-13 03:00:05 -04:00

parent 3ebdca0594 69a0576d1a

commit c90d58e0e6

164 changed files with 532 additions and 296 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

graphics/pokeicon/gIconSprite1102Grookey.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 396 B

BIN

graphics/pokeicon/gIconSprite1103Thwackey.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 481 B

BIN

graphics/pokeicon/gIconSprite1104Rillaboom.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 510 B

BIN

graphics/pokeicon/gIconSprite1105Scorbunny.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 344 B

BIN

graphics/pokeicon/gIconSprite1106Raboot.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 357 B

BIN

graphics/pokeicon/gIconSprite1107Cinderace.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 451 B

BIN

graphics/pokeicon/gIconSprite1108Sobble.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 422 B

BIN

graphics/pokeicon/gIconSprite1109Drizzile.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 435 B

BIN

graphics/pokeicon/gIconSprite1110Inteleon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 407 B

BIN

graphics/pokeicon/gIconSprite1111Skwovet.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 342 B

BIN

graphics/pokeicon/gIconSprite1112Greedent.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 374 B

BIN

graphics/pokeicon/gIconSprite1113Rookidee.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 342 B

BIN

graphics/pokeicon/gIconSprite1114Corvisquire.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 404 B

BIN

graphics/pokeicon/gIconSprite1115Corviknight.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

graphics/pokeicon/gIconSprite1116Blipbug.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 352 B

BIN

graphics/pokeicon/gIconSprite1117Dottler.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 402 B

BIN

graphics/pokeicon/gIconSprite1118Orbeetle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 424 B

BIN

graphics/pokeicon/gIconSprite1119Nickit.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 395 B

BIN

graphics/pokeicon/gIconSprite1120Thievul.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

graphics/pokeicon/gIconSprite1121Gossifleur.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 333 B

BIN

graphics/pokeicon/gIconSprite1122Eldegoss.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 339 B

BIN

graphics/pokeicon/gIconSprite1123Wooloo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

BIN

graphics/pokeicon/gIconSprite1124Dubwool.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 337 B

BIN

graphics/pokeicon/gIconSprite1125Chewtle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 306 B

BIN

graphics/pokeicon/gIconSprite1126Drednaw.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 403 B

BIN

graphics/pokeicon/gIconSprite1127Yamper.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 365 B

BIN

graphics/pokeicon/gIconSprite1128Boltund.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 373 B

BIN

graphics/pokeicon/gIconSprite1129Rolycoly.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 272 B

BIN

graphics/pokeicon/gIconSprite1130Carkol.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 466 B

BIN

graphics/pokeicon/gIconSprite1131Coalossal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 411 B

BIN

graphics/pokeicon/gIconSprite1132Applin.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 275 B

BIN

graphics/pokeicon/gIconSprite1133Flapple.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 477 B

BIN

graphics/pokeicon/gIconSprite1134Appletun.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 419 B

BIN

graphics/pokeicon/gIconSprite1135Silicobra.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 305 B

BIN

graphics/pokeicon/gIconSprite1136Sandaconda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 336 B

BIN

graphics/pokeicon/gIconSprite1137Cramorant.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 481 B

BIN

graphics/pokeicon/gIconSprite1138Arrokuda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 319 B

BIN

graphics/pokeicon/gIconSprite1139Barraskewda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 379 B

BIN

graphics/pokeicon/gIconSprite1140Toxel.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 326 B

BIN

graphics/pokeicon/gIconSprite1141Toxtricity.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 407 B

BIN

graphics/pokeicon/gIconSprite1142Sizzlipede.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 274 B

BIN

graphics/pokeicon/gIconSprite1143Centiskorch.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 480 B

BIN

graphics/pokeicon/gIconSprite1144Clobbopus.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 332 B

BIN

graphics/pokeicon/gIconSprite1145Grapploct.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 418 B

BIN

graphics/pokeicon/gIconSprite1146Sinistea.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 304 B

BIN

graphics/pokeicon/gIconSprite1147Polteageist.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 337 B

BIN

graphics/pokeicon/gIconSprite1148Hatenna.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 288 B

BIN

graphics/pokeicon/gIconSprite1149Hattrem.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 351 B

BIN

graphics/pokeicon/gIconSprite1150Hatterene.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 406 B

BIN

graphics/pokeicon/gIconSprite1151Impidimp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 315 B

BIN

graphics/pokeicon/gIconSprite1152Morgrem.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 438 B

BIN

graphics/pokeicon/gIconSprite1153Grimmsnarl.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 432 B

BIN

graphics/pokeicon/gIconSprite1154Obstagoon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 445 B

BIN

graphics/pokeicon/gIconSprite1155Perrserker.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 450 B

BIN

graphics/pokeicon/gIconSprite1156Cursola.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 497 B

BIN

graphics/pokeicon/gIconSprite1157Sirfetchd.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 610 B

BIN

graphics/pokeicon/gIconSprite1158MrRime.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 387 B

BIN

graphics/pokeicon/gIconSprite1159Runerigus.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 528 B

BIN

graphics/pokeicon/gIconSprite1160Milcery.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 288 B

BIN

graphics/pokeicon/gIconSprite1161AlcremieStrawberry.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1162Falinks.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 518 B

BIN

graphics/pokeicon/gIconSprite1163Pincurchin.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 270 B

BIN

graphics/pokeicon/gIconSprite1164Snom.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 284 B

BIN

graphics/pokeicon/gIconSprite1165Frosmoth.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 385 B

BIN

graphics/pokeicon/gIconSprite1166Stonjourner.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 509 B

BIN

graphics/pokeicon/gIconSprite1167Eiscue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 332 B

BIN

graphics/pokeicon/gIconSprite1168Indeedee.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 348 B

BIN

graphics/pokeicon/gIconSprite1169Morpeko.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 322 B

BIN

graphics/pokeicon/gIconSprite1170Cufant.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 380 B

BIN

graphics/pokeicon/gIconSprite1171Copperajah.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

graphics/pokeicon/gIconSprite1172Dracozolt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 486 B

BIN

graphics/pokeicon/gIconSprite1173Arctozolt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 439 B

BIN

graphics/pokeicon/gIconSprite1174Dracovish.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 487 B

BIN

graphics/pokeicon/gIconSprite1175Arctovish.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 448 B

BIN

graphics/pokeicon/gIconSprite1176Duraludon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 453 B

BIN

graphics/pokeicon/gIconSprite1177Dreepy.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 402 B

BIN

graphics/pokeicon/gIconSprite1178Drakloak.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 456 B

BIN

graphics/pokeicon/gIconSprite1179Dragapult.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 575 B

BIN

graphics/pokeicon/gIconSprite1180Zacian.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 451 B

BIN

graphics/pokeicon/gIconSprite1181Zamazenta.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 432 B

BIN

graphics/pokeicon/gIconSprite1182Eternatus.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 521 B

BIN

graphics/pokeicon/gIconSprite1183Kubfu.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 309 B

BIN

graphics/pokeicon/gIconSprite1184UrshifuSingle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 401 B

BIN

graphics/pokeicon/gIconSprite1185Zarude.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 502 B

BIN

graphics/pokeicon/gIconSprite1186Regieleki.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 456 B

BIN

graphics/pokeicon/gIconSprite1187Regidrago.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 395 B

BIN

graphics/pokeicon/gIconSprite1188Glastrier.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 366 B

BIN

graphics/pokeicon/gIconSprite1189Spectrier.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 333 B

BIN

graphics/pokeicon/gIconSprite1190Calyrex.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 292 B

BIN

graphics/pokeicon/gIconSprite1191CramorantGulping.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 531 B

BIN

graphics/pokeicon/gIconSprite1192CramorantGorging.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 527 B

BIN

graphics/pokeicon/gIconSprite1193ToxtricityLowKey.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 395 B

BIN

graphics/pokeicon/gIconSprite1196AlcremieBerry.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1197AlcremieClover.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1198AlcremieFlower.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1199AlcremieLove.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1200AlcremieRibbon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1201AlcremieStar.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1202EiscueNoice.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

graphics/pokeicon/gIconSprite1203IndeedeeFemale.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 349 B

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