31 Commits
6.0.4 ... 6.1.2

Author SHA1 Message Date
infinitefusion
d78c950afc no dev files in releases 2024-03-29 21:47:57 -04:00
infinitefusion
e3bb249849 system 2024-03-29 21:47:01 -04:00
infinitefusion
3dcaaedfc9 updates version number 2024-03-29 21:42:54 -04:00
infinitefusion
5e9153a097 Fixes crash because of indexes not resetting when scrolling in sprites page 2024-03-29 21:38:57 -04:00
infinitefusion
3a307cdabf map fixes 2024-03-29 12:57:26 -04:00
infinitefusion
9a7ffd13fc Fixes bug when player loses to mew 2024-03-28 23:42:49 -04:00
infinitefusion
fed0e2be83 removes dev files 2024-03-28 21:47:44 -04:00
infinitefusion
c9f043d7b3 adds hint for marowak in meloetta quest 2024-03-28 21:47:01 -04:00
infinitefusion
31063a7a2e adds back pbs and project file lol 2024-03-28 20:12:40 -04:00
infinitefusion
58640ec8cb Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-03-28 20:08:27 -04:00
infinitefusion
695d00e351 fixes minor fuckups 2024-03-28 20:08:04 -04:00
infinitefusion
502ff9197c 6.1.1 2024-03-28 20:04:18 -04:00
infinitefusion
8ca8bf9b9f Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-03-28 19:59:29 -04:00
infinitefusion
085f73f7d1 fixes dex number not updating from previous version 2024-03-28 19:58:25 -04:00
infinitefusion
9608cca26f updates new version notification 2024-03-28 18:25:47 -04:00
infinitefusion
fbddb27774 removes exported maps folder 2024-03-28 17:34:25 -04:00
infinitefusion
cdd8a8a4e4 removes dev files 2024-03-28 17:33:44 -04:00
infinitefusion
27209e46f0 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-03-28 17:32:42 -04:00
infinitefusion
d2f6d74a8a fixes all game modes being unlocked from the start 2024-03-28 17:31:26 -04:00
infinitefusion
1635409e6d updates to version 6.1 2024-03-28 17:14:35 -04:00
infinitefusion
9fa56202bb Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-02-05 23:35:31 -05:00
infinitefusion
e952a6f574 updated readme 2024-02-05 23:35:12 -05:00
infinitefusion
207cfcc4f8 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-01-13 16:49:40 -05:00
infinitefusion
5636c12408 updated minor version number 2024-01-13 16:49:15 -05:00
infinitefusion
25ab076835 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-01-13 16:40:32 -05:00
infinitefusion
869ffbc1a3 basic game download source detection 2024-01-13 16:38:47 -05:00
infinitefusion
7d1714a2ba fixes rockruff and lycanroc sprites 2023-12-28 16:55:13 -05:00
infinitefusion
2294fddcdd moves power plant key and ice pick to after giovanni 2023-12-07 19:10:38 -05:00
infinitefusion
170b893d99 removed icons for removed items 2023-12-03 13:34:10 -05:00
infinitefusion
602b5d9752 small dialogue fix 2023-12-03 13:22:56 -05:00
infinitefusion
ba6f7f3ab2 froggywoggy 2023-11-30 18:59:21 -05:00
1073 changed files with 69208 additions and 8344 deletions

7
.gitignore vendored
View File

@@ -1,9 +1,8 @@
Graphics/Battlers/*
PBS/*
Graphics/Battlers_resized/*
Graphics/CustomBattlers/*
Graphics/Battlers/*
Graphics/Pokemon/FusionIcons/*
Data/SPRITE_CREDS
Data/VERSION
Exported Maps/*
Game.rxproj

Binary file not shown.

BIN
Audio/BGM/band/band_1.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_2.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_3a.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_3b.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_4.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_5a.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_5b.wav Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/band_aguitar.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_drums.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_eguitar.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_flute.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_harp.wav Normal file

Binary file not shown.

BIN
Audio/BGM/flap.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/lake_crater.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/meloetta_song.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/newmoonIsland.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/safari.ogg Normal file

Binary file not shown.

BIN
Audio/BGM/scary_ambient.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/LYCANROC_D.ogg Normal file

Binary file not shown.

BIN
Audio/SE/MELOETTA_A.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/cry_CRESSELIA.ogg Normal file

Binary file not shown.

View File

@@ -22,6 +22,7 @@ Zeak6464 (Kanto Map pack) http://www.pokecommunity.com/showthread.php?t=345591
# Story / Dialogues #
#################################
Chardub
Kiwikelly
The story and dialogues were based off Pok<6F>mon Red and Blue, as well as
Pok<EFBFBD>mon Gold and Silver. Both games are made by Game Freak.
@@ -40,7 +41,7 @@ http://pokefusion.japeal.com/
Alexonsager (version 3.x and below)
http://pokemon.alexonsager.net/
Special thanks to Aegide for helping to rip the sprites from the website
Special thanks to Aegide and Reizod for helping to rip the sprites from the website
and to the owners of the respective fusion websites for accepting to share
their sprites.
@@ -48,9 +49,23 @@ Intro cinamatic
#####################
Kiwikelly
Custom sprites collecting and handling
Kiwikelly, Payapon, Thornsoflight
Discord custom sprites coordination
avianAnnihilator<s>Blaquaza
B<EFBFBD>Boutton<s>CaBiNE
CoramSun<s>hero.drawing
Howls<s>Ignus
Kiwi<s>Maelmc
Milchik the Miltank<s>Payapon
Pix<s>Rosemagwin
Thornsoflight
Custom fusion sprites
#####################
As of 06-09-2022, ordered by number of contributions
As of 06-09-2022, ordered by number of contributions. Check the Data/SPRITE_CREDS file for full, up to date credits
Toad 900#1617, Kiwi#4199, Aquatic#7954, Knuckles3&Knuckles#7559, Katten#7455, Blaquaza#1347,
Blackboots#7369, Milchik#6233, Deleted User#0000, Gdei#2810, Universez#0767, Scarecrow_924#8531,

5
Data/.idea/codeStyles/Project.xml generated Normal file
View File

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

View File

@@ -0,0 +1,5 @@
<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.

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