DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: DocRock3r:5.3
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:release-6.0
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

87 Commits
5.3 ... release-6.

Author SHA1 Message Date
infinitefusion
81a6bfc21c adds remoteurl file 2023-11-12 21:34:33 -05:00
infinitefusion
59a086e9f7 updated version file 2023-11-12 21:32:41 -05:00
infinitefusion
c0a6958e0e removed rpg maker file 2023-11-12 21:31:36 -05:00
infinitefusion
1e13847b47 fixes braille text 2023-11-12 18:05:35 -05:00
infinitefusion
008cd91a7f fixes mapping issue 2023-11-12 17:41:03 -05:00
infinitefusion
ac2f38a115 renamed Caves to caves tileset 2023-11-12 17:31:21 -05:00
infinitefusion
d500e494d8 removes debug npc in viridian city 2023-11-12 16:34:56 -05:00
infinitefusion
4695d47827 fixed missing character sprites 2023-11-12 16:15:30 -05:00
infinitefusion
57165b6cbf 6.0 release 2023-11-12 15:37:12 -05:00
infinitefusion
63d56d7c32 fixed some map stuff 2023-10-20 23:44:41 -04:00
infinitefusion
ad276ab42e removed unfinished quest 2023-10-20 15:30:09 -04:00
infinitefusion
1124d9ce3b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-10-19 22:45:08 -04:00
infinitefusion
2f4d26a68f Minor map fixes 2023-10-19 22:39:56 -04:00
infinitefusion
0e0969b3d8 updated sprites managers list in credits 2023-10-18 17:13:45 -04:00
infinitefusion
5d59804d51 Merge remote-tracking branch 'origin/main' 2023-09-30 09:19:19 -04:00
infinitefusion
e918744613 fixes head pokemon not being registered in pokedex after fusion 2023-09-30 09:16:41 -04:00
infinitefusion
e280bf2460 Merge pull request #104 from xfix/backup-save-on-save 
Backup save when saving
 2023-09-30 09:14:16 -04:00
infinitefusion
1f1780cee4 creates backup when saving (original commit: infinitefusion-e18/pull/104/commits/c4ef959e47facac7ac883865ec71f3c3b0907ec1) 2023-09-30 09:13:27 -04:00
infinitefusion
480271a562 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-27 22:01:21 -04:00
infinitefusion
d05e4569ea changed new version available text 2023-09-27 22:00:30 -04:00
infinitefusion
18758b007c updated custom sprites list for august pack 2023-09-27 21:18:48 -04:00
infinitefusion
1ea0934c19 changed url for fetching credits file 2023-09-27 21:02:54 -04:00
infinitefusion
24760804e1 Adds shiny chance to downloaded settings file 2023-09-18 21:33:56 -04:00
infinitefusion
581bdf3ca8 increases version number 2023-09-18 17:32:06 -04:00
infinitefusion
a492d15116 increases version number for everyone 2023-09-18 17:31:08 -04:00
infinitefusion
a3e2132600 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-17 20:31:30 -04:00
infinitefusion
eba115202d Fixes water effect bug 2023-09-17 20:28:51 -04:00
infinitefusion
09f9f20468 Fixes water effect bug 2023-09-17 20:28:25 -04:00
infinitefusion
71409b6698 updates version number 2023-09-17 19:51:11 -04:00
infinitefusion
50e24198e3 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-17 19:45:41 -04:00
infinitefusion
e448583222 fixes infinite splicers bug 2023-09-17 19:45:02 -04:00
infinitefusion
7b08544828 Fixes settings url 2023-09-17 19:44:52 -04:00
infinitefusion
b5bdac6775 fixed infinite splicers bug 2023-09-17 19:42:12 -04:00
infinitefusion
70e605ae79 re-enabled automatic url file download 2023-09-17 19:39:57 -04:00
infinitefusion
bd7b6bfa43 fixes crash when downloading base pokemon sprites 2023-09-17 19:39:26 -04:00
infinitefusion
84648ad7b5 increased version number 2023-09-17 19:01:13 -04:00
infinitefusion
0bb4ba944c automatically download remote urls settings 2023-09-17 19:00:39 -04:00
infinitefusion
bb7072d4cc changes sprites repo to gitlab 2 2023-09-17 18:06:55 -04:00
infinitefusion
9c560c7daf changes sprites repo to gitlab 2023-09-17 18:06:36 -04:00
infinitefusion
ecb0d4d2c3 minor game changes 2023-09-17 17:42:59 -04:00
infinitefusion
fa1bbc8728 updates july spritepack credits 2023-09-01 06:34:22 -04:00
infinitefusion
7f217583d0 updates randomizer file list with new spritepack 2023-09-01 06:30:31 -04:00
infinitefusion
9473fea8b9 updates sprite credits 2023-08-10 08:48:48 -04:00
infinitefusion
64923e1a0d updates custom sprites index with june spritepack 2023-08-10 07:53:06 -04:00
infinitefusion
ab24b9eb11 updates sprite credits file 2023-08-09 23:27:09 -04:00
infinitefusion
6378971055 fixes missing pixel line in outdoor tileset 2023-08-09 21:43:24 -04:00
infinitefusion
0f54173c05 updates some tilesets tiles 2023-08-09 21:26:47 -04:00
infinitefusion
05f9a7ec84 updates new version notification to 5.3.1 2023-08-07 18:57:30 -04:00
infinitefusion
85569a7bd7 Merge branch 'main' into releases 2023-08-07 18:44:51 -04:00
infinitefusion
8f15e963f1 updates version number 2023-08-07 18:43:56 -04:00
infinitefusion
c23bfaa824 Merge remote-tracking branch 'origin/main' into releases 
# Conflicts:
#	PBS/items.txt
 2023-08-07 18:38:32 -04:00
