Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms

Browse Source

# Conflicts:
#	graphics/pokemon/burmy/footprint.png
#	graphics/pokemon/gastrodon/footprint.png
#	graphics/pokemon/rotom/footprint.png
#	graphics/pokemon/shellos/footprint.png
#	graphics/pokemon/wormadam/footprint.png
#	include/constants/species.h
#	src/data/pokemon/base_stats.h

...

This commit is contained in:

Eduardo Quezada D'Ottone 2020-11-03 00:13:51 -03:00

parent 2964cc3828 1e283e9dbf

commit 0c6dc6abab

272 changed files with 4994 additions and 1443 deletions

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

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

BIN

graphics/pokemon/abomasnow/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/accelgor/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/alomomola/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/ambipom/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/amoonguss/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/arceus/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/archen/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/archeops/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/audino/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/axew/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/azelf/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/basculin/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bastiodon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/beartic/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/beheeyem/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bibarel/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bidoof/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bisharp/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/blitzle/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/boldore/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bonsly/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bouffalant/anim_front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.3 KiB

BIN

graphics/pokemon/bouffalant/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bouffalant/front.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 935 B After Width:  |  Height:  |  Size: 837 B

BIN

graphics/pokemon/braviary/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bronzong/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/bronzor/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/budew/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/buizel/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/buneary/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/burmy/plant/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/carnivine/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/carracosta/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/chandelure/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/chatot/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cherrim/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cherubi/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/chimchar/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/chingling/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cinccino/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cobalion/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cofagrigus/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/combee/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/conkeldurr/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cottonee/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cranidos/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cresselia/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/croagunk/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/crustle/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cryogonal/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/cubchoo/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/darkrai/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/darmanitan/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/darumaka/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/deerling/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/deino/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/dewott/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/dialga/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/drapion/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/drifblim/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/drifloon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/drilbur/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/druddigon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/ducklett/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/duosion/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/durant/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/dusknoir/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/dwebble/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/eelektrik/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/eelektross/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/electivire/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/elgyem/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/emboar/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/emolga/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/empoleon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/escavalier/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/excadrill/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/ferroseed/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/ferrothorn/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/finneon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/floatzel/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/foongus/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/fraxure/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/frillish/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/froslass/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/gabite/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/gallade/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/galvantula/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/garbodor/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/garchomp/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/gastrodon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/genesect/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/gible/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/gigalith/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/giratina/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/glaceon/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/glameow/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/gliscor/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/golett/footprint.png Normal file

View File

Binary file not shown.

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

BIN

graphics/pokemon/golurk/footprint.png Normal file

View File

Binary file not shown.

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

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