removes exported maps folder

removes dev files
Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases
2025-12-06 06:01:46 +00:00 · 2024-03-28 17:34:25 -04:00 · 2024-03-28 17:33:44 -04:00 · 2024-03-28 17:32:42 -04:00 · 2024-03-28 17:31:26 -04:00 · 2024-03-28 17:14:35 -04:00
1123 changed files with 69441 additions and 8392 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,8 @@
+
+Graphics/Battlers_resized/*
+Graphics/CustomBattlers/*
+Graphics/Battlers/*
+Graphics/Pokemon/FusionIcons/*
+Data/SPRITE_CREDS
+Data/VERSION
+ 
--- a/Audio/BGM/band/adjust_volume/band_harp.wav
+++ b/Audio/BGM/band/adjust_volume/band_harp.wav
--- a/Audio/BGM/band/band_1.wav
+++ b/Audio/BGM/band/band_1.wav
--- a/Audio/BGM/band/band_2.wav
+++ b/Audio/BGM/band/band_2.wav
--- a/Audio/BGM/band/band_3a.wav
+++ b/Audio/BGM/band/band_3a.wav
--- a/Audio/BGM/band/band_3b.wav
+++ b/Audio/BGM/band/band_3b.wav
--- a/Audio/BGM/band/band_4.wav
+++ b/Audio/BGM/band/band_4.wav
--- a/Audio/BGM/band/band_5a.wav
+++ b/Audio/BGM/band/band_5a.wav
--- a/Audio/BGM/band/band_5b.wav
+++ b/Audio/BGM/band/band_5b.wav
--- a/Audio/BGM/band/band_full.wav
+++ b/Audio/BGM/band/band_full.wav
--- a/Audio/BGM/band_aguitar.wav
+++ b/Audio/BGM/band_aguitar.wav
--- a/Audio/BGM/band_drums.wav
+++ b/Audio/BGM/band_drums.wav
--- a/Audio/BGM/band_eguitar.wav
+++ b/Audio/BGM/band_eguitar.wav
--- a/Audio/BGM/band_flute.wav
+++ b/Audio/BGM/band_flute.wav
--- a/Audio/BGM/band_harp.wav
+++ b/Audio/BGM/band_harp.wav
--- a/Audio/BGM/flap.mp3
+++ b/Audio/BGM/flap.mp3
--- a/Audio/BGM/fullmoonIsland.mp3
+++ b/Audio/BGM/fullmoonIsland.mp3
--- a/Audio/BGM/lake_crater.mp3
+++ b/Audio/BGM/lake_crater.mp3
--- a/Audio/BGM/lake_crater_short.mp3
+++ b/Audio/BGM/lake_crater_short.mp3
--- a/Audio/BGM/meloetta_song.mp3
+++ b/Audio/BGM/meloetta_song.mp3
--- a/Audio/BGM/newmoonIsland.mp3
+++ b/Audio/BGM/newmoonIsland.mp3
--- a/Audio/BGM/safari.ogg
+++ b/Audio/BGM/safari.ogg
--- a/Audio/BGM/scary_ambient.mp3
+++ b/Audio/BGM/scary_ambient.mp3
--- a/Audio/SE/Cries/LYCANROC_D.ogg
+++ b/Audio/SE/Cries/LYCANROC_D.ogg
--- a/Audio/SE/Cries/LYCANROC_N.ogg
+++ b/Audio/SE/Cries/LYCANROC_N.ogg
--- a/Audio/SE/Cries/MELOETTA_A.ogg
+++ b/Audio/SE/Cries/MELOETTA_A.ogg
--- a/Audio/SE/Cries/MELOETTA_P.ogg
+++ b/Audio/SE/Cries/MELOETTA_P.ogg
--- a/Audio/SE/Cries/PIKACHU.ogg
+++ b/Audio/SE/Cries/PIKACHU.ogg
--- a/Audio/SE/Cries/PIKACHU_faint.ogg
+++ b/Audio/SE/Cries/PIKACHU_faint.ogg
--- a/Audio/SE/Cries/U_NECROZMA.ogg
+++ b/Audio/SE/Cries/U_NECROZMA.ogg
--- a/Audio/SE/LYCANROC_D.ogg
+++ b/Audio/SE/LYCANROC_D.ogg
--- a/Audio/SE/MELOETTA_A.ogg
+++ b/Audio/SE/MELOETTA_A.ogg
--- a/Audio/SE/PRSFX-
+++ b/Audio/SE/PRSFX-
--- a/Audio/SE/cry_CRESSELIA.ogg
+++ b/Audio/SE/cry_CRESSELIA.ogg
--- a/Credits.txt
+++ b/Credits.txt
@@ -21,7 +21,8 @@ Zeak6464 (Kanto Map pack) http://www.pokecommunity.com/showthread.php?t=345591
 #################################
 #	Story / Dialogues	#
 #################################
-Chardub 
+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,
--- a/Data/.idea/codeStyles/Project.xml
+++ b/Data/.idea/codeStyles/Project.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="FORMATTER_TAGS_ENABLED" value="true" />
+  </code_scheme>
+</component>
--- a/Data/.idea/codeStyles/codeStyleConfig.xml
+++ b/Data/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/Data/Actors.rxdata
+++ b/Data/Actors.rxdata
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/Armors.rxdata
+++ b/Data/Armors.rxdata
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Enemies.rxdata
+++ b/Data/Enemies.rxdata
--- a/Data/Items.rxdata
+++ b/Data/Items.rxdata
--- a/Data/Map001.rxdata
+++ b/Data/Map001.rxdata
--- a/Data/Map008.rxdata
+++ b/Data/Map008.rxdata
--- a/Data/Map012.rxdata
+++ b/Data/Map012.rxdata
--- a/Data/Map016.rxdata
+++ b/Data/Map016.rxdata
--- a/Data/Map019.rxdata
+++ b/Data/Map019.rxdata
--- a/Data/Map023.rxdata
+++ b/Data/Map023.rxdata
--- a/Data/Map024.rxdata
+++ b/Data/Map024.rxdata
--- a/Data/Map040.rxdata
+++ b/Data/Map040.rxdata
--- a/Data/Map043.rxdata
+++ b/Data/Map043.rxdata
--- a/Data/Map048.rxdata
+++ b/Data/Map048.rxdata
--- a/Data/Map050.rxdata
+++ b/Data/Map050.rxdata
--- a/Data/Map054.rxdata
+++ b/Data/Map054.rxdata
--- a/Data/Map067.rxdata
+++ b/Data/Map067.rxdata
--- a/Data/Map068.rxdata
+++ b/Data/Map068.rxdata
--- a/Data/Map069.rxdata
+++ b/Data/Map069.rxdata
--- a/Data/Map070.rxdata
+++ b/Data/Map070.rxdata
--- a/Data/Map076.rxdata
+++ b/Data/Map076.rxdata
--- a/Data/Map086.rxdata
+++ b/Data/Map086.rxdata
--- a/Data/Map090.rxdata
+++ b/Data/Map090.rxdata
--- a/Data/Map095.rxdata
+++ b/Data/Map095.rxdata
--- a/Data/Map102.rxdata
+++ b/Data/Map102.rxdata
--- a/Data/Map105.rxdata
+++ b/Data/Map105.rxdata
--- a/Data/Map108.rxdata
+++ b/Data/Map108.rxdata
--- a/Data/Map110.rxdata
+++ b/Data/Map110.rxdata
--- a/Data/Map112.rxdata
+++ b/Data/Map112.rxdata
--- a/Data/Map113.rxdata
+++ b/Data/Map113.rxdata
--- a/Data/Map114.rxdata
+++ b/Data/Map114.rxdata
--- a/Data/Map115.rxdata
+++ b/Data/Map115.rxdata
--- a/Data/Map129.rxdata
+++ b/Data/Map129.rxdata
--- a/Data/Map135.rxdata
+++ b/Data/Map135.rxdata
--- a/Data/Map141.rxdata
+++ b/Data/Map141.rxdata
--- a/Data/Map144.rxdata
+++ b/Data/Map144.rxdata
--- a/Data/Map154.rxdata
+++ b/Data/Map154.rxdata
--- a/Data/Map157.rxdata
+++ b/Data/Map157.rxdata
--- a/Data/Map159.rxdata
+++ b/Data/Map159.rxdata
--- a/Data/Map167.rxdata
+++ b/Data/Map167.rxdata
--- a/Data/Map168.rxdata
+++ b/Data/Map168.rxdata
--- a/Data/Map175.rxdata
+++ b/Data/Map175.rxdata
--- a/Data/Map176.rxdata
+++ b/Data/Map176.rxdata
--- a/Data/Map181.rxdata
+++ b/Data/Map181.rxdata
--- a/Data/Map191.rxdata
+++ b/Data/Map191.rxdata
--- a/Data/Map195.rxdata
+++ b/Data/Map195.rxdata
--- a/Data/Map197.rxdata
+++ b/Data/Map197.rxdata
--- a/Data/Map205.rxdata
+++ b/Data/Map205.rxdata
--- a/Data/Map214.rxdata
+++ b/Data/Map214.rxdata
--- a/Data/Map237.rxdata
+++ b/Data/Map237.rxdata
--- a/Data/Map240.rxdata
+++ b/Data/Map240.rxdata
--- a/Data/Map241.rxdata
+++ b/Data/Map241.rxdata
--- a/Data/Map242.rxdata
+++ b/Data/Map242.rxdata
--- a/Data/Map243.rxdata
+++ b/Data/Map243.rxdata
--- a/Data/Map244.rxdata
+++ b/Data/Map244.rxdata
--- a/Data/Map247.rxdata
+++ b/Data/Map247.rxdata
--- a/Data/Map266.rxdata
+++ b/Data/Map266.rxdata
--- a/Data/Map273.rxdata
+++ b/Data/Map273.rxdata
--- a/Data/Map276.rxdata
+++ b/Data/Map276.rxdata
--- a/Data/Map277.rxdata
+++ b/Data/Map277.rxdata
--- a/Data/Map293.rxdata
+++ b/Data/Map293.rxdata
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
infinitefusion	a5311f5e2d	Fixes bug allowing to unfuse traded pokemon	2023-11-25 12:21:26 -05:00
infinitefusion	e6e53bc94b	don't crash when can't place pokemon in pc	2023-11-25 10:35:04 -05:00
infinitefusion	d9098afbec	Fixes issue with certain npcs when selecting pokemon with triple fusions in your party	2023-11-25 10:24:09 -05:00
infinitefusion	9aee5206cd	Fixes dolly quest message not being centered	2023-11-24 10:54:45 -05:00
infinitefusion	e1c52d9546	removes triple fusion types from pokedex search screen	2023-11-24 10:47:42 -05:00
infinitefusion	0433e49477	Removes debug line that caused crash on new games	2023-11-24 09:27:19 -05:00
infinitefusion	6f8f478303	Removes debug line that caused crash on new games	2023-11-24 08:09:34 -05:00
infinitefusion	5f09bec5ff	adds discord staff to wondertrade nicknames list	2023-11-23 19:50:35 -05:00
infinitefusion	e7629a8afa	Removes trash cans from pallet town	2023-11-23 19:38:05 -05:00
infinitefusion	1af9d853cb	Adds cache for autogen sprites to reduce lag when loading sprites	2023-11-23 19:25:28 -05:00
infinitefusion	cbe71d8530	Makes necrozma light reset after battle	2023-11-23 18:50:11 -05:00
infinitefusion	9ade3e829a	adds new pokemon to exotic pokenmon quests	2023-11-23 12:53:55 -05:00
infinitefusion	8f91ba0ff5	adds debug map	2023-11-22 21:28:30 -05:00
infinitefusion	0713ed0bb5	Wondertrade now uses the sprite's author as the original trainer when it can	2023-11-20 17:53:18 -05:00
infinitefusion	1d2ccb781b	Fixes mankey paw not costing any money	2023-11-19 12:02:24 -05:00
infinitefusion	081fa99293	Fixes issue preventing fused roaming Pokémon to appear	2023-11-19 11:57:25 -05:00
infinitefusion	179c8d078b	Fixes player becoming invisible after playing the pokefulute	2023-11-19 11:34:53 -05:00
infinitefusion	48327a61ff	Fixes sprites not being downloaded before form change	2023-11-19 10:27:40 -05:00
infinitefusion	6e5f7bbce2	Fixes path issue after downloading autogen and unfused alt sprites	2023-11-19 09:33:46 -05:00
infinitefusion	7bfaec31f2	Adjusted position of battle boxes	2023-11-16 21:13:43 -05:00
infinitefusion	9a507fe4c1	renames cave tileset	2023-11-15 11:05:35 -05:00
infinitefusion	50cf18417e	Fixes dialga/giratina/palkia battles starting the necrozma quest	2023-11-14 21:35:07 -05:00
infinitefusion	4d74cc7943	Updates patch version number to 6.0.2	2023-11-14 20:30:23 -05:00
infinitefusion	1acc5ef4f7	Fixes issue with gym randomizer when wiping out in a gym	2023-11-14 20:29:02 -05:00
infinitefusion	3943ce1684	fixes pokeflute animation causing the player to lose their running shoes	2023-11-14 20:19:02 -05:00
infinitefusion	433cb999ff	fixes crash when trying to unfuse a triple fusion	2023-11-14 20:06:51 -05:00
infinitefusion	ea84f0fe2d	fixes crash when accessing the pokedex sprites page from summary before the sprites substituion map was initialized	2023-11-14 20:04:03 -05:00
infinitefusion	44dc443a6c	fixes regi rock/steel puzzle switches remaining pressed after leaving the room	2023-11-14 20:01:14 -05:00
infinitefusion	e4ae8802d5	Fixes new pokemon sprites not displaying in pokeradar	2023-11-14 19:52:09 -05:00
infinitefusion	e292078d17	Fixes super splicers not working correctly from PC	2023-11-14 19:37:29 -05:00
infinitefusion	2635217407	error handling in case the randomizer picks a pokemon that does not exist	2023-11-14 18:46:32 -05:00
infinitefusion	d729a630e5	removes update man from mt. ember lol	2023-11-13 23:37:19 -05:00
infinitefusion	b8f1162bd8	Fixes triple fusion fight crash in randomized mode & updated version number	2023-11-13 21:41:58 -05:00
infinitefusion	d941ae48e9	create missing directories when importing new custom sprites	2023-11-13 21:13:55 -05:00
infinitefusion	a86b844649	updated type icons for triple fusions	2023-11-13 20:59:24 -05:00
infinitefusion	cfc76d1f77	map fixes, regitablet and cool dino	2023-11-13 20:14:01 -05:00
infinitefusion	5ab7074507	Merge branch 'releases' of https://github.com/infinitefusion/infinitefusion-e18	2023-11-13 13:06:38 -05:00
infinitefusion	62b588314e	updated gitignore	2023-11-13 13:06:28 -05:00
infinitefusion	0b334fe3ea	removes capital letters in caves tileset	2023-11-13 13:04:42 -05:00
infinitefusion	b79f4b2f93	fuck you git	2023-11-13 13:04:10 -05:00
infinitefusion	2af97a0bbf	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2023-11-13 12:34:54 -05:00
infinitefusion	959edc3f6a	Map fixes	2023-11-13 12:31:59 -05:00
infinitefusion	91153181c3	Map fixes	2023-11-13 11:50:57 -05:00
infinitefusion	d3662c3f10	update to latest 6.0 release	2023-11-12 21:45:07 -05:00
infinitefusion	ba7ee9bae2	Revert "6.0 release" This reverts commit `a0aea8f030`.	2023-11-12 14:23:52 -05:00
infinitefusion	a0aea8f030	6.0 release	2023-11-12 14:10:05 -05:00
infinitefusion	6ba975ac51	removed broken character in randomzier sprites list	2023-11-06 19:08:22 -05:00
infinitefusion	2dd2a5d33b	removed non-sprite lines in randomizer custom sprites list	2023-11-04 21:14:18 -04:00
infinitefusion	1ea6b531c2	updates randomizer custom sprites list	2023-11-03 18:14:22 -04:00
infinitefusion	b600e126bc	reverts new version notification to 5.3.1.2	2023-10-26 15:09:08 -04:00
infinitefusion	2411a0c9fc	updates new versin notification	2023-10-21 10:42:20 -04:00