89 Commits

Author SHA1 Message Date
infinitefusion
5657d28c78 whirl islands map 2025-01-13 21:14:15 -05:00
infinitefusion
984d30d912 spritesheets shit 2025-01-10 22:38:43 -05:00
infinitefusion
5fde2bbc1a Fixes team not being recovered after replaying pinkan island from rocket side 2025-01-08 18:18:03 -05:00
infinitefusion
743367f514 skip credits on mobile 2025-01-06 00:43:40 -05:00
infinitefusion
f6fb6ff545 Fixes crash when backing out of menu on art gallery 2nd floor statistics npc 2025-01-06 00:32:15 -05:00
infinitefusion
fdd672c0de Makes it not possible to put hats on triple fusions (temp fix to prevent crash) 2025-01-06 00:31:43 -05:00
infinitefusion
7a2978a329 normal type expert compatibiolity with older savefiles 2025-01-05 11:18:52 -05:00
infinitefusion
0e42591bfd fixes base sprites importing 2025-01-04 20:02:50 -05:00
infinitefusion
028c6d1442 adds ash hat in viridian forest 2025-01-04 13:05:31 -05:00
infinitefusion
9f95e6a263 resized spritesheets 2025-01-02 16:27:04 -05:00
infinitefusion
bf06c26344 updates spritesheets to spritepack 2025-01-02 14:11:37 -05:00
infinitefusion
f9f6f35236 Fixes sprite importing 2025-01-02 14:09:09 -05:00
infinitefusion
804578f4e3 Fixes updated spritesheets list not resetting when new spritepack is released 2025-01-02 09:51:03 -05:00
infinitefusion
234f22e78e Use spritesheets of 96x96 sprites 2025-01-01 16:29:04 -05:00
infinitefusion
84d1fe3d86 Fixes quests npc statistics on new savefiles 2024-12-30 20:01:59 -05:00
infinitefusion
d1c0e4eaf9 Fixes fighting expert crash 2024-12-30 19:55:38 -05:00
infinitefusion
39d3c159b1 Updates version number 2024-12-30 15:59:49 -05:00
infinitefusion
6a3b607690 Fixes issue when wearing hat 2024-12-30 15:58:35 -05:00
infinitefusion
c2954b8e84 Fix game now gives back missed HMs if any 2024-12-30 15:58:23 -05:00
infinitefusion
0a7f0cbbef removes pbs files 2024-12-30 13:21:49 -05:00
infinitefusion
b547813995 Fixes issue with hotel quest rewards 2024-12-30 12:52:06 -05:00
infinitefusion
46e7636c65 Fixes bug preventing game from downloading newest sprites 2024-12-30 12:11:35 -05:00
infinitefusion
7cc97fb7b9 Typos and grammar mistakes 2024-12-30 11:10:57 -05:00
infinitefusion
49bf30987f Fixes always getting kicked out of celadon hideout after removing your uniform while inside 2024-12-30 10:51:34 -05:00
infinitefusion
83efcd1b35 graphics fixes 2024-12-30 10:44:31 -05:00
infinitefusion
de9029eb1b Fixes clothes/hats menu 2024-12-29 15:11:31 -05:00
infinitefusion
3415c85618 Fixes HMs getting randomized when random gym types are enabled 2024-12-29 12:43:26 -05:00
infinitefusion
de8f9603dc Track dyed clothes individually 2024-12-27 22:58:50 -05:00
infinitefusion
5e07802681 fixes type experts not removing randomized gym type 2024-12-25 14:38:14 -05:00
infinitefusion
099af82e47 split dex entry fixes 2024-12-25 14:33:52 -05:00
infinitefusion
c03fc60c05 updates version number 2024-12-25 14:20:35 -05:00
infinitefusion
c473e6ee72 Fixes diancie forcing player to release their pokemon to keep it 2024-12-25 14:20:12 -05:00
infinitefusion
d9be9d17f5 adds all_entries file 2024-12-25 14:13:40 -05:00
infinitefusion
479cfd07fd dynamic autogen entries 2024-12-25 14:13:03 -05:00
infinitefusion
0a59474542 Removes autogen dex entries 2024-12-24 09:30:02 -05:00
infinitefusion
17ca4dcd69 fixes text 2024-12-23 23:58:48 -05:00
infinitefusion
950c942b20 Adds toggle for displaying generated entries or not + fixes issue when cleaning json strings 2024-12-23 23:52:04 -05:00
infinitefusion
d2e5dfb8cd Fixes crash when setting the device option twice 2024-12-22 16:56:31 -05:00
infinitefusion
a674134c62 Skip json string cleaning on mobile 2024-12-22 13:44:22 -05:00
infinitefusion
92818790b9 fixes unsynced pokedex issue 2024-12-22 12:17:17 -05:00
infinitefusion
f6f85fab1b fixes unsynced pokedex issue 2024-12-22 12:08:14 -05:00
infinitefusion
2ae331fd14 fixes crash 2024-12-22 12:05:04 -05:00
infinitefusion
b89420afd7 Fixes possible battle error when registering pokemon in pokedex 2024-12-22 11:33:14 -05:00
infinitefusion
5085a89614 fixes some misnamed outfits 2024-12-22 11:28:12 -05:00
infinitefusion
db8f0d6d3e Fixes in-battle form changes 2024-12-22 11:27:23 -05:00
infinitefusion
57d0118ee9 Fixes some outfit and trainer bugs 2024-12-22 11:11:14 -05:00
infinitefusion
fd053345b1 fixes crash when backing out of elevator menu 2024-12-21 21:19:25 -05:00
infinitefusion
5034855f98 fixes isOutdoor 2024-12-21 21:14:44 -05:00
infinitefusion
4cdd6878fb Adds missing hats 2024-12-21 19:47:10 -05:00
infinitefusion
a19b64ebea Fixes pinkan island bosses not resetting properly 2024-12-21 18:35:00 -05:00
infinitefusion
0e8e7da039 Fixes pinkan island bosses not resetting properly 2024-12-21 18:34:11 -05:00
infinitefusion
d22e6b0208 Fixes crash for entries 2024-12-21 18:20:50 -05:00
infinitefusion
a6dc5167d1 Fixes crash when swapping diancie for another pokemon after catching 2024-12-21 17:14:09 -05:00
infinitefusion
c846150afd Fixes crash in safari zone because of type icons 2024-12-21 17:11:30 -05:00
infinitefusion
81489ec8e6 fixes crash with ai entries on mobile 2024-12-21 17:00:22 -05:00
infinitefusion
28d3ffc074 fixes issue with letterless sprites not being picked automatically 2024-12-21 13:14:35 -05:00
infinitefusion
56b0e44d88 removes game-default 2024-12-21 10:44:07 -05:00
infinitefusion
e4b56e26d7 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-12-21 10:42:12 -05:00
infinitefusion
2929da60ed updates gitignore 2024-12-21 10:37:49 -05:00
infinitefusion
a1f024acfc removes rubymine project files 2024-12-21 10:34:52 -05:00
infinitefusion
27dbc23898 removes dev files 2024-12-21 10:25:30 -05:00
infinitefusion
7cb2daa9ae 6.4 custom sprite spritesheets 2024-12-21 10:05:07 -05:00
infinitefusion
3675a9e361 6.4 autogen spritesheets 2024-12-21 09:47:19 -05:00
infinitefusion
c7f1fafdc0 cleans fusion icons folder 2024-12-21 09:45:46 -05:00
infinitefusion
1e325366d2 6.4 update (minus sprites) 2024-12-21 09:43:11 -05:00
infinitefusion
f70c2cfde4 6.4 sprite credits 2024-12-18 10:05:32 -05:00
infinitefusion
47c68bad06 adds sprite credits csv 2024-12-06 10:13:57 -05:00
infinitefusion
6db39eed0f updates custom sprites list and adds base sprites list 2024-12-05 19:20:06 -05:00
infinitefusion
73cb1ade0e updates credits 2024-11-02 15:35:06 -04:00
infinitefusion
b96b8393f4 fixes crash while downloading sprites 2024-10-06 15:55:21 -04:00
infinitefusion
7952fbb76d Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-10-05 20:06:26 -04:00
infinitefusion
be46d62c87 adds client side rate limit for custom spritesà 2024-10-05 20:02:18 -04:00
infinitefusion
fe857f1fae Adds client-side rate limiting for fetching custom sprites 2024-10-05 20:01:00 -04:00
infinitefusion
113a0f829d updates version number 2024-10-05 09:53:18 -04:00
infinitefusion
c2ea737a19 settings stuff 2024-10-05 09:38:46 -04:00
infinitefusion
425b00c317 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-09-24 19:13:23 -04:00
infinitefusion
17aa9c7cb8 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-07-07 10:59:40 -04:00
infinitefusion
b2efd78631 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-07-05 18:35:06 -04:00
infinitefusion
1379b219f2 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-07-03 10:30:11 -04:00
infinitefusion
ef919ee44b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-30 17:41:05 -04:00
infinitefusion
e186c4b668 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-30 15:47:04 -04:00
infinitefusion
5e30a12118 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-30 15:19:09 -04:00
infinitefusion
090b065a9c Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-29 14:16:17 -04:00
infinitefusion
4ec7496fee Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 19:50:49 -04:00
infinitefusion
63e3d6970c roamer fix 2024-06-28 18:07:27 -04:00
infinitefusion
36094cbaac removes pbs folder 2024-06-28 17:19:06 -04:00
infinitefusion
0a07063d6b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 17:18:35 -04:00
infinitefusion
e15582deef Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 13:24:27 -04:00
infinitefusion
142de56b03 removes project file 2024-04-20 11:43:38 -04:00
5859 changed files with 511629 additions and 282776 deletions

