Multiworld merge

Browse Source

...

This commit is contained in:

aerinon

2020-01-14 15:07:13 -07:00

parent fd83eaa16e 761d11a272

commit c4ae75bc2b

54 changed files with 4319 additions and 2321 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

data/base2current.json

+1 -1

File diff suppressed because one or more lines are too long

data/base2current_extendedmsu.json

+1

File diff suppressed because one or more lines are too long

data/sprites/official/birdo.1.zspr

BIN

Binary file not shown.

data/sprites/official/cadence.1.zspr

BIN

Binary file not shown.

data/sprites/official/cat.2.zspr → data/sprites/official/cat.3.zspr

BIN

Binary file not shown.

data/sprites/official/chibity.1.zspr

BIN

Binary file not shown.

data/sprites/official/corona.1.zspr

BIN

Binary file not shown.

data/sprites/official/d_owls.1.zspr

BIN

Binary file not shown.

data/sprites/official/dragonite.1.zspr → data/sprites/official/dragonite.2.zspr

BIN

Binary file not shown.

data/sprites/official/finn.1.zspr

BIN

Binary file not shown.

data/sprites/official/flavor_guy.1.zspr

BIN

Binary file not shown.

data/sprites/official/froglink.2.zspr → data/sprites/official/froglink.3.zspr

BIN

Binary file not shown.

data/sprites/official/fujin.1.zspr

BIN

Binary file not shown.

data/sprites/official/future_trunks.1.zspr

BIN

Binary file not shown.

data/sprites/official/king_graham.1.zspr

BIN

Binary file not shown.

data/sprites/official/lest.1.zspr

BIN

Binary file not shown.

data/sprites/official/matthias.1.zspr

BIN

Binary file not shown.

data/sprites/official/mew.1.zspr

BIN

Binary file not shown.

data/sprites/official/mikejones.1.zspr

BIN

Binary file not shown.

data/sprites/official/piranha_plant.1.zspr

BIN

Binary file not shown.

data/sprites/official/rydia.1.zspr

BIN

Binary file not shown.

data/sprites/official/sighn_waive.1.zspr

BIN

Binary file not shown.

data/sprites/official/tgh.1.zspr

BIN

Binary file not shown.

data/sprites/official/ty.1.zspr

BIN

Binary file not shown.

data/sprites/official/vaporeon.1.zspr

BIN

Binary file not shown.

data/sprites/official/vegeta.1.zspr

BIN

Binary file not shown.

data/sprites/official/wolf_link.1.zspr

BIN

Binary file not shown.

data/sprites/official/wolf_link_tp.1.zspr

BIN

Binary file not shown.