Compare commits

base: DocRock3r:develop-6.6

Branches Tags

DocRock3r:main DocRock3r:develop-6.6 DocRock3r:releases DocRock3r:6.6-prerelease DocRock3r:develop-e21 DocRock3r:rocket-azubat DocRock3r:releases-April DocRock3r:develop DocRock3r:develop-6.4 DocRock3r:develop-entries DocRock3r:whirlIslands DocRock3r:main-5.3 DocRock3r:main-dynamicFusions DocRock3r:main-doubleAbilities DocRock3r:e19-clean-install

DocRock3r:6.7 DocRock3r:6.5 DocRock3r:6.4.5 DocRock3r:6.4 DocRock3r:6.2.4 DocRock3r:6.2.3 DocRock3r:6.2.1 DocRock3r:6.2 DocRock3r:6.1.3 DocRock3r:6.1.2 DocRock3r:6.1.1 DocRock3r:6.1 DocRock3r:6.0.5 DocRock3r:6.0.4 DocRock3r:release-6.0 DocRock3r:release-5.3 DocRock3r:5.3

...

compare: DocRock3r:main-dynamicFusions

Branches Tags

DocRock3r:develop-6.6 DocRock3r:releases DocRock3r:6.6-prerelease DocRock3r:develop-e21 DocRock3r:rocket-azubat DocRock3r:releases-April DocRock3r:develop DocRock3r:develop-6.4 DocRock3r:develop-entries DocRock3r:main DocRock3r:whirlIslands DocRock3r:main-5.3 DocRock3r:main-dynamicFusions DocRock3r:main-doubleAbilities DocRock3r:e19-clean-install

DocRock3r:6.7 DocRock3r:6.5 DocRock3r:6.4.5 DocRock3r:6.4 DocRock3r:6.2.4 DocRock3r:6.2.3 DocRock3r:6.2.1 DocRock3r:6.2 DocRock3r:6.1.3 DocRock3r:6.1.2 DocRock3r:6.1.1 DocRock3r:6.1 DocRock3r:6.0.5 DocRock3r:6.0.4 DocRock3r:release-6.0 DocRock3r:release-5.3 DocRock3r:5.3

11 Commits

develop-6. ... main-dynam

Author	SHA1	Message	Date
infinitefusion	03fc558fbb	wip	2023-08-08 18:26:54 -04:00
infinitefusion	e92cfe9b0a	adds gen 7 icons & cries	2023-08-08 09:24:02 -04:00
infinitefusion	e815e005a1	dynamic fusion names	2023-08-06 18:40:22 -04:00
infinitefusion	7f9e2312be	wip	2023-08-06 12:43:43 -04:00
infinitefusion	fa6f8f4f8c	adds fused species abilities & fixes pokedex issue	2023-08-06 10:49:35 -04:00
infinitefusion	b8a27ff6e3	adds fused species abilities & fixes pokedex issue	2023-08-06 10:49:26 -04:00
infinitefusion	9f44271b99	[wip] generate fusions dynamically	2023-08-05 22:10:03 -04:00
infinitefusion	41acb265da	Revert "Adds factory for Pokemon class" ... This reverts commit d304d223bd.	2023-08-05 12:34:07 -04:00
infinitefusion	1a9846f72f	Revert "[wip] fusedPokemon" ... This reverts commit 440a585d8c.	2023-08-05 12:33:50 -04:00
infinitefusion	440a585d8c	[wip] fusedPokemon	2023-08-05 12:32:35 -04:00
infinitefusion	d304d223bd	Adds factory for Pokemon class	2023-08-05 11:03:37 -04:00

4863 changed files with 57618 additions and 41631 deletions

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

Expand all files Collapse all files

BIN

Audio/SE/Cries/ABOMASNOW.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ABOMASNOW.wav

Binary file not shown.

BIN

Audio/SE/Cries/ABOMASNOW_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ABRA.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ABRA.wav

Binary file not shown.

BIN

Audio/SE/Cries/ABSOL.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ABSOL.wav