infinitefusion
9c5ca890f3 updates url for autogen sprites 2023-08-07 18:36:15 -04:00
infinitefusion
178d61eec0 fixed sprite managers section in game credits 2023-08-05 08:42:21 -04:00
infinitefusion
390fd72d2d Fixes lag in sinnoh trio portals 2023-08-04 18:14:36 -04:00
infinitefusion
6f8d4f9a9d mt. silver screen effects bugfix & portal animation 2023-08-04 11:20:10 -04:00
infinitefusion
b2d5e8c533 increases number of points for box link to 5000 2023-08-04 09:23:05 -04:00
infinitefusion
7e3610b365 adds missing ressources for puddle and shadows 2023-08-03 18:00:15 -04:00
infinitefusion
d4b882ff96 Adds water animation for surfing and puddles 2023-08-03 17:53:55 -04:00
infinitefusion
ba07453021 Adds water animation for surfing and puddles 2023-08-03 17:53:30 -04:00
infinitefusion
dca4118898 Adds overworld shadows 2023-08-03 14:29:42 -04:00
Konrad Borowski
c4ef959e47 Backup save when saving 2023-07-26 17:53:55 +02:00
infinitefusion
1247c1f43d Fixes kin island pokemon club trainers not using fusions 2023-07-25 20:16:53 -04:00
infinitefusion
9d6724fda0 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-07-16 20:17:06 -04:00
infinitefusion
38ea210de7 Fixes corrupt savefile issue with fusion quiz + update to v5.3.0.7 2023-07-16 20:15:54 -04:00
infinitefusion
d38c3f65f4 Adds spriter credits to evolution screen 2023-07-16 15:09:07 -04:00
infinitefusion
321f89282c deactivates arrows quick scroll outside of long lists and pokedex 2023-07-16 11:55:10 -04:00
infinitefusion
17a2d9b97a Makes it possible to jump up and down 1 colomn lists with the left and right arrows 2023-07-16 09:31:00 -04:00
infinitefusion
e52a14e782 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-07-15 17:34:26 -04:00
infinitefusion
ba6b1b47d4 creates customBattlers folder if missing 2023-07-15 17:33:36 -04:00
infinitefusion
6fd262c526 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-07-11 20:19:15 -04:00
infinitefusion
9106833a9d updates game version to 5.3.0.6 2023-07-11 20:10:41 -04:00
infinitefusion
c615791bad Fixes bad egg resize in pc 2023-07-11 20:09:06 -04:00
infinitefusion
e7778b72b9 Fixes crash when can't copy file when generating fusion icon 2023-07-11 19:53:55 -04:00
infinitefusion
c311d975cd adds zipped species.dat 2023-07-10 20:37:32 -04:00
infinitefusion
614caf8f4b adds gitignore 2023-07-09 22:18:28 -04:00
infinitefusion
b5489d9d1a Remove pbs files and adds alternate launcher 2023-07-09 22:15:51 -04:00
infinitefusion
e663541a88 fixes route 1 music 2023-07-09 16:51:15 -04:00
infinitefusion
172797184e Fixes crash when sending bait in safari zone 2023-07-09 16:04:54 -04:00
infinitefusion
172180790b Eusine give back stolen pokemon in goldenrod 2023-07-09 10:52:35 -04:00
infinitefusion
fc243c6ac7 Removes option to fuse from PC while holding a pokemon (the option did nothing) 2023-07-08 12:18:27 -04:00
infinitefusion
95779bfccb adds missing several sound effects 2023-07-08 10:09:11 -04:00
infinitefusion
78caa8fc21 Fixes crash when trying to revive fossil after updating from older version 2023-07-08 09:07:18 -04:00
infinitefusion
0bbbbea686 Added more prizes to fusion quiz and adjusted prize exchange prices 2023-07-04 20:41:24 -04:00
infinitefusion
45bb8d5946 Fix fusion icons 2023-07-03 18:41:46 -04:00
infinitefusion
6e1dd22df8 FIxes mareanie doll not working 2023-07-03 12:42:40 -04:00
infinitefusion
0fca95c637 Fixes boon island warps 2023-07-03 07:48:27 -04:00
infinitefusion
dbfaf352bc Fixes abilities activating twice 2023-07-02 22:26:07 -04:00
5065 changed files with 129824 additions and 379500 deletions
Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,3 +0,0 @@
/*
!/Data/Scripts/
!/Data/Scripts/**

BIN
Audio/BGM/Route 1.ogg
View File

Binary file not shown.

BIN
Audio/BGM/route1.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/ultra_metropolis.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/uwater_short.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle ball drop.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle ball hit.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle ball shake.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle catch click.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle damage normal.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle damage super.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle damage weak.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle flee.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle jump to ball.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle recall.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Battle throw.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABOMASNOW.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABOMASNOW.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABOMASNOW_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABRA.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABRA.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ACCELGOR.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ACCELGOR.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AEGISLASH.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AEGISLASH.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AERODACTYL.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AERODACTYL.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AERODACTYL_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AIPOM.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AIPOM.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALCREMIE.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALOMOMOLA.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALOMOMOLA.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMAURA.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMBIPOM.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMBIPOM.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMOONGUSS.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMOONGUSS.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ANORITH.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ANORITH.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/APPLETUN.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/APPLIN.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARAQUANID.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARBOK.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARBOK.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCHEN.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCHEN.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCHEOPS.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCHEOPS.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCTOVISH.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCTOZOLT.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARIADOS.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARIADOS.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARMALDO.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARMALDO.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AROMATISSE.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARON.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARON.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARROKUDA.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARTICUNO.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARTICUNO.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AUDINO.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AUDINO.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AUDINO_1.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AURORUS.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AVALUGG.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AXEW.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AXEW.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZELF.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZELF.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZUMARILL.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZUMARILL.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZURILL.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZURILL.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/BAGON.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/BAGON.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/BALTOY.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/BALTOY.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/BANETTE.ogg Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/BANETTE.wav
View File

Binary file not shown.

BIN
Audio/SE/Cries/BANETTE_1.ogg Normal file
View File

Binary file not shown.

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