7
.gitignore vendored
View File

@@ -1,8 +1,5 @@
Graphics/Battlers/*
Graphics/Battlers_resized/*
Graphics/CustomBattlers/*
Graphics/Battlers/*
Graphics/Pokemon/FusionIcons/* Graphics/Pokemon/FusionIcons/*
Data/SPRITE_CREDS Data/sprites/*
Data/VERSION Data/VERSION

BIN
Audio/BGM/eusine.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/gym_kanto.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/ME/Pkmn get.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/ME/rocketQuest.ogg Normal file

Binary file not shown.

BIN
Audio/ME/spotted_police.mp3 Normal file

Binary file not shown.

BIN
Audio/SE/CARBINK.ogg Normal file

Binary file not shown.

BIN
Audio/SE/DIANCIE.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Elevator end.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Flee.WAV Normal file

Binary file not shown.

BIN
Audio/SE/Pika.wav Normal file

Binary file not shown.

BIN
Audio/SE/Pkmn get.ogg Normal file

Binary file not shown.

BIN
Audio/SE/whistle.ogg Normal file

Binary file not shown.

View File

@@ -115,6 +115,7 @@ with their respective authors' consent
Hankiro (Oak backsprite) http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html Hankiro (Oak backsprite) http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html
SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious
OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/ OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/
Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
Battle sprites: Battle sprites:
Custom graphics: Custom graphics:
@@ -131,6 +132,9 @@ Kiwikelly
TCGrunler#4583 TCGrunler#4583
elupsis elupsis
### Battle type icons ###
audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FREE-TO-USE-909562921
### Public tileset graphics ### ### Public tileset graphics ###
Jorginho (OutsideEmerald) Jorginho (OutsideEmerald)
ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410 ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
@@ -202,6 +206,7 @@ Marin Better maps script https://www.pokecommunity.com/showthread.php?t=41129
barafanatic Safari Zone improvements barafanatic Safari Zone improvements
M3rein Easy Questing System M3rein Easy Questing System
bo4p5687 Multisave bo4p5687 Multisave
Vizualise In-battle type icons (adapted from) https://github.com/Vizualyse/PokemonInfiniteFusion-EnemyTypesMod
#### Data sources ### #### Data sources ###

2
Data/.idea/.gitignore generated vendored
View File

@@ -2,7 +2,7 @@
/shelf/ /shelf/
/workspace.xml /workspace.xml
# Datasource local storage ignored files # Datasource local storage ignored files
/../../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\dynamic-fusions\infinitefusion-e18\Data\.idea/dataSources/ /../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\infinitefusion-e18\Data\.idea/dataSources/
/dataSources.local.xml /dataSources.local.xml
# Editor-based HTTP Client requests # Editor-based HTTP Client requests
/httpRequests/ /httpRequests/

View File

@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="FORMATTER_TAGS_ENABLED" value="true" />
</code_scheme>
</component>

View File

@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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