Multiworld merge

2020-01-14 15:07:13 -07:00
parent fd83eaa16e 761d11a272
commit c4ae75bc2b
54 changed files with 4319 additions and 2321 deletions
--- a/data/base2current.json
+++ b/data/base2current.json
--- a/data/base2current_extendedmsu.json
+++ b/data/base2current_extendedmsu.json
--- a/data/sprites/official/birdo.1.zspr
+++ b/data/sprites/official/birdo.1.zspr
--- a/data/sprites/official/cadence.1.zspr
+++ b/data/sprites/official/cadence.1.zspr
--- a/data/sprites/official/cat.3.zspr
+++ b/data/sprites/official/cat.3.zspr
--- a/data/sprites/official/chibity.1.zspr
+++ b/data/sprites/official/chibity.1.zspr
--- a/data/sprites/official/corona.1.zspr
+++ b/data/sprites/official/corona.1.zspr
--- a/data/sprites/official/d_owls.1.zspr
+++ b/data/sprites/official/d_owls.1.zspr
--- a/data/sprites/official/dragonite.2.zspr
+++ b/data/sprites/official/dragonite.2.zspr
--- a/data/sprites/official/finn.1.zspr
+++ b/data/sprites/official/finn.1.zspr
--- a/data/sprites/official/flavor_guy.1.zspr
+++ b/data/sprites/official/flavor_guy.1.zspr
--- a/data/sprites/official/froglink.3.zspr
+++ b/data/sprites/official/froglink.3.zspr
--- a/data/sprites/official/fujin.1.zspr
+++ b/data/sprites/official/fujin.1.zspr
--- a/data/sprites/official/future_trunks.1.zspr
+++ b/data/sprites/official/future_trunks.1.zspr
--- a/data/sprites/official/king_graham.1.zspr
+++ b/data/sprites/official/king_graham.1.zspr
--- a/data/sprites/official/lest.1.zspr
+++ b/data/sprites/official/lest.1.zspr
--- a/data/sprites/official/matthias.1.zspr
+++ b/data/sprites/official/matthias.1.zspr
--- a/data/sprites/official/mew.1.zspr
+++ b/data/sprites/official/mew.1.zspr
--- a/data/sprites/official/mikejones.1.zspr
+++ b/data/sprites/official/mikejones.1.zspr
--- a/data/sprites/official/piranha_plant.1.zspr
+++ b/data/sprites/official/piranha_plant.1.zspr
--- a/data/sprites/official/rydia.1.zspr
+++ b/data/sprites/official/rydia.1.zspr
--- a/data/sprites/official/sighn_waive.1.zspr
+++ b/data/sprites/official/sighn_waive.1.zspr
--- a/data/sprites/official/tgh.1.zspr
+++ b/data/sprites/official/tgh.1.zspr
--- a/data/sprites/official/ty.1.zspr
+++ b/data/sprites/official/ty.1.zspr
--- a/data/sprites/official/vaporeon.1.zspr
+++ b/data/sprites/official/vaporeon.1.zspr
--- a/data/sprites/official/vegeta.1.zspr
+++ b/data/sprites/official/vegeta.1.zspr
--- a/data/sprites/official/wolf_link.1.zspr
+++ b/data/sprites/official/wolf_link.1.zspr
--- a/data/sprites/official/wolf_link_tp.1.zspr
+++ b/data/sprites/official/wolf_link_tp.1.zspr