Binary file not shown.

BIN

Audio/SE/Cries/ABSOL_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ACCELGOR.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ACCELGOR.wav

Binary file not shown.

BIN

Audio/SE/Cries/AEGISLASH.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AEGISLASH.wav

Binary file not shown.

BIN

Audio/SE/Cries/AERODACTYL.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AERODACTYL.wav

Binary file not shown.

BIN

Audio/SE/Cries/AERODACTYL_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AGGRON.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AGGRON.wav

Binary file not shown.

BIN

Audio/SE/Cries/AGGRON_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AIPOM.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AIPOM.wav

Binary file not shown.

BIN

Audio/SE/Cries/ALAKAZAM.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ALAKAZAM.wav

Binary file not shown.

BIN

Audio/SE/Cries/ALAKAZAM_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ALCREMIE.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ALOMOMOLA.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ALOMOMOLA.wav

Binary file not shown.

BIN

Audio/SE/Cries/ALTARIA.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ALTARIA.wav

Binary file not shown.

BIN

Audio/SE/Cries/ALTARIA_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AMAURA.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AMBIPOM.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AMBIPOM.wav

Binary file not shown.

BIN

Audio/SE/Cries/AMOONGUSS.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AMOONGUSS.wav

Binary file not shown.

BIN

Audio/SE/Cries/AMPHAROS.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AMPHAROS.wav

Binary file not shown.

BIN

Audio/SE/Cries/AMPHAROS_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ANORITH.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ANORITH.wav

Binary file not shown.

BIN

Audio/SE/Cries/APPLETUN.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/APPLIN.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARAQUANID.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARBOK.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARBOK.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARCANINE.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARCANINE.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARCEUS.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARCEUS.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARCHEN.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARCHEN.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARCHEOPS.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARCHEOPS.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARCTOVISH.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARCTOZOLT.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARIADOS.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARIADOS.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARMALDO.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARMALDO.wav

Binary file not shown.

BIN

Audio/SE/Cries/AROMATISSE.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARON.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARON.wav

Binary file not shown.

BIN

Audio/SE/Cries/ARROKUDA.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARTICUNO.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/ARTICUNO.wav

Binary file not shown.

BIN

Audio/SE/Cries/AUDINO.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AUDINO.wav

Binary file not shown.

BIN

Audio/SE/Cries/AUDINO_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AURORUS.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AVALUGG.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AXEW.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AXEW.wav

Binary file not shown.

BIN

Audio/SE/Cries/AZELF.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AZELF.wav

Binary file not shown.

BIN

Audio/SE/Cries/AZUMARILL.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AZUMARILL.wav

Binary file not shown.

BIN

Audio/SE/Cries/AZURILL.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/AZURILL.wav

Binary file not shown.

BIN

Audio/SE/Cries/BAGON.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BAGON.wav

Binary file not shown.

BIN

Audio/SE/Cries/BALTOY.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BALTOY.wav

Binary file not shown.

BIN

Audio/SE/Cries/BANETTE.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BANETTE.wav

Binary file not shown.

BIN

Audio/SE/Cries/BANETTE_1.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BARBARACLE.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BARBOACH.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BARBOACH.wav

Binary file not shown.

BIN

Audio/SE/Cries/BARRASKEWDA.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BASCULIN.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BASCULIN.wav

Binary file not shown.

BIN

Audio/SE/Cries/BASTIODON.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BASTIODON.wav

Binary file not shown.

BIN

Audio/SE/Cries/BAYLEEF.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BAYLEEF.wav

Binary file not shown.

BIN

Audio/SE/Cries/BEARTIC.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BEARTIC.wav

Binary file not shown.

BIN

Audio/SE/Cries/BEAUTIFLY.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BEAUTIFLY.wav

Binary file not shown.

BIN

Audio/SE/Cries/BEEDRILL.ogg Normal file

Binary file not shown.

BIN

Audio/SE/Cries/BEEDRILL.wav

Binary file not shown.

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